diff --git a/Solver/dgAlgorithm.cpp b/Solver/dgAlgorithm.cpp
index 0a56bb059136b495dbdc6ab18d189f2607a5d16f..5a15521e0b0d5c0a86cacd82dbd50f0f87ea2c90 100644
--- a/Solver/dgAlgorithm.cpp
+++ b/Solver/dgAlgorithm.cpp
@@ -40,7 +40,7 @@ void dgAlgorithm::residualVolume ( //dofManager &dof, // the DOF manager (maybe
fullMatrix<double> Fuvw[3] = {fullMatrix<double> ( group.getNbIntegrationPoints(), group.getNbElements() * nbFields),
fullMatrix<double> (group.getNbIntegrationPoints(), group.getNbElements() * nbFields),
fullMatrix<double> (group.getNbIntegrationPoints(), group.getNbElements() * nbFields)};
- dataCacheMap cacheMap;
+ dataCacheMap cacheMap(group.getNbIntegrationPoints());
dataCacheElement &cacheElement = cacheMap.getElement();
// provided dataCache
cacheMap.provideData("UVW").set(group.getIntegrationPointsMatrix());
@@ -146,7 +146,8 @@ void dgAlgorithm::residualInterface ( //dofManager &dof, // the DOF manager (may
fullMatrix<double> NormalFluxQP ( group.getNbIntegrationPoints(), nbFaces*nbFields*2);
// create one dataCache for each side
- dataCacheMap cacheMapLeft, cacheMapRight;
+ dataCacheMap cacheMapLeft(group.getNbIntegrationPoints());
+ dataCacheMap cacheMapRight(group.getNbIntegrationPoints());
// data this algorithm provide to the cache map (we can maybe move each data to a separate function but
// I think It's easier like this)
@@ -310,7 +311,7 @@ void dgAlgorithm::residualBoundary ( //dofManager &dof, // the DOF manager (mayb
// ----- 2 ---- compute normal fluxes at integration points
fullMatrix<double> NormalFluxQP ( group.getNbIntegrationPoints(), group.getNbElements()*nbFields);
- dataCacheMap cacheMapLeft;
+ dataCacheMap cacheMapLeft(group.getNbIntegrationPoints());
// provided dataCache
cacheMapLeft.provideData("UVW").set(group.getIntegrationPointsMatrix());
dataCacheDouble &solutionQPLeft = cacheMapLeft.provideData("Solution");
diff --git a/Solver/dgConservationLaw.cpp b/Solver/dgConservationLaw.cpp
index f7f3c9d07e33e79d13f622b2ac900029d092b65f..b977bc60075edba9aeea243ff7b92187b72b50db 100644
--- a/Solver/dgConservationLaw.cpp
+++ b/Solver/dgConservationLaw.cpp
@@ -4,10 +4,10 @@ class dgBoundaryConditionOutsideValue : public dgBoundaryCondition {
dgConservationLaw &_claw;
std::string _outsideValueFunctionName;
class term : public dataCacheDouble {
- dataCacheMap cacheMapRight; // new cacheMap to pass to the Riemann solver
dataCacheDouble &solutionRight;
dataCacheDouble &solutionLeft;
dataCacheDouble &outsideValue;
+ dataCacheMap cacheMapRight; // new cacheMap to pass to the Riemann solver
dataCacheDouble *riemannSolver;
dgConservationLaw &_claw;
public:
@@ -15,6 +15,7 @@ class dgBoundaryConditionOutsideValue : public dgBoundaryCondition {
solutionRight(cacheMapRight.provideData("Solution")),
solutionLeft(cacheMapLeft.get("Solution",this)),
outsideValue(cacheMapLeft.get(outsideValueFunctionName,this)),
+ cacheMapRight(cacheMapLeft.getNbEvaluationPoints()),
_claw(claw)
{
riemannSolver=_claw.newRiemannSolver(cacheMapLeft,cacheMapRight);
@@ -26,9 +27,11 @@ class dgBoundaryConditionOutsideValue : public dgBoundaryCondition {
_value = fullMatrix<double>(solutionLeft().size1(),_claw.nbFields());
}
solutionRight.set(outsideValue());
- for(int i=0;i<_value.size1(); i++)
- for(int j=0;j<_value.size2(); j++)
- _value(i,j) = (*riemannSolver)(i,j*2);
+ if(riemannSolver){
+ for(int i=0;i<_value.size1(); i++)
+ for(int j=0;j<_value.size2(); j++)
+ _value(i,j) = (*riemannSolver)(i,j*2);
+ }
}
};
public:
diff --git a/Solver/function.cpp b/Solver/function.cpp
index d83696e91dd1df28162d31ca9522f4e9e4069460..9fed214400df13e83b0b74162a6bc2b2fd30d908 100644
--- a/Solver/function.cpp
+++ b/Solver/function.cpp
@@ -85,11 +85,10 @@ class functionXYZ : public function {
dataCacheElement &_element;
dataCacheDouble &_uvw;
public:
- data(dataCacheMap *m) :
+ data(dataCacheMap *m) :
+ dataCacheDouble(m->getNbEvaluationPoints(),3),
_element(m->getElement(this)), _uvw(m->get("UVW", this))
- {
- _value = fullMatrix<double> (_uvw().size1(), 3);
- }
+ {}
void _eval()
{
for(int i = 0; i < _uvw().size1(); i++){
@@ -113,15 +112,12 @@ class functionConstant : public function {
private :
class data : public dataCacheDouble {
const functionConstant *_function;
- dataCacheDouble &_uvw;
public:
- data(const functionConstant * function,dataCacheMap *m) :_uvw(m->get("UVW",this)){
+ data(const functionConstant * function,dataCacheMap *m):
+ dataCacheDouble(m->getNbEvaluationPoints(),function->_source.size1()){
_function = function;
}
void _eval() {
- if(_value.size1()!=_uvw().size1()){
- _value=fullMatrix<double>(_uvw().size1(),_function->_source.size1());
- }
for(int i=0;i<_value.size1();i++)
for(int j=0;j<_function->_source.size1();j++)
_value(i,j)=_function->_source(j,0);
diff --git a/Solver/function.h b/Solver/function.h
index df56c4a4542915f1455079abb0b3b27752e09610..c9d2b6ba32e553e43486dace44b90504a1296e45 100644
--- a/Solver/function.h
+++ b/Solver/function.h
@@ -97,6 +97,8 @@ class dataCacheDouble : public dataCache {
}
return _value;
}
+ dataCacheDouble(){};
+ dataCacheDouble(int size1, int size2):_value(size1,size2){};
virtual ~dataCacheDouble(){};
};
@@ -133,6 +135,7 @@ class dataCacheElement : public dataCache {
// more explanation at the head of this file
class dataCacheMap {
private:
+ int _nbEvaluationPoints;
// keep track of the current element and all the dataCaches that
// depend on it
dataCacheElement _cacheElement;
@@ -140,7 +143,7 @@ class dataCacheMap {
class providedDataDouble : public dataCacheDouble
// for data provided by the algorithm and that does not have an _eval function
// (typically "UVW") this class is not stricly necessary, we could write
- // a function for each case but I think it's more practical like this
+ // a function for each case
{
void _eval() {throw;};
public:
@@ -152,6 +155,8 @@ class dataCacheMap {
dataCacheDouble &get(const std::string &functionName, dataCache *caller=0);
dataCacheElement &getElement(dataCache *caller=0);
dataCacheDouble &provideData(std::string name);
+ dataCacheMap(int nbEvaluationPoints):_nbEvaluationPoints(nbEvaluationPoints){}
+ inline int getNbEvaluationPoints(){return _nbEvaluationPoints;}
~dataCacheMap();
};
#endif
diff --git a/Solver/luaFunction.cpp b/Solver/luaFunction.cpp
index 0b2f766c655fcdb3c0abb2c49631bddd47055bc4..fd553a2a9102eaf7b4a4e2b6955212a286ebdb23 100644
--- a/Solver/luaFunction.cpp
+++ b/Solver/luaFunction.cpp
@@ -12,30 +12,27 @@ class functionLua : public function {
int _nbCol;
private:
class data : public dataCacheDouble{
- private:
- dataCacheDouble &_uvw;
+ private:
const functionLua *_function;
std::vector<dataCacheDouble *> _dependencies;
- public:
- data(const functionLua *f, dataCacheMap *m)
- : _function(f),_uvw(m->get("UVW",this))
+ public:
+ data(const functionLua *f, dataCacheMap *m):
+ dataCacheDouble(m->getNbEvaluationPoints(),f->_nbCol),
+ _function(f)
{
_dependencies.resize ( _function->_dependenciesName.size());
for (int i=0;i<_function->_dependenciesName.size();i++)
- _dependencies[i] = &m->get(_function->_dependenciesName[i],this);
+ _dependencies[i] = &m->get(_function->_dependenciesName[i],this);
}
void _eval()
{
- if(_value.size1()!=_uvw().size1() || _value.size2() != _function->_nbCol){
- _value=fullMatrix<double>(_uvw().size1(),_function->_nbCol);
- }
lua_getfield(_function->_L, LUA_GLOBALSINDEX, _function->_luaFunctionName.c_str());
for (int i=0;i< _dependencies.size();i++){
- const fullMatrix<double> *data = &(*_dependencies[i])();
- lua_pushlightuserdata (_function->_L, (void*) data);
+ const fullMatrix<double> *data = &(*_dependencies[i])();
+ lua_pushlightuserdata (_function->_L, (void*) data);
}
lua_pushlightuserdata (_function->_L, &_value);
- lua_call(_function->_L,_dependencies.size()+1,0); /* call Lua function */
+ lua_call(_function->_L,_dependencies.size()+1,0); /* call Lua function */
}
};
public: