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

changes to allow for opm/units

Browse Source
This commit is contained in:
Jostein Alvestad 2021-08-23 12:27:43 +02:00
parent 30109c1722
commit f3fbd44b4b
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/output/eclipse/AggregateActionxData.hpp
View File

@ -57,6 +57,7 @@ public:
explicit AggregateActionxData(const std::vector<int>& actDims);
void captureDeclaredActionxData( const Opm::Schedule& sched,
const Opm::UnitSystem& units,
const Opm::Action::State& action_state,
const Opm::SummaryState& st,
const std::vector<int>& actDims,

2
src/opm/output/eclipse/AggregateActionxData.cpp
View File

@ -682,7 +682,7 @@ AggregateActionxData(const std::vector<int>& actDims)
void
Opm::RestartIO::Helpers::AggregateActionxData::
captureDeclaredActionxData( const Opm::Schedule& sched,
const UnitSystem& units,
const Opm::UnitSystem& units,
const Opm::Action::State& action_state,
const Opm::SummaryState& st,
const std::vector<int>& actDims,

5
src/opm/output/eclipse/RestartIO.cpp
View File

@ -353,6 +353,7 @@ namespace {
const int sim_step,
const EclipseState& es,
const Schedule& schedule,
const Opm::UnitSystem& units,
const Action::State& action_state,
const SummaryState& sum_state,
EclIO::OutputStream::Restart& rstFile)
@ -367,7 +368,7 @@ namespace {
const auto actDims = Opm::RestartIO::Helpers::createActionxDims(es.runspec(), schedule, simStep);
auto actionxData = Opm::RestartIO::Helpers::AggregateActionxData(actDims);
actionxData.captureDeclaredActionxData(schedule, action_state, sum_state, actDims, simStep);
actionxData.captureDeclaredActionxData(schedule, units, action_state, sum_state, actDims, simStep);
if (actDims[0] >= 1) {
rstFile.write("IACT", actionxData.getIACT());
@ -793,7 +794,7 @@ void save(EclIO::OutputStream::Restart& rstFile,
sumState, inteHD, value.aquifer, aquiferData, rstFile);
}
writeActionx(report_step, sim_step, es, schedule, action_state, sumState, rstFile);
writeActionx(report_step, sim_step, es, schedule, units, action_state, sumState, rstFile);
writeSolution(value, schedule, udqState, report_step, sim_step,
ecl_compatible_rst, write_double, inteHD, rstFile);

3
tests/test_AggregateActionxData.cpp
View File

@ -113,6 +113,7 @@ BOOST_AUTO_TEST_CASE (Declared_Actionx_data)
Opm::Action::State action_state;
Opm::Schedule sched = simCase.sched;
Opm::EclipseGrid grid = simCase.grid;
const auto& usys = es.getUnits();
const auto& ioConfig = es.getIOConfig();
//const auto& restart = es.cfg().restart();
@ -144,7 +145,7 @@ BOOST_AUTO_TEST_CASE (Declared_Actionx_data)
const auto actDims = Opm::RestartIO::Helpers::createActionxDims(rspec, sched, rptStep);
auto actionxData = Opm::RestartIO::Helpers::AggregateActionxData(actDims);
actionxData.captureDeclaredActionxData(sched, action_state, st, actDims, rptStep);
actionxData.captureDeclaredActionxData(sched, usys, action_state, st, actDims, rptStep);
{
/*