Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OPM/opm-common
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e9f0228333db94434d231e3f28fd8e39bb82f41a
Choose a base ref
..
head repository: OPM/opm-common
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f4e7fdc2b74005eeb85d6393bece33597bf9247a
Choose a head ref
Showing with 6 additions and 7 deletions.
  1. +2 −2 opm/input/eclipse/Schedule/ResCoup/ReadCouplingFile.cpp
  2. +4 −5 opm/input/eclipse/Schedule/ResCoup/ReservoirCouplingInfo.hpp
4 changes: 2 additions & 2 deletions opm/input/eclipse/Schedule/ResCoup/ReadCouplingFile.cpp
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ void handleUSECUPL(HandlerContext& handlerContext)
throw OpmInputError("Root name of coupling file (item 1) cannot be defaulted.", keyword.location());
}
auto root_name = deck_item.getTrimmedString(0);
rescoup.readCouplingFileName(root_name);
rescoup.setReadCouplingFileName(root_name);
}
{
auto deck_item = record.getItem<ParserKeywords::USECUPL::FMT>();
@@ -53,7 +53,7 @@ void handleUSECUPL(HandlerContext& handlerContext)
auto flag_str = deck_item.getTrimmedString(0);
auto coupling_file_flag = ReservoirCoupling::CouplingInfo::couplingFileFlagFromString(
flag_str, keyword);
rescoup.readCouplingFileFlag(coupling_file_flag);
rescoup.setReadCouplingFileFlag(coupling_file_flag);
}
schedule_state.rescoup.update( std::move( rescoup ));
}
9 changes: 4 additions & 5 deletions opm/input/eclipse/Schedule/ResCoup/ReservoirCouplingInfo.hpp
View file
Original file line number Diff line number Diff line change
@@ -103,11 +103,14 @@ class CouplingInfo {
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;
}
@@ -121,9 +124,6 @@ class CouplingInfo {
return m_slaves.size();
}

CouplingFileFlag writeCouplingFileFlag() const {
return m_write_coupling_file_flag;
}


template<class Serializer>
@@ -138,7 +138,6 @@ class CouplingInfo {
serializer(m_read_coupling_file_name);
}


CouplingFileFlag writeCouplingFileFlag() const {
return m_write_coupling_file_flag;
}