tracer model: fix a few output messages

fixes some typos, adds better wording and fixes some duplication
issues on parallel runs.
This commit is contained in:
Andreas Lauser 2019-06-03 11:11:41 +02:00
parent b699f40cee
commit c86470e768
2 changed files with 13 additions and 6 deletions

View File

@ -2499,8 +2499,10 @@ private:
for (size_t pvtRegionIdx = 0; pvtRegionIdx < maxDRv_.size(); ++pvtRegionIdx)
maxDRv_[pvtRegionIdx] = oilVaporizationControl.getMaxDRVDT(pvtRegionIdx)*simulator.timeStepSize();
if (tracerModel().numTracers() > 0)
std::cout << "Warning: Restart is not implemented for the tracer model, it will initialize with initial tracer concentration" << std::endl;
if (tracerModel().numTracers() > 0 && this->gridView().comm().rank() == 0)
std::cout << "Warning: Restart is not implemented for the tracer model, it will initialize itself "
<< "with the initial tracer concentration.\n"
<< std::flush;
// assign the restart solution to the current solution. note that we still need
// to compute real initial solution after this because the initial fluid states

View File

@ -101,17 +101,22 @@ public:
return; // tracer treatment is supposed to be disabled
if (!EWOMS_GET_PARAM(TypeTag, bool, EnableTracerModel)) {
std::cout << "Warning: Tracer model is disabled but the deck contatins the TRACERS keyword \n";
std::cout << "The tracer model must be activated using --enable-tracer-model=true "<< std::endl;
if (simulator_.gridView().comm().rank() == 0) {
std::cout << "Warning: Tracer model is disabled but the deck contains the TRACERS keyword\n"
<< "The tracer model must be explictly activated using --enable-tracer-model=true\n"
<< std::flush;
}
return; // Tracer transport must be enabled by the user
}
if (!deck.hasKeyword("TRACER"))
throw std::runtime_error("the deck does not contain the TRACER keyword");
throw std::runtime_error("The deck does not contain the TRACER keyword");
if (simulator_.gridView().comm().size() > 1) {
tracerNames_.resize(0);
std::cout << "Warning: Tracer model is not compatible with mpi run" << std::endl;
if (simulator_.gridView().comm().rank() == 0)
std::cout << "Warning: The tracer model currently does not work for parallel runs\n"
<< std::flush;
return;
}