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

Use Previous Output Time to Decide Next Output Time

Browse Source 
This commit switches the criterion for BASIC=4 and BASIC=5 to using
the difference between the previous and the next output time instead
of "just" the next output time.  The original criteria

    year % freq == 0
    month % freq == 0

don't do what we want.  BASIC=4 and BASIC=5 should output every
'freq' year (=4) or 'freq' month (=5) of simulated time.
This commit is contained in:
Bård Skaflestad
2021-07-06 17:42:24 +02:00
parent 1c49dcc3db
commit ed5a9db25b
6 changed files with 257 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/parser/integration/IOConfigIntegrationTest.cpp
View File

@@ -151,29 +151,29 @@ BOOST_AUTO_TEST_CASE( RestartConfig2 ) {
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple( 27), std::forward_as_tuple(2001,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple( 45), std::forward_as_tuple(2001,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple( 50), std::forward_as_tuple(2001,8,24));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple( 61), std::forward_as_tuple(2002,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple( 79), std::forward_as_tuple(2002,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple( 89), std::forward_as_tuple(2003,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple( 99), std::forward_as_tuple(2003,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(109), std::forward_as_tuple(2004,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(128), std::forward_as_tuple(2004,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(136), std::forward_as_tuple(2005,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(146), std::forward_as_tuple(2005,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(158), std::forward_as_tuple(2006,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(164), std::forward_as_tuple(2006,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(170), std::forward_as_tuple(2007,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(178), std::forward_as_tuple(2007,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(184), std::forward_as_tuple(2008,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(192), std::forward_as_tuple(2008,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(198), std::forward_as_tuple(2009,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(204), std::forward_as_tuple(2009,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(210), std::forward_as_tuple(2010,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(216), std::forward_as_tuple(2010,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(222), std::forward_as_tuple(2011,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(228), std::forward_as_tuple(2011,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(234), std::forward_as_tuple(2012,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(240), std::forward_as_tuple(2012,7, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(246), std::forward_as_tuple(2013,1, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple( 63), std::forward_as_tuple(2002,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple( 83), std::forward_as_tuple(2002,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple( 92), std::forward_as_tuple(2003,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(101), std::forward_as_tuple(2003,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(111), std::forward_as_tuple(2004,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(129), std::forward_as_tuple(2004,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(137), std::forward_as_tuple(2005,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(149), std::forward_as_tuple(2005,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(159), std::forward_as_tuple(2006,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(165), std::forward_as_tuple(2006,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(173), std::forward_as_tuple(2007,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(179), std::forward_as_tuple(2007,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(185), std::forward_as_tuple(2008,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(193), std::forward_as_tuple(2008,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(199), std::forward_as_tuple(2009,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(205), std::forward_as_tuple(2009,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(211), std::forward_as_tuple(2010,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(217), std::forward_as_tuple(2010,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(223), std::forward_as_tuple(2011,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(229), std::forward_as_tuple(2011,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(235), std::forward_as_tuple(2012,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(241), std::forward_as_tuple(2012,8, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(247), std::forward_as_tuple(2013,2, 1));
rptConfig.emplace(std::piecewise_construct, std::forward_as_tuple(251), std::forward_as_tuple(2013,5, 2));