From a084f9bf6f8529e7d230c6d5c09cd50387229766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Thu, 20 Jun 2024 22:52:33 +0200 Subject: [PATCH 1/4] Add support for reservoir coupling keywords Adds support for SLAVES, GRUPMAST, and GRUPSLAV keywords --- .../utils/PartiallySupportedFlowKeywords.cpp | 13 +++++++++++++ opm/simulators/utils/UnsupportedFlowKeywords.cpp | 3 --- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp index d79d2ed545b..8770cff7047 100644 --- a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp +++ b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp @@ -229,6 +229,13 @@ partiallySupported() {5,{true, allow_values {"F"}, "SPECGRID(TYPE): only option F (Cartesian grids supported) supported"}}, // COORD_TYPE }, }, + { + "SLAVES", + { + {1,{true, [](const std::string& val){ return val.size()<=8;}, "SLAVES(SLAVE_RESERVOIR): Only names of slave reservoirs of up to 8 characters are supported."}}, + {3,{true, allow_values {}, "SLAVES(HOST_NAME): should be defaulted. A specific host name is not implemented yet"}}, // HOST_NAME + }, + }, { "TABDIMS", { @@ -455,6 +462,12 @@ partiallySupported() {9,{false, allow_values {0}, "REGDIMS(NWKIREG): should be equal to 0 - value ignored"}}, // MAX_OPERATE_IWORK }, }, + { + "SLAVES", + { + {5,{true, [](int x) { return x >= 1; }, "SLAVES(NUM_PE): only values greater than or equal to 1 are supported"}}, // NUM_PE + }, + }, { "SPECGRID", { diff --git a/opm/simulators/utils/UnsupportedFlowKeywords.cpp b/opm/simulators/utils/UnsupportedFlowKeywords.cpp index f5aa825966c..fb54c04e503 100644 --- a/opm/simulators/utils/UnsupportedFlowKeywords.cpp +++ b/opm/simulators/utils/UnsupportedFlowKeywords.cpp @@ -242,9 +242,7 @@ const KeywordValidation::UnsupportedKeywords& unsupportedKeywords() {"GRAVDRB", {true, std::nullopt}}, {"GRAVDRM", {true, std::nullopt}}, {"GRDREACH", {true, std::nullopt}}, - {"GRUPMAST", {true, std::nullopt}}, {"GRUPRIG", {true, std::nullopt}}, - {"GRUPSLAV", {true, std::nullopt}}, {"GRUPTARG", {true, std::nullopt}}, {"GSATINJE", {true, std::nullopt}}, {"GSEPCOND", {true, std::nullopt}}, @@ -569,7 +567,6 @@ const KeywordValidation::UnsupportedKeywords& unsupportedKeywords() {"SKRORW", {true, std::nullopt}}, {"SKRW", {true, std::nullopt}}, {"SKRWR", {true, std::nullopt}}, - {"SLAVES", {true, std::nullopt}}, {"SMULTX", {true, std::nullopt}}, {"SMULTY", {true, std::nullopt}}, {"SMULTZ", {true, std::nullopt}}, From e2ed1d2f1e8c3d13c4d553f3e84f172dc2fc7f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Mon, 21 Oct 2024 18:01:29 +0200 Subject: [PATCH 2/4] Add support for RCMASTS --- 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 fb54c04e503..072c8b2e64c 100644 --- a/opm/simulators/utils/UnsupportedFlowKeywords.cpp +++ b/opm/simulators/utils/UnsupportedFlowKeywords.cpp @@ -491,7 +491,6 @@ const KeywordValidation::UnsupportedKeywords& unsupportedKeywords() {"RBEDCONT", {true, std::nullopt}}, {"RADFIN", {true, std::nullopt}}, {"RADFIN4", {true, std::nullopt}}, - {"RCMASTS", {true, std::nullopt}}, {"REACACT", {true, std::nullopt}}, {"REACHES", {true, std::nullopt}}, {"READDATA", {true, std::nullopt}}, From 8f872b01051c77f96e6065c5bf11fc0521a14e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Wed, 23 Oct 2024 11:58:44 +0200 Subject: [PATCH 3/4] Add support for DUMPCUPL --- opm/simulators/utils/PartiallySupportedFlowKeywords.cpp | 6 ++++++ opm/simulators/utils/UnsupportedFlowKeywords.cpp | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp index 8770cff7047..7f6d80d8d1c 100644 --- a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp +++ b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp @@ -38,6 +38,12 @@ partiallySupported() {5,{true, allow_values {"NONE"}, "BRANPROP(ALQ-DEN): option is not supported. Default is supported."}}, // ALQ_SURFACE_DENSITY }, }, + { + "DUMPCUPL", + { + {1,{true, allow_values {"F", "U"}, "DUMPCUPL(VALUE): only option F and U are supported"}}, // VALUE + }, + }, { "EDITNNC", { diff --git a/opm/simulators/utils/UnsupportedFlowKeywords.cpp b/opm/simulators/utils/UnsupportedFlowKeywords.cpp index 072c8b2e64c..4fce1bc7130 100644 --- a/opm/simulators/utils/UnsupportedFlowKeywords.cpp +++ b/opm/simulators/utils/UnsupportedFlowKeywords.cpp @@ -146,7 +146,6 @@ const KeywordValidation::UnsupportedKeywords& unsupportedKeywords() {"DTHETA", {true, std::string{"Use the DTHETAV keyword instead"}}}, {"DUALPERM", {true, std::nullopt}}, {"DUALPORO", {true, std::nullopt}}, - {"DUMPCUPL", {true, std::nullopt}}, {"DUMPFLUX", {true, std::nullopt}}, {"DYNAMICR", {true, std::nullopt}}, {"DYNRDIMS", {true, std::nullopt}}, From 19a18d23e3783745b6dd046b3eddd5be796dd995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Mon, 28 Oct 2024 09:19:38 +0100 Subject: [PATCH 4/4] Add support for USECUPL --- 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 4fce1bc7130..8730096964d 100644 --- a/opm/simulators/utils/UnsupportedFlowKeywords.cpp +++ b/opm/simulators/utils/UnsupportedFlowKeywords.cpp @@ -637,7 +637,6 @@ const KeywordValidation::UnsupportedKeywords& unsupportedKeywords() {"UNCODHMD", {true, std::nullopt}}, {"UNIFOUTS", {false, std::nullopt}}, {"UNIFSAVE", {false, std::nullopt}}, - {"USECUPL", {true, std::nullopt}}, {"USEFLUX", {true, std::nullopt}}, {"USENOFLO", {true, std::nullopt}}, {"VDFLOW", {true, std::nullopt}},