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

dg : dgTerm pass 2 + simplification of dgResidual

parent 02b16495
No related branches found
No related tags found
No related merge requests found
...@@ -343,6 +343,9 @@ void dataCacheMap::setNbEvaluationPoints(int nbEvaluationPoints) ...@@ -343,6 +343,9 @@ void dataCacheMap::setNbEvaluationPoints(int nbEvaluationPoints)
for(std::list<dataCacheMap*>::iterator it = _children.begin(); it != _children.end(); it++) { for(std::list<dataCacheMap*>::iterator it = _children.begin(); it != _children.end(); it++) {
(*it)->setNbEvaluationPoints(nbEvaluationPoints); (*it)->setNbEvaluationPoints(nbEvaluationPoints);
} }
for(std::vector<dataCacheMap*>::iterator it = _secondaryCaches.begin(); it != _secondaryCaches.end(); it++) {
(*it)->setNbEvaluationPoints(nbEvaluationPoints);
}
if (_nbEvaluationPoints == nbEvaluationPoints) { if (_nbEvaluationPoints == nbEvaluationPoints) {
for(std::set<dataCacheDouble*>::iterator it = _allDataCaches.begin(); it != _allDataCaches.end(); it++) for(std::set<dataCacheDouble*>::iterator it = _allDataCaches.begin(); it != _allDataCaches.end(); it++)
(*it)->_valid = false; (*it)->_valid = false;
......
...@@ -204,7 +204,6 @@ class dataCacheDouble { ...@@ -204,7 +204,6 @@ class dataCacheDouble {
class dataCacheMap { class dataCacheMap {
const function *_functionSolution, *_functionSolutionGradient, *_functionCoordinates, *_containerSolution, *_containerSolutionGradient; const function *_functionSolution, *_functionSolutionGradient, *_functionCoordinates, *_containerSolution, *_containerSolutionGradient;
//handle function solution and funciton solution gradient //handle function solution and funciton solution gradient
//we should get rid of them
const function * _translate (const function *) const; const function * _translate (const function *) const;
public: public:
dataCacheMap *_parent; dataCacheMap *_parent;
...@@ -269,6 +268,9 @@ class dataCacheMap { ...@@ -269,6 +268,9 @@ class dataCacheMap {
inline void setSolutionFunction(const function *functionSolution, const function *functionSolutionGradient) { inline void setSolutionFunction(const function *functionSolution, const function *functionSolutionGradient) {
_functionSolution = functionSolution; _functionSolution = functionSolution;
_functionSolutionGradient = functionSolutionGradient; _functionSolutionGradient = functionSolutionGradient;
for(std::vector<dataCacheMap*>::iterator it = _secondaryCaches.begin(); it != _secondaryCaches.end(); it++) {
(*it)->setSolutionFunction(functionSolution, functionSolutionGradient);
}
} }
inline void setReferenceSolutionFunction(const function *functionSolution, const function *functionSolutionGradient) { inline void setReferenceSolutionFunction(const function *functionSolution, const function *functionSolutionGradient) {
_containerSolution = functionSolution; _containerSolution = functionSolution;
...@@ -276,6 +278,9 @@ class dataCacheMap { ...@@ -276,6 +278,9 @@ class dataCacheMap {
for(std::list<dataCacheMap*>::iterator it = _children.begin(); it != _children.end(); it++) { for(std::list<dataCacheMap*>::iterator it = _children.begin(); it != _children.end(); it++) {
(*it)->setReferenceSolutionFunction(functionSolution, functionSolutionGradient); (*it)->setReferenceSolutionFunction(functionSolution, functionSolutionGradient);
} }
for(std::vector<dataCacheMap*>::iterator it = _secondaryCaches.begin(); it != _secondaryCaches.end(); it++) {
(*it)->setReferenceSolutionFunction(functionSolution, functionSolutionGradient);
}
} }
void setNbEvaluationPoints(int nbEvaluationPoints); void setNbEvaluationPoints(int nbEvaluationPoints);
inline int getNbEvaluationPoints() { return _nbEvaluationPoints; } inline int getNbEvaluationPoints() { return _nbEvaluationPoints; }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment