Skip to content
Snippets Groups Projects
Commit fe0a8741 authored by Jonathan Lambrechts's avatar Jonathan Lambrechts
Browse files

dg : correct sizes in shallow water 1d

parent 2cf77a37
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ class dgConservationLawShallowWater1d::advection: public dataCacheDouble { ...@@ -8,7 +8,7 @@ class dgConservationLawShallowWater1d::advection: public dataCacheDouble {
dataCacheDouble / dataCacheDouble /
public: public:
advection(dataCacheMap &cacheMap): advection(dataCacheMap &cacheMap):
dataCacheDouble(cacheMap,1,9), dataCacheDouble(cacheMap,1,6),
sol(cacheMap.getSolution(this)) sol(cacheMap.getSolution(this))
{}; {};
void _eval () { void _eval () {
...@@ -19,6 +19,12 @@ class dgConservationLawShallowWater1d::advection: public dataCacheDouble { ...@@ -19,6 +19,12 @@ class dgConservationLawShallowWater1d::advection: public dataCacheDouble {
// flux_x // flux_x
_value(i,0) = (h+eta)*u; _value(i,0) = (h+eta)*u;
_value(i,1) = .5*u*u + g*eta; _value(i,1) = .5*u*u + g*eta;
// flux_y
_value(i,2) = 0;
_value(i,3) = 0;
// flux_z
_value(i,4) = 0;
_value(i,5) = 0;
} }
} }
}; };
...@@ -44,7 +50,7 @@ class dgConservationLawShallowWater1d::source: public dataCacheDouble { ...@@ -44,7 +50,7 @@ class dgConservationLawShallowWater1d::source: public dataCacheDouble {
dataCacheDouble &xyz, &solution,&solutionGradient; dataCacheDouble &xyz, &solution,&solutionGradient;
public : public :
source(dataCacheMap &cacheMap) : source(dataCacheMap &cacheMap) :
dataCacheDouble(cacheMap,1,3), dataCacheDouble(cacheMap,1,2),
xyz(cacheMap.getParametricCoordinates(this)), xyz(cacheMap.getParametricCoordinates(this)),
solution(cacheMap.getSolution(this)), solution(cacheMap.getSolution(this)),
solutionGradient(cacheMap.getSolutionGradient(this)) solutionGradient(cacheMap.getSolutionGradient(this))
...@@ -63,7 +69,7 @@ class dgConservationLawShallowWater1d::riemann:public dataCacheDouble { ...@@ -63,7 +69,7 @@ class dgConservationLawShallowWater1d::riemann:public dataCacheDouble {
dataCacheDouble &normals, &solL, &solR; dataCacheDouble &normals, &solL, &solR;
public: public:
riemann(dataCacheMap &cacheMapLeft, dataCacheMap &cacheMapRight): riemann(dataCacheMap &cacheMapLeft, dataCacheMap &cacheMapRight):
dataCacheDouble(cacheMapLeft,1,6), dataCacheDouble(cacheMapLeft,1,4),
normals(cacheMapLeft.getNormals(this)), normals(cacheMapLeft.getNormals(this)),
solL(cacheMapLeft.getSolution(this)), solL(cacheMapLeft.getSolution(this)),
solR(cacheMapRight.getSolution(this)) solR(cacheMapRight.getSolution(this))
...@@ -101,7 +107,7 @@ class dgConservationLawShallowWater1d::boundaryWall : public dgBoundaryCondition ...@@ -101,7 +107,7 @@ class dgConservationLawShallowWater1d::boundaryWall : public dgBoundaryCondition
dataCacheDouble &sol,&normals; dataCacheDouble &sol,&normals;
public: public:
term(dataCacheMap &cacheMap): term(dataCacheMap &cacheMap):
dataCacheDouble(cacheMap,1,3), dataCacheDouble(cacheMap,1,2),
sol(cacheMap.getSolution(this)), sol(cacheMap.getSolution(this)),
normals(cacheMap.getNormals(this)){} normals(cacheMap.getNormals(this)){}
void _eval () { void _eval () {
...@@ -129,7 +135,7 @@ class dgConservationLawShallowWater1d::clipToPhysics : public dataCacheDouble { ...@@ -129,7 +135,7 @@ class dgConservationLawShallowWater1d::clipToPhysics : public dataCacheDouble {
double _hMin; double _hMin;
public: public:
clipToPhysics(dataCacheMap &cacheMap, double hMin): clipToPhysics(dataCacheMap &cacheMap, double hMin):
dataCacheDouble(cacheMap,1,4), dataCacheDouble(cacheMap,1,2),
sol(cacheMap.getSolution(this)) sol(cacheMap.getSolution(this))
{ {
_hMin=hMin; _hMin=hMin;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment