mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Now using value (also default) from EQLDIMS item 2, unless --num-pressure-points-equil=N is specified on the command line.
This commit is contained in:
parent
31ecb416be
commit
e5e7ff7287
@ -91,6 +91,8 @@
|
|||||||
|
|
||||||
#include <opm/common/OpmLog/OpmLog.hpp>
|
#include <opm/common/OpmLog/OpmLog.hpp>
|
||||||
|
|
||||||
|
#include <opm/input/eclipse/Parser/ParserKeywords/E.hpp>
|
||||||
|
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
@ -592,7 +594,7 @@ struct OutputMode<TypeTag, TTag::EclBaseProblem> {
|
|||||||
// Parameterize equilibration accuracy
|
// Parameterize equilibration accuracy
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct NumPressurePointsEquil<TypeTag, TTag::EclBaseProblem> {
|
struct NumPressurePointsEquil<TypeTag, TTag::EclBaseProblem> {
|
||||||
static constexpr int value = 2000;
|
static constexpr int value = ParserKeywords::EQLDIMS::DEPTH_NODES_P::defaultValue;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -821,7 +823,17 @@ public:
|
|||||||
this->maxTimeStepAfterWellEvent_ = EWOMS_GET_PARAM(TypeTag, Scalar, EclMaxTimeStepSizeAfterWellEvent);
|
this->maxTimeStepAfterWellEvent_ = EWOMS_GET_PARAM(TypeTag, Scalar, EclMaxTimeStepSizeAfterWellEvent);
|
||||||
this->restartShrinkFactor_ = EWOMS_GET_PARAM(TypeTag, Scalar, EclRestartShrinkFactor);
|
this->restartShrinkFactor_ = EWOMS_GET_PARAM(TypeTag, Scalar, EclRestartShrinkFactor);
|
||||||
this->maxFails_ = EWOMS_GET_PARAM(TypeTag, unsigned, MaxTimeStepDivisions);
|
this->maxFails_ = EWOMS_GET_PARAM(TypeTag, unsigned, MaxTimeStepDivisions);
|
||||||
this->numPressurePointsEquil_ = EWOMS_GET_PARAM(TypeTag, int, NumPressurePointsEquil);
|
|
||||||
|
// The value N for this parameter is defined in the following order of presedence:
|
||||||
|
// 1. Command line value (--num-pressure-points-equil=N)
|
||||||
|
// 2. EQLDIMS item 2
|
||||||
|
// Default value is defined in opm-common/src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQLDIMS
|
||||||
|
if (EWOMS_PARAM_IS_SET(TypeTag, int, NumPressurePointsEquil))
|
||||||
|
{
|
||||||
|
this->numPressurePointsEquil_ = EWOMS_GET_PARAM(TypeTag, int, NumPressurePointsEquil);
|
||||||
|
} else {
|
||||||
|
this->numPressurePointsEquil_ = simulator.vanguard().eclState().getTableManager().getEqldims().getNumDepthNodesP();
|
||||||
|
}
|
||||||
|
|
||||||
RelpermDiagnostics relpermDiagnostics;
|
RelpermDiagnostics relpermDiagnostics;
|
||||||
relpermDiagnostics.diagnosis(vanguard.eclState(), vanguard.cartesianIndexMapper());
|
relpermDiagnostics.diagnosis(vanguard.eclState(), vanguard.cartesianIndexMapper());
|
||||||
|
Loading…
Reference in New Issue
Block a user