diff --git a/AMDiS/src/AdaptInfo.h b/AMDiS/src/AdaptInfo.h index ec8b7f60e299ca3c60c115299d368769bcdaa28a..7ef68b226e8b4ff35831ba83e08ef2fab3eec9e5 100644 --- a/AMDiS/src/AdaptInfo.h +++ b/AMDiS/src/AdaptInfo.h @@ -247,15 +247,15 @@ namespace AMDiS { void printTimeErrorLowInfo() { for (unsigned int i = 0; i < scalContents.size(); i++){ - std::cout << " Time error estimate = " + std::cout << " Time error estimate ["<<i<<"] = " << getTimeEstCombined(i) << "\n" - << " Time error estimate sum = " + << " Time error estimate sum ["<<i<<"] = " << scalContents[i]->est_t_sum << "\n" - << " Time error estimate max = " + << " Time error estimate max ["<<i<<"] = " << scalContents[i]->est_t_max << "\n" - << " Time error low bound = " + << " Time error low bound ["<<i<<"] = " << scalContents[i]->timeErrLow << "\n" - << " Time error high bound = " + << " Time error high bound ["<<i<<"] = " << scalContents[i]->timeTolerance << "\n"; } } diff --git a/AMDiS/src/AdaptInstationary.cc b/AMDiS/src/AdaptInstationary.cc index 996bf0c8064be013d87f039445658283350428e1..0306a206ffdff9ee008f5b61808d5f3617260d6f 100644 --- a/AMDiS/src/AdaptInstationary.cc +++ b/AMDiS/src/AdaptInstationary.cc @@ -235,7 +235,7 @@ namespace AMDiS { void AdaptInstationary::simpleAdaptiveTimeStrategy() { - FUNCNAME("AdaptInstationary::explicitTimeStrategy()"); + FUNCNAME("AdaptInstationary::simpleAdaptiveTimeStrategy()"); // estimate before first adaption if (adaptInfo->getTime() <= adaptInfo->getStartTime()) @@ -250,6 +250,12 @@ namespace AMDiS { problemIteration->oneIteration(adaptInfo, FULL_ITERATION); adaptInfo->setLastProcessedTimestep(adaptInfo->getTimestep()); + + if (dbgMode) { + std::cout << "=== ADAPT INFO DEBUG MODE ===\n"; + std::cout << "=== in simpleAdaptiveTimeStrategy() ===\n"; + adaptInfo->printTimeErrorLowInfo(); + } // First, check for increase of timestep if (!fixedTimestep && adaptInfo->timeErrorLow()) @@ -360,6 +366,7 @@ namespace AMDiS { Parameters::get(aName + "->time delta 2", timeDelta2); Parameters::get(aName + "->info", info); Parameters::get(aName + "->break when stable", breakWhenStable); + Parameters::get(aName + "->time adaptivity debug mode", dbgMode); Parameters::get(aName + "->queue->runtime", queueRuntime); Parameters::get(aName + "->queue->serialization filename", queueSerializationFilename); diff --git a/AMDiS/src/parallel/PetscSolver.h b/AMDiS/src/parallel/PetscSolver.h index 6dc58ee1c84a6dffb5efd398db8de3e8bc348643..d5f344f09c707780e2b3cca373526bfa8eb0d389 100644 --- a/AMDiS/src/parallel/PetscSolver.h +++ b/AMDiS/src/parallel/PetscSolver.h @@ -36,6 +36,7 @@ #include <petsc.h> #include <petscsys.h> #include <petscao.h> +#include <petscksp.h> namespace AMDiS {