Skip to content

working on NORST keyword and related #7000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ElyesAhmed wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −16
Open

working on NORST keyword and related #7000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions opm/simulators/flow/GenericOutputBlackoilModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,10 +615,12 @@ doAllocBuffers(const unsigned bufferSize,
}
}

if (auto& norst = rstKeywords["NORST"]; norst > 0) {
// Don't emit diagnostic messages about unsupported 'NORST' key.
norst = 0;
}
const int norst_value = rstKeywords["NORST"];
rstKeywords["NORST"] = 0; // Don't emit diagnostic about NORST

// For NORST >= 1 (graphics-only restart), suppress hysteresis arrays.
const EclHysteresisConfig* effectiveHysteresisConfig =
(norst_value > 0) ? nullptr : hysteresisConfig;

// We always output oil pressure
rstKeywords["PRES"] = 0;
Expand Down Expand Up @@ -740,28 +742,28 @@ doAllocBuffers(const unsigned bufferSize,
Entry{&pSalt_, "", enableSaltPrecipitation_},
Entry{&permFact_, "", enableSaltPrecipitation_ || enableBioeffects_},
Entry{&soMax_, "", oilvap.getType() == OilVapP::VAPPARS},
Entry{&soMax_, "", hysteresisConfig &&
hysteresisConfig->enableNonWettingHysteresis() &&
Entry{&soMax_, "", effectiveHysteresisConfig &&
effectiveHysteresisConfig->enableNonWettingHysteresis() &&
FluidSystem::phaseIsActive(oilPhaseIdx) &&
FluidSystem::phaseIsActive(waterPhaseIdx)},
Entry{&sgmax_, "", hysteresisConfig &&
hysteresisConfig->enableNonWettingHysteresis() &&
Entry{&sgmax_, "", effectiveHysteresisConfig &&
effectiveHysteresisConfig->enableNonWettingHysteresis() &&
FluidSystem::phaseIsActive(oilPhaseIdx) &&
FluidSystem::phaseIsActive(gasPhaseIdx)},
Entry{&swMax_, "", hysteresisConfig &&
hysteresisConfig->enableWettingHysteresis() &&
Entry{&swMax_, "", effectiveHysteresisConfig &&
effectiveHysteresisConfig->enableWettingHysteresis() &&
FluidSystem::phaseIsActive(oilPhaseIdx) &&
FluidSystem::phaseIsActive(waterPhaseIdx)},
Entry{&shmax_, "", hysteresisConfig &&
hysteresisConfig->enableWettingHysteresis() &&
Entry{&shmax_, "", effectiveHysteresisConfig &&
effectiveHysteresisConfig->enableWettingHysteresis() &&
FluidSystem::phaseIsActive(oilPhaseIdx) &&
FluidSystem::phaseIsActive(gasPhaseIdx)},
Entry{&swmin_, "", hysteresisConfig &&
hysteresisConfig->enablePCHysteresis() &&
Entry{&swmin_, "", effectiveHysteresisConfig &&
effectiveHysteresisConfig->enablePCHysteresis() &&
FluidSystem::phaseIsActive(oilPhaseIdx) &&
FluidSystem::phaseIsActive(waterPhaseIdx)},
Entry{&somin_, "", hysteresisConfig &&
hysteresisConfig->enablePCHysteresis() &&
Entry{&somin_, "", effectiveHysteresisConfig &&
effectiveHysteresisConfig->enablePCHysteresis() &&
FluidSystem::phaseIsActive(oilPhaseIdx) &&
FluidSystem::phaseIsActive(gasPhaseIdx)},
Entry{&ppcw_, "PPCW", eclState_.fieldProps().has_double("SWATINIT")},
Expand Down