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

GenericOutputBlackoilModule: check schedule directly for vappars

Browse Source 
avoids a bool param in doAllocBuffers
This commit is contained in:
Arne Morten Kvarving 2025-02-14 11:11:49 +01:00
parent ee6d34f4a4
commit 652a5a4646
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/flow/GenericOutputBlackoilModule.cpp
View File

@ -752,7 +752,6 @@ doAllocBuffers(const unsigned bufferSize,
const bool substep, const bool substep,
const bool log, const bool log,
const bool isRestart, const bool isRestart,
const bool vapparsActive,
const bool enablePCHysteresis, const bool enablePCHysteresis,
const bool enableNonWettingHysteresis, const bool enableNonWettingHysteresis,
const bool enableWettingHysteresis, const bool enableWettingHysteresis,
@ -953,6 +952,8 @@ doAllocBuffers(const unsigned bufferSize,
this->micpC_.allocate(bufferSize); this->micpC_.allocate(bufferSize);
} }
const bool vapparsActive = schedule_[std::max(reportStepNum, 0u)].oilvap().getType() ==
OilVaporizationProperties::OilVaporization::VAPPARS;
if (vapparsActive) { if (vapparsActive) {
soMax_.resize(bufferSize, 0.0); soMax_.resize(bufferSize, 0.0);
} }

1
opm/simulators/flow/GenericOutputBlackoilModule.hpp
View File

@ -327,7 +327,6 @@ protected:
const bool substep, const bool substep,
const bool log, const bool log,
const bool isRestart, const bool isRestart,
const bool vapparsActive = false,
const bool enablePCHysteresis = false, const bool enablePCHysteresis = false,
const bool enableNonWettingHysteresis = false, const bool enableNonWettingHysteresis = false,
const bool enableWettingHysteresis = false, const bool enableWettingHysteresis = false,

1
opm/simulators/flow/OutputBlackoilModule.hpp
View File

@ -184,7 +184,6 @@ public:
substep, substep,
log, log,
isRestart, isRestart,
problem.vapparsActive(std::max(simulator_.episodeIndex(), 0)),
problem.materialLawManager()->enablePCHysteresis(), problem.materialLawManager()->enablePCHysteresis(),
problem.materialLawManager()->enableNonWettingHysteresis(), problem.materialLawManager()->enableNonWettingHysteresis(),
problem.materialLawManager()->enableWettingHysteresis(), problem.materialLawManager()->enableWettingHysteresis(),

1
opm/simulators/flow/OutputCompositionalModule.hpp
View File

@ -162,7 +162,6 @@ public:
this->compC_.allocate(bufferSize, rstKeywords); this->compC_.allocate(bufferSize, rstKeywords);
this->doAllocBuffers(bufferSize, reportStepNum, substep, log, isRestart, this->doAllocBuffers(bufferSize, reportStepNum, substep, log, isRestart,
/* vapparsActive =*/ false,
/* enablePCHysteresis = */ false, /* enablePCHysteresis = */ false,
/* enableNonWettingHysteresis =*/ false, /* enableNonWettingHysteresis =*/ false,
/* enableWettingHysteresis =*/ false, /* enableWettingHysteresis =*/ false,