OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load action keywords from restart file

Browse Source
This commit is contained in:
Joakim Hove
2021-09-09 15:05:17 +02:00
parent a9c987b70f
commit 75add72412
5 changed files with 64 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/io/eclipse/rst/action.hpp
View File

@@ -26,6 +26,7 @@
#include <vector>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/Enums.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
namespace Opm {
@@ -64,6 +65,7 @@ struct RstAction {
double min_wait;
std::time_t start_time;
std::vector<Condition> conditions;
std::vector<DeckKeyword> keywords;
};
}

7
opm/io/eclipse/rst/state.hpp
View File

@@ -39,6 +39,7 @@ namespace Opm {
class EclipseGrid;
class Parser;
class Actdims;
class Parser;
} // namespace Opm
namespace Opm { namespace EclIO {
@@ -102,14 +103,16 @@ private:
const std::vector<double>& dudg,
const std::vector<double>& dudf);
void add_actions(const Actdims& actdims,
void add_actions(const Parser& parser,
const Actdims& actdims,
std::time_t sim_time,
const std::vector<std::string>& zact,
const std::vector<int>& iact,
const std::vector<float>& sact,
const std::vector<std::string>& zacn,
const std::vector<int>& iacn,
const std::vector<double>& sacn);
const std::vector<double>& sacn,
const std::vector<std::string>& zlact);
};

48
src/opm/io/eclipse/rst/state.cpp
View File

@@ -30,6 +30,8 @@
#include <opm/io/eclipse/rst/state.hpp>
#include <opm/output/eclipse/WriteRestartHelpers.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/common/utility/String.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/output/eclipse/UDQDims.hpp>
#include <opm/output/eclipse/VectorItems/connection.hpp>
@@ -276,21 +278,24 @@ std::string oper_string(Action::Logical logic) {
}
void RstState::add_actions(const Actdims& actdims,
void RstState::add_actions(const Parser& parser,
const Actdims& actdims,
std::time_t sim_time,
const std::vector<std::string>& zact,
const std::vector<int>& iact,
const std::vector<float>& sact,
const std::vector<std::string>& zacn,
const std::vector<int>& iacn,
const std::vector<double>& sacn)
const std::vector<double>& sacn,
const std::vector<std::string>& zlact)
{
auto zact_action_size = RestartIO::Helpers::entriesPerZACT();
auto iact_action_size = RestartIO::Helpers::entriesPerIACT();
auto sact_action_size = RestartIO::Helpers::entriesPerSACT();
auto zacn_action_size = RestartIO::Helpers::entriesPerZACN(actdims);
auto iacn_action_size = RestartIO::Helpers::entriesPerIACN(actdims);
auto sacn_action_size = RestartIO::Helpers::entriesPerSACN(actdims);
auto zact_action_size = RestartIO::Helpers::entriesPerZACT();
auto iact_action_size = RestartIO::Helpers::entriesPerIACT();
auto sact_action_size = RestartIO::Helpers::entriesPerSACT();
auto zacn_action_size = RestartIO::Helpers::entriesPerZACN(actdims);
auto iacn_action_size = RestartIO::Helpers::entriesPerIACN(actdims);
auto sacn_action_size = RestartIO::Helpers::entriesPerSACN(actdims);
auto zlact_action_size = zlact.size() / this->header.num_action;
auto zacn_cond_size = 13;
auto iacn_cond_size = 26;
@@ -311,6 +316,28 @@ void RstState::add_actions(const Actdims& actdims,
const auto& max_run = iact[index * iact_action_size + 5];
const auto& min_wait = this->unit_system.to_si(UnitSystem::measure::time, sact[index * sact_action_size + 3]);
this->actions.emplace_back(name, max_run, min_wait, sim_time, conditions );
std::string action_deck;
auto zlact_offset = index * zlact_action_size;
while (true) {
std::string line;
for (std::size_t item_index = 0; item_index < actdims.line_size(); item_index++)
line += zlact[zlact_offset + item_index];
line = trim_copy(line);
if (line.empty())
continue;
if (line == "ENDACTIO")
break;
action_deck += line + "\n";
zlact_offset += actdims.line_size();
}
const auto& deck = parser.parseString( action_deck );
for (auto keyword : deck)
this->actions.back().keywords.push_back(std::move(keyword));
}
}
@@ -329,7 +356,7 @@ const RstWell& RstState::get_well(const std::string& wname) const {
RstState RstState::load(std::shared_ptr<EclIO::RestartFileView> rstView,
const Runspec& runspec,
const Parser&,
const Parser& parser,
const ::Opm::EclipseGrid* grid)
{
RstState state(rstView, grid);
@@ -390,7 +417,8 @@ RstState RstState::load(std::shared_ptr<EclIO::RestartFileView> rstView,
const auto& zacn = rstView->getKeyword<std::string>("ZACN");
const auto& iacn = rstView->getKeyword<int>("IACN");
const auto& sacn = rstView->getKeyword<double>("SACN");
state.add_actions(runspec.actdims(), state.header.sim_time(), zact, iact, sact, zacn, iacn, sacn);
const auto& zlact= rstView->getKeyword<std::string>("ZLACT");
state.add_actions(parser, runspec.actdims(), state.header.sim_time(), zact, iact, sact, zacn, iacn, sacn, zlact);
}

2
src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.cpp
View File

@@ -74,6 +74,8 @@ ActionX::ActionX(const RestartIO::RstAction& rst_action)
tokens.insert(tokens.end(), cond_tokens.begin(), cond_tokens.end());
}
this->condition = Action::AST(tokens);
for (const auto& keyword : rst_action.keywords)
this->addKeyword(keyword);
}

17
tests/parser/ScheduleRestartTests.cpp
View File

@@ -39,6 +39,7 @@
#include <opm/io/eclipse/RestartFileView.hpp>
#include <cstddef>
#include <iterator>
#include <memory>
#include <utility>
@@ -178,4 +179,20 @@ BOOST_AUTO_TEST_CASE(LoadActionRestartSim) {
const auto& rst_actions = restart_sched[7].actions();
BOOST_CHECK_EQUAL(input_actions.ecl_size(), rst_actions.ecl_size());
for (std::size_t iact = 0; iact < input_actions.ecl_size(); iact++) {
const auto& input_action = input_actions[iact];
const auto& rst_action = rst_actions[iact];
auto input_iter = input_action.begin();
auto rst_iter = rst_action.begin();
BOOST_REQUIRE_EQUAL( std::distance(input_action.begin(), input_action.end()),
std::distance(rst_action.begin(), rst_action.end()) );
while (input_iter != input_action.end()) {
BOOST_CHECK( *input_iter == *rst_iter );
input_iter++;
rst_iter++;
}
}
}