Add support for USECUPL keyword

CMakeLists_files.cmake

@@ -287,7 +287,8 @@ if(ENABLE_ECL_INPUT)
     opm/input/eclipse/Schedule/ResCoup/MasterGroup.cpp
     opm/input/eclipse/Schedule/ResCoup/Slaves.cpp
     opm/input/eclipse/Schedule/ResCoup/MasterMinimumTimeStep.cpp
-    opm/input/eclipse/Schedule/ResCoup/CouplingFile.cpp
+    opm/input/eclipse/Schedule/ResCoup/ReadCouplingFile.cpp
+    opm/input/eclipse/Schedule/ResCoup/WriteCouplingFile.cpp
     opm/input/eclipse/Schedule/UDQ/UDQKeywordHandlers.cpp
     opm/input/eclipse/Schedule/UDQ/UDQActive.cpp
     opm/input/eclipse/Schedule/UDQ/UDQAssign.cpp
@@ -1320,7 +1321,8 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/Schedule/ResCoup/MasterGroup.hpp
        opm/input/eclipse/Schedule/ResCoup/Slaves.hpp
        opm/input/eclipse/Schedule/ResCoup/MasterMinimumTimeStep.hpp
-       opm/input/eclipse/Schedule/ResCoup/CouplingFile.hpp
+       opm/input/eclipse/Schedule/ResCoup/ReadCouplingFile.hpp
+       opm/input/eclipse/Schedule/ResCoup/WriteCouplingFile.hpp
        opm/input/eclipse/Schedule/VFPInjTable.hpp
        opm/input/eclipse/Schedule/VFPProdTable.hpp
        opm/input/eclipse/Schedule/Well/Connection.hpp

opm/input/eclipse/Schedule/ResCoup/GrupSlav.hpp

@@ -16,8 +16,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef RESERVOIR_COUPLING_GRUPSLAV_HPP
-#define RESERVOIR_COUPLING_GRUPSLAV_HPP
+#ifndef OPM_RESERVOIR_COUPLING_GRUPSLAV_HPP
+#define OPM_RESERVOIR_COUPLING_GRUPSLAV_HPP
 
 #include <iostream>
 #include <map>
@@ -155,4 +155,4 @@ extern void handleGRUPSLAV(HandlerContext& handlerContext);
 
 } // namespace Opm
 
-#endif // RESERVOIR_COUPLING_GRUPSLAV_HPP
+#endif // OPM_RESERVOIR_COUPLING_GRUPSLAV_HPP

opm/input/eclipse/Schedule/ResCoup/MasterGroup.hpp

@@ -16,8 +16,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef RESERVOIR_COUPLING_MASTER_GROUP_HPP
-#define RESERVOIR_COUPLING_MASTER_GROUP_HPP
+#ifndef OPM_RESERVOIR_COUPLING_MASTER_GROUP_HPP
+#define OPM_RESERVOIR_COUPLING_MASTER_GROUP_HPP
 
 #include <map>
 #include <stdexcept>
@@ -95,4 +95,4 @@ extern void handleGRUPMAST(HandlerContext& handlerContext);
 
 } // namespace Opm
 
-#endif // RESERVOIR_COUPLING_MASTER_GROUP_HPP
+#endif // OPM_RESERVOIR_COUPLING_MASTER_GROUP_HPP

opm/input/eclipse/Schedule/ResCoup/MasterMinimumTimeStep.hpp

@@ -16,13 +16,13 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef RESERVOIR_COUPLING_MASTER_MINIMUM_TIMESTEP_HPP
-#define RESERVOIR_COUPLING_MASTER_MINIMUM_TIMESTEP_HPP
+#ifndef OPM_RESERVOIR_COUPLING_MASTER_MINIMUM_TIMESTEP_HPP
+#define OPM_RESERVOIR_COUPLING_MASTER_MINIMUM_TIMESTEP_HPP
 namespace Opm {
 
 class HandlerContext;
 
 extern void handleRCMASTS(HandlerContext& handlerContext);
 
 } // namespace Opm
-#endif // RESERVOIR_COUPLING_MASTER_MINIMUM_TIMESTEP_HPP
+#endif // OPM_RESERVOIR_COUPLING_MASTER_MINIMUM_TIMESTEP_HPP

opm/input/eclipse/Schedule/ResCoup/ReadCouplingFile.cpp

@@ -0,0 +1,62 @@
+/*
+  Copyright 2024 Equinor ASA.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include <opm/input/eclipse/Schedule/ResCoup/ReadCouplingFile.hpp>
+#include <opm/input/eclipse/Schedule/ResCoup/ReservoirCouplingInfo.hpp>
+#include <opm/input/eclipse/Schedule/ScheduleState.hpp>
+#include <opm/input/eclipse/Parser/ParserKeywords/U.hpp>
+#include <opm/common/OpmLog/OpmLog.hpp>
+#include <opm/common/utility/OpmInputError.hpp>
+#include "../HandlerContext.hpp"
+
+
+namespace Opm {
+
+void handleUSECUPL(HandlerContext& handlerContext)
+{
+    auto& schedule_state = handlerContext.state();
+    auto rescoup = schedule_state.rescoup();
+    const auto& keyword = handlerContext.keyword;
+    // Opm::Parser::parseFile() (see readDeck.cpp in opm-simulators) will throw an exception if there
+    //   is more than one record for this keyword, so we can assume that there is exactly one record here.
+    auto record = keyword[0];
+    {
+        auto deck_item = record.getItem<ParserKeywords::USECUPL::BASE>();
+        if (deck_item.defaultApplied(0)) {
+            throw OpmInputError("Root name of coupling file (item 1) cannot be defaulted.", keyword.location());
+        }
+        auto root_name = deck_item.getTrimmedString(0);
+        rescoup.setReadCouplingFileName(root_name);
+    }
+    {
+        auto deck_item = record.getItem<ParserKeywords::USECUPL::FMT>();
+        if (deck_item.defaultApplied(0)) {
+            throw OpmInputError("Format of coupling file (item 2) cannot be defaulted.", keyword.location());
+        }
+        auto flag_str = deck_item.getTrimmedString(0);
+        auto coupling_file_flag = ReservoirCoupling::CouplingInfo::couplingFileFlagFromString(
+                flag_str, keyword);
+        rescoup.setReadCouplingFileFlag(coupling_file_flag);
+    }
+    schedule_state.rescoup.update( std::move( rescoup ));
+}
+
+} // namespace Opm
+

opm/input/eclipse/Schedule/ResCoup/ReadCouplingFile.hpp

@@ -0,0 +1,28 @@
+/*
+  Copyright 2024 Equinor ASA.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef OPM_READ_RESERVOIR_COUPLING_FILE_HPP
+#define OPM_READ_RESERVOIR_COUPLING_FILE_HPP
+namespace Opm {
+
+class HandlerContext;
+
+extern void handleUSECUPL(HandlerContext& handlerContext);
+
+} // namespace Opm
+#endif // OPM_READ_RESERVOIR_COUPLING_FILE_HPP

opm/input/eclipse/Schedule/ResCoup/ReservoirCouplingInfo.cpp

@@ -19,17 +19,33 @@
 
 #include <stdexcept>
 #include <limits>
+#include <opm/common/utility/OpmInputError.hpp>
 #include <opm/input/eclipse/Schedule/ResCoup/ReservoirCouplingInfo.hpp>
 
 namespace Opm {
 namespace ReservoirCoupling {
 
+CouplingInfo::CouplingFileFlag CouplingInfo::couplingFileFlagFromString(
+        const std::string& flag_str, const DeckKeyword& keyword
+)
+{
+    if (flag_str == "F") {
+        return CouplingInfo::CouplingFileFlag::FORMATTED;
+    } else if (flag_str == "U") {
+        return CouplingInfo::CouplingFileFlag::UNFORMATTED;
+    } else {
+        throw Opm::OpmInputError("Invalid DUMPCUPL value: " + flag_str, keyword.location());
+    }
+}
+
 bool CouplingInfo::operator==(const CouplingInfo& rhs) const {
     return this->m_slaves == rhs.m_slaves &&
            this->m_master_groups == rhs.m_master_groups &&
            this->m_grup_slavs == rhs.m_grup_slavs &&
            this->m_master_min_time_step == rhs.m_master_min_time_step &&
-           this->m_coupling_file_flag == rhs.m_coupling_file_flag;
+           this->m_write_coupling_file_flag == rhs.m_write_coupling_file_flag &&
+           this->m_read_coupling_file_name == rhs.m_read_coupling_file_name &&
+           this->m_read_coupling_file_flag == rhs.m_read_coupling_file_flag;
 }
 
 CouplingInfo CouplingInfo::serializationTestObject()

opm/input/eclipse/Schedule/ResCoup/ReservoirCouplingInfo.hpp

@@ -16,9 +16,10 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef RESERVOIR_COUPLING_INFO_HPP
-#define RESERVOIR_COUPLING_INFO_HPP
+#ifndef OPM_RESERVOIR_COUPLING_INFO_HPP
+#define OPM_RESERVOIR_COUPLING_INFO_HPP
 
+#include <opm/input/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/input/eclipse/Schedule/ResCoup/Slaves.hpp>
 #include <opm/input/eclipse/Schedule/ResCoup/GrupSlav.hpp>
 #include <opm/input/eclipse/Schedule/ResCoup/MasterGroup.hpp>
@@ -43,12 +44,6 @@ class CouplingInfo {
     static CouplingInfo serializationTestObject();
     bool operator==(const CouplingInfo& other) const;
 
-    void setCouplingFileFlag(CouplingFileFlag flag) {
-        m_coupling_file_flag = flag;
-    }
-    CouplingFileFlag couplingFileFlag() const {
-        return m_coupling_file_flag;
-    }
 
     const GrupSlav& grupSlav(const std::string& name) const {
         return m_grup_slavs.at(name);
@@ -91,10 +86,31 @@ class CouplingInfo {
     double masterMinTimeStep() const {
         return m_master_min_time_step;
     }
+
+    CouplingFileFlag readCouplingFileFlag() const {
+        return m_read_coupling_file_flag;
+    }
+
+    const std::string& readCouplingFileName() const {
+        return m_read_coupling_file_name;
+    }
+
     void setMasterMinTimeStep(double tstep) {
         m_master_min_time_step = tstep;
     }
 
+    void setReadCouplingFileFlag(CouplingFileFlag flag) {
+        m_read_coupling_file_flag = flag;
+    }
+
+    void setReadCouplingFileName(const std::string file_name) {
+        m_read_coupling_file_name = file_name;
+    }
+
+    void setWriteCouplingFileFlag(CouplingFileFlag flag) {
+        m_write_coupling_file_flag = flag;
+    }
+
     const std::map<std::string, Slave>& slaves() const {
         return this->m_slaves;
     }
@@ -109,24 +125,39 @@ class CouplingInfo {
     }
 
 
+
     template<class Serializer>
     void serializeOp(Serializer& serializer)
     {
         serializer(m_slaves);
         serializer(m_master_groups);
         serializer(m_grup_slavs);
         serializer(m_master_min_time_step);
-        serializer(m_coupling_file_flag);
+        serializer(m_write_coupling_file_flag);
+        serializer(m_read_coupling_file_flag);
+        serializer(m_read_coupling_file_name);
     }
 
+    CouplingFileFlag writeCouplingFileFlag() const {
+        return m_write_coupling_file_flag;
+    }
+
+
+    // Non-inline methods (defined in CouplingInfo.cpp)
+
+    static CouplingFileFlag couplingFileFlagFromString(
+        const std::string& flag_str, const DeckKeyword& keyword);
+
 private:
     std::map<std::string, Slave> m_slaves;
     std::map<std::string, MasterGroup> m_master_groups;
     std::map<std::string, GrupSlav> m_grup_slavs;
     double m_master_min_time_step{0.0};
-    CouplingFileFlag m_coupling_file_flag{CouplingFileFlag::NONE};
+    CouplingFileFlag m_write_coupling_file_flag{CouplingFileFlag::NONE};
+    CouplingFileFlag m_read_coupling_file_flag{CouplingFileFlag::NONE};
+    std::string m_read_coupling_file_name{};
 };
 
 } // namespace Opm::ReservoirCoupling
 
-#endif
+#endif // OPM_RESERVOIR_COUPLING_INFO_HPP

opm/input/eclipse/Schedule/ResCoup/ReservoirCouplingKeywordHandlers.cpp

@@ -24,7 +24,8 @@
 #include "Slaves.hpp"
 #include "MasterGroup.hpp"
 #include "MasterMinimumTimeStep.hpp"
-#include "CouplingFile.hpp"
+#include "WriteCouplingFile.hpp"
+#include "ReadCouplingFile.hpp"
 
 #include <fmt/format.h>
 
@@ -39,6 +40,7 @@ getReservoirCouplingHandlers()
         { "GRUPSLAV", &handleGRUPSLAV},
         { "RCMASTS", &handleRCMASTS},
         { "DUMPCUPL", &handleDUMPCUPL},
+        { "USECUPL", &handleUSECUPL},
     };
 }
 

opm/input/eclipse/Schedule/ResCoup/ReservoirCouplingKeywordHandlers.hpp

@@ -16,8 +16,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef RESERVOIR_COUPLING_KEYWORD_HANDLERS_HPP
-#define RESERVOIR_COUPLING_KEYWORD_HANDLERS_HPP
+#ifndef OPM_RESERVOIR_COUPLING_KEYWORD_HANDLERS_HPP
+#define OPM_RESERVOIR_COUPLING_KEYWORD_HANDLERS_HPP
 
 #include "../KeywordHandlers.hpp"
 
@@ -32,4 +32,4 @@ std::vector<std::pair<std::string,KeywordHandlers::handler_function>> getReservo
 
 }
 
-#endif
+#endif // OPM_RESERVOIR_COUPLING_KEYWORD_HANDLERS_HPP

opm/input/eclipse/Schedule/ResCoup/Slaves.hpp

@@ -16,8 +16,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef RESERVOIR_COUPLING_SLAVES_HPP
-#define RESERVOIR_COUPLING_SLAVES_HPP
+#ifndef OPM_RESERVOIR_COUPLING_SLAVES_HPP
+#define OPM_RESERVOIR_COUPLING_SLAVES_HPP
 
 #include <string>
 #include <map>
@@ -91,4 +91,4 @@ class Slave {
 extern void handleSLAVES(HandlerContext& handlerContext);
 
 } // namespace Opm
-#endif // RESERVOIR_COUPLING_SLAVES_HPP
+#endif // OPM_RESERVOIR_COUPLING_SLAVES_HPP

opm/input/eclipse/Schedule/ResCoup/CouplingFile.cpp → opm/input/eclipse/Schedule/ResCoup/WriteCouplingFile.cpp

@@ -18,7 +18,7 @@
 */
 
 
-#include <opm/input/eclipse/Schedule/ResCoup/CouplingFile.hpp>
+#include <opm/input/eclipse/Schedule/ResCoup/WriteCouplingFile.hpp>
 #include <opm/input/eclipse/Schedule/ResCoup/ReservoirCouplingInfo.hpp>
 #include <opm/input/eclipse/Schedule/ScheduleState.hpp>
 #include <opm/input/eclipse/Parser/ParserKeywords/D.hpp>
@@ -29,19 +29,6 @@
 
 namespace Opm {
 
-ReservoirCoupling::CouplingInfo::CouplingFileFlag couplingFileFlagFromString(
-        const std::string& flag_str, const DeckKeyword& keyword
-)
-{
-    if (flag_str == "F") {
-        return ReservoirCoupling::CouplingInfo::CouplingFileFlag::FORMATTED;
-    } else if (flag_str == "U") {
-        return ReservoirCoupling::CouplingInfo::CouplingFileFlag::UNFORMATTED;
-    } else {
-        throw OpmInputError("Invalid DUMPCUPL value: " + flag_str, keyword.location());
-    }
-}
-
 void handleDUMPCUPL(HandlerContext& handlerContext)
 {
     auto& schedule_state = handlerContext.state();
@@ -55,8 +42,9 @@ void handleDUMPCUPL(HandlerContext& handlerContext)
         throw OpmInputError("DUMPCUPL keyword cannot be defaulted.", keyword.location());
     }
     auto flag_str = deck_item.getTrimmedString(0);
-    auto coupling_file_flag = couplingFileFlagFromString(flag_str, keyword);
-    rescoup.setCouplingFileFlag(coupling_file_flag);
+    auto coupling_file_flag = ReservoirCoupling::CouplingInfo::couplingFileFlagFromString(
+            flag_str, keyword);
+    rescoup.setWriteCouplingFileFlag(coupling_file_flag);
     schedule_state.rescoup.update( std::move( rescoup ));
 }