From c3fe22a6cf832224369a8af8eda2086f77f4533f Mon Sep 17 00:00:00 2001 From: OPMUSER Date: Wed, 23 Jun 2021 12:58:35 +0800 Subject: [PATCH 1/4] PartiallySupportedKeywords for RUNSPEC and GRID Sections RUNSPEC and GRID keywords for partially supported keywords --- .../utils/PartiallySupportedFlowKeywords.cpp | 325 ++++++++++++++++-- 1 file changed, 291 insertions(+), 34 deletions(-) diff --git a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp index 292dbedb0a..7534b5147f 100644 --- a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp +++ b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp @@ -15,6 +15,9 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . + + Generated : keyw-code.py + Date : 2021-06-23 12:54:52 */ #include @@ -27,55 +30,309 @@ template <> const PartiallySupportedKeywords& partiallySupported() { - static const PartiallySupportedKeywords partially_supported_keywords_strings = { - { + static const PartiallySupportedKeywords partially_supported_keywords_strings = { + { + "BRINE", + { + {1,{false, allow_values {}, "SALTS Multi-Component Brine model not supported"}}, // NO_NAME + }, + }, + { "COMPORD", { - {2, {false, allow_values{"INPUT"}, std::nullopt}}, // ORDER_TYPE + {2,{false, allow_values {"DEPTH", "INPUT", "TRACK"}, "COMPORD should be DEPTH/INPUT/TRACK"}}, // ORDER_TYPE }, - }, - { - "ENDSCALE", + }, + { + "EDITNNC", { - {1, {false, allow_values{"NODIR"}, std::nullopt}}, // DIRECT - {2, {false, allow_values{"REVERS"}, std::nullopt}}, // IRREVERS + {12,{false, allow_values {}, "FACE1 not supported use 1* - will continue"}}, // VE_FACE1 + {13,{false, allow_values {}, "FACE2 not supported use 1* - will continue"}}, // VE_FACE2 }, - }, - { - "PINCH", - { - {2, {false, allow_values{"GAP"}, std::nullopt}}, // GAP - {4, {false, allow_values{"TOPBOT"}, std::nullopt}}, // PINCHOUT_OPTION - }, - }, - }; - - return partially_supported_keywords_strings; -} - -template <> -const PartiallySupportedKeywords& -partiallySupported() -{ - static const PartiallySupportedKeywords partially_supported_keywords_int = { - { + }, + { "EHYSTR", { - {2, {false, allow_values{0}, std::nullopt}}, // relative_perm_hyst + {5,{false, allow_values {"BOTH"}, "HYSTOPT only default value of BOTH is supported – will STOP"}}, // limiting_hyst_flag + {6,{false, allow_values {"RETR"}, "HYSTSCAN is not supported and is ignored"}}, // shape_cap_press_flag + {7,{false, allow_values {"DRAIN"}, "HYSTMOB is not supported and is ignored"}}, // init_fluid_mob_flag + {8,{false, allow_values {"OIL"}, "HYSTWET is not supported and is ignored"}}, // wetting_phase_flag + {9,{false, allow_values {"NO"}, "NOTUSED and is ignored"}}, // baker_flag_oil + {10,{false, allow_values {"NO"}, "NOTUSED and is ignored"}}, // baker_flag_gas + {11,{false, allow_values {"NO"}, "NOTUSED and is ignored"}}, // baker_flag_water }, - }, - }; + }, + { + "ENDSCALE", + { + {1,{false, allow_values {"NODIR"}, "DIRECT only default value of NODIR supported"}}, // DIRECT + {2,{false, allow_values {"REVERS"}, "IRREVERS only default value of REVERS supported"}}, // IRREVERS + }, + }, + { + "EQLOPTS", + { + {1,{false, allow_values {"THPRES"}, "MOBILE fluid critical saturation end point correction option not supported – value ignored"}}, // OPTION1 + {2,{false, allow_values {"THPRES"}, "QUIESC quiescence option not supported – value ignored"}}, // OPTION2 + {3,{false, allow_values {"THPRES"}, "THPRES invalid value for THPRES"}}, // OPTION3 + {4,{false, allow_values {"THPRES"}, "IRREVER irreversible inter-region equilibration flow option not supported - value ignored"}}, // OPTION4 + }, + }, + { + "GRIDOPTS", + { + {1,{false, allow_values {"NO"}, "TRANMULT only the NO option is supported – value ignored"}}, // TRANMULT + }, + }, + { + "MISCIBLE", + { + {3,{false, allow_values {"NONE"}, "MISOPT only option NONE is supported – value ignored"}}, // TWOPOINT + }, + }, + { + "MULTIREG", + { + {4,{false, allow_values {"F", "M", "O"}, "REGION_NAME must equal to F/M or O"}}, // REGION_NAME + }, + }, + { + "MULTREGP", + { + {3,{false, allow_values {"F", "M", "O"}, "REGION_NAME must equal to F/M or O"}}, // REGION_NAME + }, + }, + { + "MULTREGT", + { + {6,{false, allow_values {"F", "M", "O"}, "REGION_NAME must equal to F/M or O"}}, // REGION_NAME + }, + }, + { + "NNC", + { + {12,{false, allow_values {}, "FACE1 not supported use 1* - will continue"}}, // VE_FACE1 + {13,{false, allow_values {}, "FACE2 not supported use 1* - will continue"}}, // VE_FACE2 + }, + }, + { + "ROCKCOMP", + { + {1,{false, allow_values {"REVERS"}, "ROCKOPT only the REVERS option is supported"}}, // HYSTERESIS + {3,{false, allow_values {"YES"}, "WATINOPT only equal to YES is supported"}}, // WATER_COMPACTION + {4,{false, allow_values {}, "PORTXROP transmissibility dependent on porosity model is not supported"}}, // PORTXROP + }, + }, + { + "SATOPTS", + { + {1,{false, allow_values {"HYSTER"}, "DIRECT directional relative permeability assignment option not supported - value ignored"}}, // options + {2,{false, allow_values {"HYSTER"}, "IRREVERS reversible directional relative permeability assignment option not supported – value ignored"}}, // IRREVERS + {3,{false, allow_values {"HYSTER"}, "HYSTER hysteresis directional relative permeability assignment option not supported - value ignored"}}, // HYSTER + {4,{false, allow_values {"HYSTER"}, "SURFTENS capillary pressure surface tension pressure dependency option not supported – value ignored"}}, // SURFTENS + }, + }, + { + "SPECGRID", + { + {5,{true, allow_values {"F"}, "TYPE only option F (Cartesian grids supported) supported – will STOP"}}, // COORD_TYPE + }, + }, + { + "UDQDIMS", + { + {11,{false, allow_values {"N"}, "RSEED option is not supported – value ignored"}}, // RESTART_NEW_SEED + }, + }, + }; - return partially_supported_keywords_int; + return partially_supported_keywords_strings; } template <> -const PartiallySupportedKeywords& +const KeywordValidation::PartiallySupportedKeywords& partiallySupported() { - static const PartiallySupportedKeywords partially_supported_keywords_double = {}; + static const KeywordValidation::PartiallySupportedKeywordspartially_supported_keywords_int = { + { + "AQUCON", + { + {11,{false, allow_values {1}, "VEOPT1 Vertical Equilibrium option one– not used"}}, // VEFRAC + {12,{false, allow_values {1}, "VEOPI2 Vertical Equilibrium option two– not used"}}, // VEFRACP + }, + }, + { + "EDITNNC", + { + {8,{false, allow_values {0}, "ISATNUM1 only default value of 0 supported – will continue"}}, // SIM_DEPENDENT1 + {9,{false, allow_values {0}, "ISATNUM2 only default value of 0 supported – will continue"}}, // SIM_DEPENDENT2 + {10,{false, allow_values {0}, "IPRSNUM1 only default value of 0 supported – will continue"}}, // PRESSURE_TABLE1 + {11,{false, allow_values {0}, "IPRSNUM2 only default value of 0 supported – will continue"}}, // PRESSURE_TABLE2 + }, + }, + { + "EHYSTR", + { + {2,{false, allow_values {0}, "HYSTMOD only default value of 0 (Carlson Hysteresis Model) supported"}}, // relative_perm_hyst + {13,{false, allow_values {0}, "NOTUSED and is ignored"}}, // FLAG_SOMETHING + }, + }, + { + "ENDSCALE", + { + {3,{false, allow_values {1}, "NTENDP depth end-point scaling not supported – value ignored"}}, // NTENDP + {4,{false, allow_values {20}, "NNODES depth end-point scaling not supported – value ignored"}}, // NSENDP + {5,{false, allow_values {0}, "MODE depth temperature end-point scaling not supported – value ignored"}}, // COMP_MODE + }, + }, + { + "EQLDIMS", + { + {4,{false, allow_values {1}, "NTTRVD tracer end-point depth scaling not supported – value ignored"}}, // NTTRVD + {5,{false, allow_values {20}, "NSTRVD tracer end-point depth scaling not supported – value ignored"}}, // NSTRVD + }, + }, + { + "GRIDFILE", + { + {1,{false, allow_values {0}, "NGRID only default value of 0 supported – will continue"}}, // GRID + {2,{false, allow_values {1}, "NEGRID only default value of 1 supported – will continue"}}, // EGRID + }, + }, + { + "NETWORK", + { + {3,{false, allow_values {}, "NBCMAX option is not used – value ignored"}}, // NBCMAX + }, + }, + { + "NNC", + { + {8,{false, allow_values {0}, "ISATNUM1 only default value of 0 supported – will continue"}}, // SIM_DEPENDENT1 + {9,{false, allow_values {0}, "ISATNUM2 only default value of 0 supported – will continue"}}, // SIM_DEPENDENT2 + {10,{false, allow_values {0}, "IPRSNUM1 only default value of 0 supported – will continue"}}, // PRESSURE_TABLE1 + {11,{false, allow_values {0}, "IPRSNUM2 only default value of 0 supported – will continue"}}, // PRESSURE_TABLE2 + {17,{false, allow_values {0}, "PERMNNC only default value of 0 supported – will continue"}}, // VDFLOW_PERM + }, + }, + { + "NUMRES", + { + {1,{true, allow_values {1}, "NUMRES only a value of one is supported – will STOP"}}, // NUM + }, + }, + { + "REGDIMS", + { + {5,{false, allow_values {0}, "NUSREG compositional TRACK regions not supported - value ignored"}}, // "MAX_ETRACK + {6,{false, allow_values {1}, "NTCREG COAL regions not supported - value ignored"}}, // NTCREG + {8,{false, allow_values {0}, "NWKDREG should be equal to 0 - value ignored"}}, // MAX_OPERATE_DWORK + {9,{false, allow_values {0}, "NWKIREG should be equal to 0 - value ignored"}}, // MAX_OPERATE_IWORK + }, + }, + { + "SPECGRID", + { + {4,{false, allow_values {1}, "NUMRES must be greater than or equal to 1"}}, // NUMRES + }, + }, + { + "TABDIMS", + { + {7,{false, allow_values {20}, "NRVPVT should be defaulted (20) – ignored as not used"}}, // MAX_RV_NODES" + {9,{false, allow_values {1}, "NMEOSR must be greater than or equal to 1"}}, // NUM_EOS_RES + {10,{false, allow_values {1}, "NMEOSS should be equal to 1 - ignored as not used"}}, // NUM_EOS_SURFACE + {12,{false, allow_values {1}, "MXNTHR should be equal to 1 - ignored as not used"}}, // MAX_THERMAL_REGIONS + {14,{false, allow_values {0}, "MXNPMR should be equal to 0 - ignored as not used"}}, // MAX_PRESSURE_MAINTAINANCE_REGIONS + {15,{false, allow_values {0}, "NTABKT should be defaulted (0) - ignored as not used"}}, // MAX_KVALUE_TABLES + {16,{false, allow_values {0}, "NTALPHA should be defaulted (0) - ignored as not used"}}, // NTALPHA + {17,{false, allow_values {10}, "NASPKA should be defaulted (10) - ignored as not used"}}, // ASPHALTENE_ASPKDAM_MAX_ROWS + {18,{false, allow_values {10}, "MXRAWG should be defaulted (10) - ignored as not used"}}, // ASPHALTENE_ASPREWG_MAX_ROWS + {19,{false, allow_values {10}, "MXRASO should be defaulted (10) - ignored as not used"}}, // ASPHALTENE_ASPVISO_MAX_ROWS + {20,{false, allow_values {}, "NOTUSED should be defaulted (1*) - ignored as not used"}}, // ITEM20_NOT_USED + {21,{false, allow_values {5}, "MCASPP should be defaulted (5) - ignored as not used"}}, // ASPHALTENE_ASPPW2D_MAX_COLUMNS + {22,{false, allow_values {5}, "MRASPP should be defaulted (5) - ignored as not used"}}, // ASPHALTENE_ASPPW2D_MAX_ROWS + {23,{false, allow_values {5}, "MXRATF should be defaulted (5) - ignored as not used"}}, // ASPHALTENE_ASPWETF_MAX_ROWS + {24,{false, allow_values {0}, "MXNKVT should be defaulted (0) - ignored as not used"}}, // NUM_KVALUE_TABLES + {25,{false, allow_values {}, "RESVED should be defaulted (1*) - ignored as not used"}}, // RESERVED + }, + }, + { + "UDADIMS", + { + {2,{false, allow_values {0}, "IGNORED should be equal to 0 – ignored as not used"}}, // IGNORED + }, + }, + { + "UDQPARAM", + { + {1,{false, allow_values {1}, "RSEED option not supported – value ignored"}}, // RANDOM_SEED + }, + }, + { + "WELLDIMS", + { + {5,{false, allow_values {5}, "MXSTAGE option not supported – value ignored"}}, // MAX_STAGES + {6,{false, allow_values {10}, "MXSTRMS option not supported – value ignored"}}, // MAX_STREAMS + {7,{false, allow_values {5}, "MXMIS option not supported – value ignored"}}, // MAX_MIXTURES + {8,{false, allow_values {4}, "MXSEPS option not supported – value ignored"}}, // MAX_SEPARATORS + {9,{false, allow_values {3}, "MXCOMPS option not supported – value ignored"}}, // MAX_MIXTURE_ITEMS + {10,{false, allow_values {0}, "MXDOCOMP option not supported – value ignored"}}, // MAX_COMPLETION_X + {11,{false, allow_values {1}, "MXWSLIST option not supported – value ignored"}}, // MAX_WELLIST_PR_WELL + {12,{false, allow_values {1}, "MXWLISTS option not supported – value ignored"}}, // MAX_DYNAMIC_WELLIST + {13,{false, allow_values {10}, "MXWSECD option not supported – value ignored"}}, // MAX_SECONDARY_WELLS + {14,{false, allow_values {201}, "MXNGPP option not supported – value ignored"}}, // NO_JASON_ENTRY + }, + }, + }; - return partially_supported_keywords_double; + return partially_supported_keywords_int; +} + +template <> +const KeywordValidation::PartiallySupportedKeywords& +partiallySupported() +{ + static const KeywordValidation::PartiallySupportedKeywords partially_supported_keywords_double = { + { + "AQUCT", + { + {12,{false, allow_values {0.0}, "SALTCON option is not used – value ignored"}}, // INI_SALT + {13,{false, allow_values {}, "TEMP option is not used – value ignored"}}, // TEMP_AQUIFER + }, + }, + { + "EDITNNC", + { + {14,{false, allow_values {0}, "DIFFNNC not supported – will continue"}}, // DIFFUSIVITY + }, + }, + { + "EHYSTR", + { + {1,{false, allow_values {0.1}, "HYSTRCP option not supported – value ignored"}}, // curvature_caplillary_pressure_hyst + {3,{false, allow_values {1.00}, "HYSTREL is not supported and is ignored"}}, // curvature_param_killough_wetting + {4,{false, allow_values {0.1}, "HYSTSGR is not supported and is ignored"}}, // mod_param_trapped + {12,{false, allow_values {0}, "NOTUSED and is ignored"}}, // threshold_saturation + }, + }, + { + "MULTFLT", + { + {3,{false, allow_values {}, "FLT-DIF the diffusivity multiplier option is not supported – will continue"}}, // REGION_NAME + }, + }, + { + "NNC", + { + {14,{false, allow_values {0}, "DIFFNNC not supported – will continue"}}, // DIFFUSIVITY + {15,{false, allow_values {0}, "DISPNNC not supported – will continue"}}, // SIM_DEPENDENT3 + {16,{false, allow_values {0}, "AREANNC not supported – will continue"}}, // VDFLOW_AREA + }, + }, + }; + + return partially_supported_keywords_double; } } // namespace Opm::FlowKeywordValidation From e7b28b1b5f4d59b76317e502e357c060d41f63ec Mon Sep 17 00:00:00 2001 From: OPMUSER Date: Fri, 25 Jun 2021 13:01:29 +0800 Subject: [PATCH 2/4] Removed NUMRES from UnsupportedKeywords List Removed NUMRES from UnsupportedKeywords list and will trap values not equal to 1 in the PartiallySupportedKeyword list. PartiallySupportedKeyword update to follow. --- opm/simulators/utils/UnsupportedFlowKeywords.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/opm/simulators/utils/UnsupportedFlowKeywords.cpp b/opm/simulators/utils/UnsupportedFlowKeywords.cpp index 1430cbc518..c5771b7de9 100644 --- a/opm/simulators/utils/UnsupportedFlowKeywords.cpp +++ b/opm/simulators/utils/UnsupportedFlowKeywords.cpp @@ -425,7 +425,6 @@ const KeywordValidation::UnsupportedKeywords& unsupportedKeywords() {"NORSSPEC", {false, std::nullopt}}, {"NOWARN", {false, std::nullopt}}, {"NSTACK", {false, std::nullopt}}, - {"NUMRES", {false, std::nullopt}}, {"NWATREM", {false, std::nullopt}}, {"NXFIN", {false, std::nullopt}}, {"NYFIN", {false, std::nullopt}}, From 2cf11dfe05a9989e669f4ffab70e7ba917233e54 Mon Sep 17 00:00:00 2001 From: OPMUSER Date: Fri, 25 Jun 2021 13:17:13 +0800 Subject: [PATCH 3/4] Revised RUNSPEC and GRID PartiallySupportedFlowKeywords.cpp Revised version for RUNSPEC and GRID partially supported keywords. Fixed miss match with value type and comments etc. Also Trap NUMRES != 1 with STOP if > 1. --- .../utils/PartiallySupportedFlowKeywords.cpp | 65 +++++++++++-------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp index 7534b5147f..1454fc5a1f 100644 --- a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp +++ b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . Generated : keyw-code.py - Date : 2021-06-23 12:54:52 + Date : 2021-06-25 13:02:39 */ #include @@ -46,8 +46,8 @@ partiallySupported() { "EDITNNC", { - {12,{false, allow_values {}, "FACE1 not supported use 1* - will continue"}}, // VE_FACE1 - {13,{false, allow_values {}, "FACE2 not supported use 1* - will continue"}}, // VE_FACE2 + {12,{false, allow_values {}, "FACE1 not supported use 1* - will continue"}}, // FACE_FLOW12 + {13,{false, allow_values {}, "FACE2 not supported use 1* - will continue"}}, // FACE_FLOW21 }, }, { @@ -93,19 +93,19 @@ partiallySupported() { "MULTIREG", { - {4,{false, allow_values {"F", "M", "O"}, "REGION_NAME must equal to F/M or O"}}, // REGION_NAME + {4,{false, allow_values {"F", "M", "O"}, "REGION_NAME must equal to F/M or O"}}, // NOT_DEFINED }, }, { "MULTREGP", { - {3,{false, allow_values {"F", "M", "O"}, "REGION_NAME must equal to F/M or O"}}, // REGION_NAME + {3,{false, allow_values {"F", "M", "O"}, "REGION_NAME must equal to F/M or O"}}, // REGION_TYPE }, }, { "MULTREGT", { - {6,{false, allow_values {"F", "M", "O"}, "REGION_NAME must equal to F/M or O"}}, // REGION_NAME + {6,{false, allow_values {"F", "M", "O"}, "REGION_NAME must equal to F/M or O"}}, // REGION_DEF }, }, { @@ -138,6 +138,13 @@ partiallySupported() {5,{true, allow_values {"F"}, "TYPE only option F (Cartesian grids supported) supported – will STOP"}}, // COORD_TYPE }, }, + { + "TABDIMS", + { + {20,{false, allow_values {}, "NOTUSED should be defaulted (1*) - ignored as not used"}}, // ITEM20_NOT_USED + {25,{false, allow_values {}, "RESVED should be defaulted (1*) - ignored as not used"}}, // RESERVED + }, + }, { "UDQDIMS", { @@ -154,20 +161,13 @@ const KeywordValidation::PartiallySupportedKeywords& partiallySupported() { static const KeywordValidation::PartiallySupportedKeywordspartially_supported_keywords_int = { - { - "AQUCON", - { - {11,{false, allow_values {1}, "VEOPT1 Vertical Equilibrium option one– not used"}}, // VEFRAC - {12,{false, allow_values {1}, "VEOPI2 Vertical Equilibrium option two– not used"}}, // VEFRACP - }, - }, { "EDITNNC", { - {8,{false, allow_values {0}, "ISATNUM1 only default value of 0 supported – will continue"}}, // SIM_DEPENDENT1 - {9,{false, allow_values {0}, "ISATNUM2 only default value of 0 supported – will continue"}}, // SIM_DEPENDENT2 - {10,{false, allow_values {0}, "IPRSNUM1 only default value of 0 supported – will continue"}}, // PRESSURE_TABLE1 - {11,{false, allow_values {0}, "IPRSNUM2 only default value of 0 supported – will continue"}}, // PRESSURE_TABLE2 + {8,{false, allow_values {0}, "ISATNUM1 only default value of 0 supported – will continue"}}, // SAT_TABLE12 + {9,{false, allow_values {0}, "ISATNUM2 only default value of 0 supported – will continue"}}, // SAT_TABLE21 + {10,{false, allow_values {0}, "IPRSNUM1 only default value of 0 supported – will continue"}}, // PRESS_TABLE12 + {11,{false, allow_values {0}, "IPRSNUM2 only default value of 0 supported – will continue"}}, // PRESS_TABLE21 }, }, { @@ -202,7 +202,7 @@ partiallySupported() { "NETWORK", { - {3,{false, allow_values {}, "NBCMAX option is not used – value ignored"}}, // NBCMAX + {3,{false, allow_values {20}, "NBCMAX option is not used and should be defaulted– value ignored"}}, // NBCMAX }, }, { @@ -212,7 +212,6 @@ partiallySupported() {9,{false, allow_values {0}, "ISATNUM2 only default value of 0 supported – will continue"}}, // SIM_DEPENDENT2 {10,{false, allow_values {0}, "IPRSNUM1 only default value of 0 supported – will continue"}}, // PRESSURE_TABLE1 {11,{false, allow_values {0}, "IPRSNUM2 only default value of 0 supported – will continue"}}, // PRESSURE_TABLE2 - {17,{false, allow_values {0}, "PERMNNC only default value of 0 supported – will continue"}}, // VDFLOW_PERM }, }, { @@ -244,23 +243,21 @@ partiallySupported() {10,{false, allow_values {1}, "NMEOSS should be equal to 1 - ignored as not used"}}, // NUM_EOS_SURFACE {12,{false, allow_values {1}, "MXNTHR should be equal to 1 - ignored as not used"}}, // MAX_THERMAL_REGIONS {14,{false, allow_values {0}, "MXNPMR should be equal to 0 - ignored as not used"}}, // MAX_PRESSURE_MAINTAINANCE_REGIONS - {15,{false, allow_values {0}, "NTABKT should be defaulted (0) - ignored as not used"}}, // MAX_KVALUE_TABLES + {15,{false, allow_values {0}, "NTABKT should be defaulted (0) – ignored as not used"}}, // MAX_KVALUE_TABLES {16,{false, allow_values {0}, "NTALPHA should be defaulted (0) - ignored as not used"}}, // NTALPHA {17,{false, allow_values {10}, "NASPKA should be defaulted (10) - ignored as not used"}}, // ASPHALTENE_ASPKDAM_MAX_ROWS {18,{false, allow_values {10}, "MXRAWG should be defaulted (10) - ignored as not used"}}, // ASPHALTENE_ASPREWG_MAX_ROWS {19,{false, allow_values {10}, "MXRASO should be defaulted (10) - ignored as not used"}}, // ASPHALTENE_ASPVISO_MAX_ROWS - {20,{false, allow_values {}, "NOTUSED should be defaulted (1*) - ignored as not used"}}, // ITEM20_NOT_USED {21,{false, allow_values {5}, "MCASPP should be defaulted (5) - ignored as not used"}}, // ASPHALTENE_ASPPW2D_MAX_COLUMNS {22,{false, allow_values {5}, "MRASPP should be defaulted (5) - ignored as not used"}}, // ASPHALTENE_ASPPW2D_MAX_ROWS {23,{false, allow_values {5}, "MXRATF should be defaulted (5) - ignored as not used"}}, // ASPHALTENE_ASPWETF_MAX_ROWS {24,{false, allow_values {0}, "MXNKVT should be defaulted (0) - ignored as not used"}}, // NUM_KVALUE_TABLES - {25,{false, allow_values {}, "RESVED should be defaulted (1*) - ignored as not used"}}, // RESERVED }, }, { "UDADIMS", { - {2,{false, allow_values {0}, "IGNORED should be equal to 0 – ignored as not used"}}, // IGNORED + {2,{false, allow_values {0}, "IGNORED should be defaulted (0) – ignored as not used"}}, // IGNORED }, }, { @@ -294,17 +291,24 @@ const KeywordValidation::PartiallySupportedKeywords& partiallySupported() { static const KeywordValidation::PartiallySupportedKeywords partially_supported_keywords_double = { + { + "AQUCON", + { + {12,{false, allow_values {1}, "VEOPT1 Vertical Equilibrium option one– not used"}}, // VEFRAC + {13,{false, allow_values {1}, "VEOPI2 Vertical Equilibrium option two– not used"}}, // VEFRACP + }, + }, { "AQUCT", { - {12,{false, allow_values {0.0}, "SALTCON option is not used – value ignored"}}, // INI_SALT - {13,{false, allow_values {}, "TEMP option is not used – value ignored"}}, // TEMP_AQUIFER + {12,{false, allow_values {0}, "SALTCON option is not used and should be defaulted – value ignored"}}, // INI_SALT + {13,{false, allow_values {}, "TEMP option is not used and should be defaulted – value ignored"}}, // TEMP_AQUIFER }, }, { "EDITNNC", { - {14,{false, allow_values {0}, "DIFFNNC not supported – will continue"}}, // DIFFUSIVITY + {14,{false, allow_values {0}, "DIFFNNC not supported – will continue"}}, // DIFFM }, }, { @@ -319,7 +323,7 @@ partiallySupported() { "MULTFLT", { - {3,{false, allow_values {}, "FLT-DIF the diffusivity multiplier option is not supported – will continue"}}, // REGION_NAME + {3,{false, allow_values {}, "FLT-DIF the diffusivity multiplier option is not supported – will continue"}}, // NOT_DEFINED }, }, { @@ -328,6 +332,13 @@ partiallySupported() {14,{false, allow_values {0}, "DIFFNNC not supported – will continue"}}, // DIFFUSIVITY {15,{false, allow_values {0}, "DISPNNC not supported – will continue"}}, // SIM_DEPENDENT3 {16,{false, allow_values {0}, "AREANNC not supported – will continue"}}, // VDFLOW_AREA + {17,{false, allow_values {0}, "PERMNNC only default value of 0 supported – will continue"}}, // VDFLOW_PERM + }, + }, + { + "ROCKCOMP", + { + {4,{false, allow_values {0}, "CARKZEXP transmissibility dependent on porosity model is not supported"}}, // CARKZEXP }, }, }; From 7dee294c502de5341148cec1e0c064147f148de8 Mon Sep 17 00:00:00 2001 From: OPMUSER Date: Fri, 25 Jun 2021 15:34:19 +0800 Subject: [PATCH 4/4] Clean License & Copyright Header Clean License & Copyright Header - Done --- opm/simulators/utils/PartiallySupportedFlowKeywords.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp index 1454fc5a1f..f37ba813fd 100644 --- a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp +++ b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp @@ -15,9 +15,6 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . - - Generated : keyw-code.py - Date : 2021-06-25 13:02:39 */ #include