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

Merge pull request #2669 from jalvestad/rst_improvement

Browse Source 
Add correct value for SACT[4] - equal to last time that the action was triggered
This commit is contained in:
Joakim Hove 2021-09-13 09:52:41 +02:00 committed by GitHub
commit 3ffff5b65d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@
#include <cstring>
#include <iostream>
#include <string>
#include <ctime>
// #####################################################################
// Class Opm::RestartIO::Helpers
@ -157,6 +158,8 @@ const std::map<logic_enum, int> logicalToIndex_17 = {
template <class SACTArray>
void staticContrib(const Opm::Action::ActionX& actx,
const Opm::Action::State& state,
std::time_t start_time,
const Opm::UnitSystem& units,
SACTArray& sAct)
{
@ -166,7 +169,8 @@ const std::map<logic_enum, int> logicalToIndex_17 = {
sAct[2] = 0.;
//item [3]: Minimum time interval between action triggers.
sAct[3] = units.from_si(M::time, actx.min_wait());
sAct[4] = 0.;
//item [4]: last time that the action was triggered
sAct[4] = (state.run_count(actx) > 0) ? units.from_si(M::time, (state.run_time(actx) - start_time)) : 0.;
}
} // sAct
@ -573,7 +577,7 @@ AggregateActionxData( const std::vector<int>& rst_dims,
{
auto s_act = this->sACT_[act_ind];
sACT::staticContrib(action, sched.getUnits(), s_act);
sACT::staticContrib(action, action_state, sched.getStartTime(), sched.getUnits(), s_act);
}
{

21
tests/test_AggregateActionxData.cpp
View File

@ -113,25 +113,17 @@ BOOST_AUTO_TEST_CASE (Declared_Actionx_data)
Opm::Action::State action_state;
Opm::Schedule sched = simCase.sched;
Opm::EclipseGrid grid = simCase.grid;
const auto& ioConfig = es.getIOConfig();
//const auto& restart = es.cfg().restart();
const auto& start_time = sched.getStartTime();
// Report Step 3: 2008-08-22 --> 2018-10-01
const auto rptStep = std::size_t{3};
std::string outputDir = "./";
std::string baseName = "UDQ_ACTIONX_TEST1";
Opm::Action::ActionX actx_14 = Opm::Action::ActionX("ACT14", 10, 0.543, 0.);
Opm::Action::ActionX actx_14 = Opm::Action::ActionX("ACT14", 10, 0.543, start_time);
Opm::Action::Result result = Opm::Action::Result(true);
action_state.add_run(actx_14, 100., result);
Opm::EclIO::OutputStream::Restart rstFile {
Opm::EclIO::OutputStream::ResultSet { outputDir, baseName },
rptStep,
Opm::EclIO::OutputStream::Formatted { ioConfig.getFMTOUT() },
Opm::EclIO::OutputStream::Unified { ioConfig.getUNIFOUT() }
};
action_state.add_run(actx_14, start_time + 1.E09, result);
double secs_elapsed = 3.1536E07;
double secs_elapsed = start_time + 2.E09;
const auto ih = Opm::RestartIO::Helpers::
createInteHead(es, grid, sched, secs_elapsed,
rptStep, rptStep+1, rptStep);
@ -246,7 +238,7 @@ BOOST_AUTO_TEST_CASE (Declared_Actionx_data)
//item [1]: is unknown, (=0)
//item [2]: is unknown, (=0)
//item [3]: Minimum time interval between action triggers.
//item [4]: is unknown, (=0)
//item [4]: last time that the action was triggered
*/
@ -256,6 +248,9 @@ BOOST_AUTO_TEST_CASE (Declared_Actionx_data)
BOOST_CHECK_CLOSE(sAct[start + 3], 0.543, 1.0e-5f);
start = 1*actDims[2];
BOOST_CHECK_CLOSE(sAct[start + 3], 0.567, 1.0e-5f);
//actx_14
start = 13*actDims[2];
BOOST_CHECK_CLOSE(sAct[start + 4], 1.E09/86400., 1.0e-5f);
}
{