OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes and formatting issues addressed.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2022-10-11 15:42:52 +02:00 committed by Elyes Ahmed
parent c1b3c5e973
commit b7bc8437e7
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ebos/eclwriter.hh
View File

@ -39,10 +39,14 @@
#include <dune/grid/common/partitionset.hh> #include <dune/grid/common/partitionset.hh>
#include <limits>
#include <stdexcept>
#include <string>
#if HAVE_DAMARIS #if HAVE_DAMARIS
#include <opm/simulators/utils/DamarisOutputModule.hpp> #include <opm/simulators/utils/DamarisOutputModule.hpp>
#endif #endif
#include <string>
namespace Opm::Properties { namespace Opm::Properties {
@ -146,9 +150,8 @@ public:
, simulator_(simulator) , simulator_(simulator)
{ {
#ifdef HAVE_DAMARIS #ifdef HAVE_DAMARIS
if (enableDamarisOutput_()) this->damarisUpdate_ = enableDamarisOutput_();
this->damarisUpdate = true ; #endif
#endif
this->eclOutputModule_ = std::make_unique<EclOutputBlackOilModule<TypeTag>>(simulator, this->wbp_index_list_, this->collectToIORank_); this->eclOutputModule_ = std::make_unique<EclOutputBlackOilModule<TypeTag>>(simulator, this->wbp_index_list_, this->collectToIORank_);
this->wbp_index_list_.clear(); this->wbp_index_list_.clear();
} }
@ -298,27 +301,26 @@ public:
this->prepareLocalCellData(isSubStep, reportStepNum); this->prepareLocalCellData(isSubStep, reportStepNum);
this->eclOutputModule_->outputErrorLog(simulator_.gridView().comm()); this->eclOutputModule_->outputErrorLog(simulator_.gridView().comm());
#ifdef HAVE_DAMARIS #ifdef HAVE_DAMARIS
if (EWOMS_GET_PARAM(TypeTag, bool, EnableDamarisOutput)) { if (EWOMS_GET_PARAM(TypeTag, bool, EnableDamarisOutput)) {
/* N.B. damarisUpdate should be set to true if at any time the model geometry changes */ // N.B. damarisUpdate_ should be set to true if at any time the model geometry changes
if (this->damarisUpdate == true) if (this->damarisUpdate_) {
{ const auto& gridView = simulator_.gridView();
const auto& gridView = simulator_.gridView(); const int numElements = gridView.size(/*codim=*/0); // This it is the local ranks model size.
const int numElements = gridView.size(/*codim=*/0); // I think this might be the full model size? No, it is the local ranks model size Opm::DamarisOutput::setupDamarisWritingPars(simulator_.vanguard().grid().comm(), numElements);
Opm::DamarisOutput::setupDamarisWritingPars(simulator_.vanguard().grid().comm(), numElements); // By default we assume static grid
// By defauls we assume static grid this->damarisUpdate_ = false;
this->damarisUpdate = false; }
}
if (! isSubStep) { if (!isSubStep) {
data::Solution localCellData = {}; data::Solution localCellData = {};
this->eclOutputModule_->assignToSolution(localCellData); this->eclOutputModule_->assignToSolution(localCellData);
// Output the PRESSURE field // Output the PRESSURE field
if (this->eclOutputModule_->getPRESSURE_ptr() != nullptr) { if (this->eclOutputModule_->getPRESSURE_ptr() != nullptr) {
damaris_write("PRESSURE", (void *) this->eclOutputModule_->getPRESSURE_ptr()); damaris_write("PRESSURE", (void*)this->eclOutputModule_->getPRESSURE_ptr());
damaris_end_iteration( ); damaris_end_iteration();
} }
} }
} }
#endif #endif
// output using eclWriter if enabled // output using eclWriter if enabled
auto localWellData = simulator_.problem().wellModel().wellData(); auto localWellData = simulator_.problem().wellModel().wellData();
@ -457,7 +459,7 @@ public:
private: private:
static bool enableEclOutput_() static bool enableEclOutput_()
{ return EWOMS_GET_PARAM(TypeTag, bool, EnableEclOutput); } { return EWOMS_GET_PARAM(TypeTag, bool, EnableEclOutput); }
static bool enableDamarisOutput_() static bool enableDamarisOutput_()
{ return EWOMS_GET_PARAM(TypeTag, bool, EnableDamarisOutput); } { return EWOMS_GET_PARAM(TypeTag, bool, EnableDamarisOutput); }
@ -542,7 +544,7 @@ private:
std::unique_ptr<EclOutputBlackOilModule<TypeTag>> eclOutputModule_; std::unique_ptr<EclOutputBlackOilModule<TypeTag>> eclOutputModule_;
Scalar restartTimeStepSize_; Scalar restartTimeStepSize_;
#ifdef HAVE_DAMARIS #ifdef HAVE_DAMARIS
bool damarisUpdate ; ///< Whenever this is true writeOutput() will set up Damris offsets of model fields bool damarisUpdate_ = false; ///< Whenever this is true writeOutput() will set up Damaris offsets of model fields
#endif #endif
}; };
} // namespace Opm } // namespace Opm