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

Merge pull request #3433 from osae/tracerDefaultTrue

Browse Source 
Default activation of tracer model.
This commit is contained in:
Bård Skaflestad 2021-07-07 11:54:28 +02:00 committed by GitHub
commit 2627a05c1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/eclproblem.hh
View File

@ -541,7 +541,7 @@ struct EnableThermalFluxBoundaries<TypeTag, TTag::EclBaseProblem> {
template<class TypeTag> template<class TypeTag>
struct EnableTracerModel<TypeTag, TTag::EclBaseProblem> { struct EnableTracerModel<TypeTag, TTag::EclBaseProblem> {
static constexpr bool value = false; static constexpr bool value = true;
}; };
// By default, simulators derived from the EclBaseProblem are production simulators, // By default, simulators derived from the EclBaseProblem are production simulators,

37
opm/simulators/utils/PartiallySupportedFlowKeywords.cpp
View File

@ -142,6 +142,20 @@ partiallySupported()
{25,{false, allow_values<std::string> {}, "RESVED should be defaulted (1*) - ignored as not used"}}, // RESERVED {25,{false, allow_values<std::string> {}, "RESVED should be defaulted (1*) - ignored as not used"}}, // RESERVED
}, },
}, },
{
"TRACER",
{
{4,{false, allow_values<std::string> {}, "SOLUTION_PHASE: not supported - ignored as not used"}}, // SOLUTION_PHASE
{6,{false, allow_values<std::string> {}, "ADSORB_PHASE: not supported - ignored as not used"}}, // ADSORB_PHASE
},
},
{
"TRACERS",
{
{5,{false, allow_values<std::string> {"NODIFF"}, "NUMERIC_DIFF: not supported - ignored as not used"}}, // NUMERIC_DIFF
{8,{false, allow_values<std::string> {"NO"}, "PASSIVE_NONLINEAR: not supported - ignored as not used"}}, // PASSIVE_NONLINEAR
},
},
{ {
"UDQDIMS", "UDQDIMS",
{ {
@ -251,6 +265,23 @@ partiallySupported()
{24,{false, allow_values<int> {0}, "MXNKVT should be defaulted (0) - ignored as not used"}}, // NUM_KVALUE_TABLES {24,{false, allow_values<int> {0}, "MXNKVT should be defaulted (0) - ignored as not used"}}, // NUM_KVALUE_TABLES
}, },
}, },
{
"TRACER",
{
{5,{false, allow_values<int> {0}, "NUM_PART_TABLE should be defaulted (0) - ignored as not used"}}, // NUM_PART_TABLE
},
},
{
"TRACERS",
{
{4,{false, allow_values<int> {0}, "MAX_ENV_TRACERS: not supported - ignored as not used"}}, // MAX_ENV_TRACERS
{6,{false, allow_values<int> {12}, "MAX_ITER: not supported - ignored as not used"}}, // MAX_ITER
{7,{false, allow_values<int> {1}, "MIN_ITER: not supported - ignored as not used"}}, // MIN_ITER
{9,{false, allow_values<int> {}, "ONEOFF_LIN_TIGHT: not supported - ignored as not used"}}, // ONEOFF_LIN_TIGHT
{10,{false, allow_values<int> {}, "ONEOFF_NLIN_TIGHT: not supported - ignored as not used"}}, // ONEOFF_NLIN_TIGHT
{12,{false, allow_values<int> {0}, "NTIGHTFACTORS: not supported - ignored as not used"}}, // NTIGHTFACTORS
},
},
{ {
"UDADIMS", "UDADIMS",
{ {
@ -338,6 +369,12 @@ partiallySupported()
{4,{false, allow_values<double> {0}, "CARKZEXP transmissibility dependent on porosity model is not supported"}}, // CARKZEXP {4,{false, allow_values<double> {0}, "CARKZEXP transmissibility dependent on porosity model is not supported"}}, // CARKZEXP
}, },
}, },
{
"TRACERS",
{
{11,{false, allow_values<double> {1.0}, "TIGHTENING_FACTORS: not supported - ignored as not used"}}, // TIGHTENING_FACTORS
},
},
}; };
return partially_supported_keywords_double; return partially_supported_keywords_double;

2
opm/simulators/utils/UnsupportedFlowKeywords.cpp
View File

@ -645,8 +645,6 @@ const KeywordValidation::UnsupportedKeywords& unsupportedKeywords()
{"TRACERKP", {false, std::nullopt}}, {"TRACERKP", {false, std::nullopt}},
{"TRACITVD", {false, std::nullopt}}, {"TRACITVD", {false, std::nullopt}},
{"TRACTVD", {false, std::nullopt}}, {"TRACTVD", {false, std::nullopt}},
{"TRACER", {false, std::nullopt}},
{"TRACERS", {false, std::nullopt}},
{"TRACITVD", {false, std::nullopt}}, {"TRACITVD", {false, std::nullopt}},
{"TRADS", {false, std::nullopt}}, {"TRADS", {false, std::nullopt}},
{"TRANGL", {false, std::nullopt}}, {"TRANGL", {false, std::nullopt}},