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

deactivate DR[SV]DT if VAPPARS is present

Browse Source 
actually, it depends on the ordering of these keywords, but this
requires some probably rather extensive changes in opm-parser.
This commit is contained in:
Andreas Lauser 2017-12-19 17:25:02 +01:00
parent 404b8d38b9
commit 853d64c12c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ebos/eclproblem.hh
View File

@ -358,10 +358,16 @@ public:
if (!deck.hasKeyword("NOGRAV") && EWOMS_GET_PARAM(TypeTag, bool, EnableGravity)) if (!deck.hasKeyword("NOGRAV") && EWOMS_GET_PARAM(TypeTag, bool, EnableGravity))
this->gravity_[dim - 1] = 9.80665; this->gravity_[dim - 1] = 9.80665;
// this is actually not fully correct: the latest occurence of VAPPARS and DRSDT
// or DRVDT up to the current time step in the schedule section counts, presence
// of VAPPARS alone is not sufficient to disable DR[SV]DT. TODO: implment support
// for this in opm-parser's Schedule object"
bool hasVappars = deck.hasKeyword("VAPPARS");
// deal with DRSDT // deal with DRSDT
maxDRsDt_ = 0.0; maxDRsDt_ = 0.0;
maxDRs_ = -1.0; maxDRs_ = -1.0;
if (deck.hasKeyword("DRSDT")) { if (!hasVappars && deck.hasKeyword("DRSDT")) {
const auto& drsdtKeyword = deck.getKeyword("DRSDT"); const auto& drsdtKeyword = deck.getKeyword("DRSDT");
maxDRsDt_ = drsdtKeyword.getRecord(0).getItem("DRSDT_MAX").getSIDouble(0); maxDRsDt_ = drsdtKeyword.getRecord(0).getItem("DRSDT_MAX").getSIDouble(0);
size_t numDof = this->model().numGridDof(); size_t numDof = this->model().numGridDof();
@ -371,7 +377,7 @@ public:
// deal with DRVDT // deal with DRVDT
maxDRvDt_ = 0.0; maxDRvDt_ = 0.0;
maxDRv_ = -1.0; maxDRv_ = -1.0;
if (deck.hasKeyword("DRVDT")) { if (!hasVappars && deck.hasKeyword("DRVDT")) {
const auto& drvdtKeyword = deck.getKeyword("DVSDT"); const auto& drvdtKeyword = deck.getKeyword("DVSDT");
maxDRvDt_ = drvdtKeyword.getRecord(0).getItem("DRVDT_MAX").getSIDouble(0); maxDRvDt_ = drvdtKeyword.getRecord(0).getItem("DRVDT_MAX").getSIDouble(0);
size_t numDof = this->model().numGridDof(); size_t numDof = this->model().numGridDof();