diff --git a/AMDiS/src/AdaptInstationary.cc b/AMDiS/src/AdaptInstationary.cc index d07de2be8a064d535b9b328b94b0247a802e0721..0f19af914cd8559fdef1d4cb36db5bf6f74fdc0b 100644 --- a/AMDiS/src/AdaptInstationary.cc +++ b/AMDiS/src/AdaptInstationary.cc @@ -207,7 +207,7 @@ namespace AMDiS { oneTimestep(); problemTime_->closeTimestep(adaptInfo_); - if(breakWhenStable && (adaptInfo_->getSolverIterations() == 0)) { + if (breakWhenStable && (adaptInfo_->getSolverIterations() == 0)) { break; } diff --git a/AMDiS/src/ProblemInstat.cc b/AMDiS/src/ProblemInstat.cc index 5a5c43611843e9cd74363cf4bd77f06e92062e42..7a8d19569b306cc2547907302becf1abb3cfef9e 100644 --- a/AMDiS/src/ProblemInstat.cc +++ b/AMDiS/src/ProblemInstat.cc @@ -30,10 +30,6 @@ namespace AMDiS { initialAdapt.adapt(); } - // void ProblemInstatVec::solveInitialProblem(AdaptInfo *adaptInfo) - // { - // } - void ProblemInstatScal::transferInitialSolution(AdaptInfo *adaptInfo) { TEST_EXIT(adaptInfo->getTime() == @@ -56,25 +52,7 @@ namespace AMDiS { ProblemStatBase *initialProb) : ProblemInstat(name_, initialProb), problemStat(prob),oldSolution(NULL) - { - // create instationary adapt - // int maxSpaceIter = problemStat->getAdapt()->getAdaptInfo()->getMaxSpaceIteration(); - - // adaptInstat = NEW AdaptInstationary((name+"->adapt").c_str(), - // problemStat, - // this, - // problemStat->getAdaptInfo(), - // maxSpaceIter); - - // create oldSolution - /* oldSolution = NEW DOFVector<double>(problemStat->getFESpace(), name + "->uOld"); - oldSolution->refineInterpol(true); - oldSolution->setCoarsenOperation(COARSE_INTERPOL); - if(problemStat->getEstimator()) { - dynamic_cast<Estimator*>(problemStat->getEstimator()) - ->addUhOldToSystem(0, oldSolution); - } */ - }; + {}; ProblemInstatScal::~ProblemInstatScal() @@ -142,34 +120,7 @@ namespace AMDiS { ProblemStatBase *initialProb) : ProblemInstat(name_, initialProb), problemStat(prob),oldSolution(NULL) - { - // create instationary adapt - // int maxSpaceIter = problemStat->getAdapt()->getAdaptInfo()->getMaxSpaceIteration(); - - // adaptInstat = NEW AdaptInstationary((name+"->adapt").c_str(), - // problemStat, - // this, - // problemStat->getAdaptInfo(), - // maxSpaceIter); - - - - // create oldSolution - /* oldSolution = NEW SystemVector(problemStat->getFESpace(), size); - int i; - for(i = 0; i < size; i++) { - oldSolution->setDOFVector(i, NEW DOFVector<double>(problemStat->getFESpace(), - name + "->uOld")); - oldSolution->getDOFVector(i)->refineInterpol(true); - oldSolution->getDOFVector(i)->setCoarsenOperation(COARSE_INTERPOL); - - if(problemStat->getEstimator()) { - dynamic_cast<EstimatorVec*>(problemStat->getEstimator()) - ->getScalarEstimator(i) - ->addUhOldToSystem(i, oldSolution->getDOFVector(i)); - } - } */ - }; + {}; ProblemInstatVec::~ProblemInstatVec() { diff --git a/AMDiS/src/Traverse.cc b/AMDiS/src/Traverse.cc index 2bf2eadbdb00d82ebb1efeae04e6850d28d3bb10..8a7ead5096955e28ec8ea082aafb2667b3e948f8 100644 --- a/AMDiS/src/Traverse.cc +++ b/AMDiS/src/Traverse.cc @@ -563,18 +563,9 @@ namespace AMDiS { return NULL; stack_used = 1; - ::std::cout << "<1>" << ::std::endl; elinfo_stack[stack_used]->fillMacroInfo(traverse_mel); - ::std::cout << "<2>" << ::std::endl; info_stack[stack_used] = 0; - for (int i = 0; i < 3; i++) { - if (elinfo_stack[stack_used]->getNeighbour(i)) { - ::std::cout << "MACRO TEST SET[" << i << "] = " << (elinfo_stack[stack_used]->getNeighbour(i))->getIndex() << ::std::endl; - } - } - ::std::cout << "<3>" << ::std::endl; - return(elinfo_stack[stack_used]); }