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

Merge pull request #557 from joakim-hove/actioncontext-summary-state

Browse Source 
Actioncontext summary state
This commit is contained in:
Joakim Hove 2018-11-16 11:31:20 +01:00 committed by GitHub
commit c1ffeeef53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 67 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
opm/parser/eclipse/EclipseState/Schedule/ActionContext.hpp
View File

@ -24,17 +24,21 @@
#include <string>
#include <map>
namespace Opm {
#include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
/*
This class is extremely work in progress, the api is hopefully sane; the
implementation complete garbage.
*/
namespace Opm {
class ActionContext {
public:
ActionContext();
/*
Observe that the ActionContext takes a copy of the SummaryState object.
*/
explicit ActionContext(const SummaryState& summary_state);
/*
The get methods will first check the internal storage in the 'values' map
and then subsequently query the SummaryState member.
*/
double get(const std::string& func, const std::string& arg) const;
void add(const std::string& func, const std::string& arg, double value);
@ -42,6 +46,7 @@ public:
void add(const std::string& func, double value);
private:
SummaryState summary_state;
std::map<std::string, double> values;
};
}

24
src/opm/parser/eclipse/EclipseState/Schedule/ActionContext.cpp
View File

@ -19,27 +19,35 @@
#include <opm/parser/eclipse/EclipseState/Schedule/ActionContext.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
namespace Opm {
ActionContext::ActionContext() {
for (const auto& pair : TimeMap::eclipseMonthIndices())
this->add(pair.first, pair.second);
}
void ActionContext::add(const std::string& func, const std::string& arg, double value) {
this->values[func + ":" + arg] = value;
}
ActionContext::ActionContext(const SummaryState& summary_state) :
summary_state(summary_state)
{
for (const auto& pair : TimeMap::eclipseMonthIndices())
this->add(pair.first, pair.second);
}
void ActionContext::add(const std::string& func, double value) {
this->values[func] = value;
}
double ActionContext::get(const std::string& func, const std::string& arg) const {
return this->values.at( func + ":" + arg );
return this->get(func + ":" + arg);
}
double ActionContext::get(const std::string& func) const {
return this->values.at( func );
double ActionContext::get(const std::string& key) const {
const auto& iter = this->values.find(key);
if (iter != this->values.end())
return iter->second;
return this->summary_state.get(key);
}
}

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

@ -43,7 +43,7 @@ namespace Opm{
double SummaryState::get(const std::string& key) const {
const auto iter = this->values.find(key);
if (iter == this->values.end())
throw std::invalid_argument("XX No such key: " + key);
throw std::out_of_range("No such key: " + key);
return iter->second;
}

49
tests/parser/ACTIONX.cpp
View File

@ -29,6 +29,7 @@
#include <ert/util/util.h>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/ActionAST.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/ActionContext.hpp>
@ -139,7 +140,8 @@ TSTEP
BOOST_AUTO_TEST_CASE(TestActions) {
Opm::ActionContext context;
Opm::SummaryState st;
Opm::ActionContext context(st);
Opm::Actions config;
BOOST_CHECK_EQUAL(config.size(), 0);
@ -192,7 +194,8 @@ BOOST_AUTO_TEST_CASE(TestActions) {
BOOST_AUTO_TEST_CASE(TestContext) {
Opm::ActionContext context;
Opm::SummaryState st;
Opm::ActionContext context(st);
BOOST_REQUIRE_THROW(context.get("func", "arg"), std::out_of_range);
@ -238,7 +241,8 @@ BOOST_AUTO_TEST_CASE(TestActionAST_BASIC) {
ActionAST ast1({"WWCT", "OPX", ">", "0.75"});
ActionAST ast2({"WWCT", "OPX", "=", "WWCT", "OPX"});
ActionAST ast3({"WWCT", "OPY", ">", "0.75"});
ActionContext context;
SummaryState st;
ActionContext context(st);
context.add("WWCT", "OPX", 100);
BOOST_CHECK(ast1.eval(context));
@ -254,7 +258,8 @@ BOOST_AUTO_TEST_CASE(TestActionAST_OR_AND) {
ActionAST ast_or({"WWCT", "OPX", ">", "0.75", "OR", "WWCT", "OPY", ">", "0.75"});
ActionAST ast_and({"WWCT", "OPX", ">", "0.75", "AND", "WWCT", "OPY", ">", "0.75"});
ActionAST par({"WWCT", "OPX", ">", "0.75", "AND", "(", "WWCT", "OPY", ">", "0.75", "OR", "WWCT", "OPZ", ">", "0.75", ")"});
ActionContext context;
SummaryState st;
ActionContext context(st);
context.add("WWCT", "OPX", 100);
context.add("WWCT", "OPY", -100);
@ -289,7 +294,8 @@ BOOST_AUTO_TEST_CASE(TestActionAST_OR_AND) {
BOOST_AUTO_TEST_CASE(DATE) {
ActionAST ast({"MNTH", ">=", "JUN"});
ActionContext context;
SummaryState st;
ActionContext context(st);
context.add("MNTH", 6);
BOOST_CHECK( ast.eval(context) );
@ -303,7 +309,8 @@ BOOST_AUTO_TEST_CASE(DATE) {
BOOST_AUTO_TEST_CASE(MANUAL1) {
ActionAST ast({"GGPR", "FIELD", ">", "50000", "AND", "WGOR", "PR", ">" ,"GGOR", "FIELD"});
ActionContext context;
SummaryState st;
ActionContext context(st);
context.add("GGPR", "FIELD", 60000 );
context.add("WGOR", "PR" , 300 );
@ -323,7 +330,8 @@ BOOST_AUTO_TEST_CASE(MANUAL1) {
BOOST_AUTO_TEST_CASE(MANUAL2) {
ActionAST ast({"GWCT", "LIST1", ">", "0.70", "AND", "(", "GWPR", "LIST1", ">", "GWPR", "LIST2", "OR", "GWPR", "LIST1", ">", "GWPR", "LIST3", ")"});
ActionContext context;
SummaryState st;
ActionContext context(st);
context.add("GWCT", "LIST1", 1.0);
context.add("GWPR", "LIST1", 1 );
@ -358,7 +366,8 @@ BOOST_AUTO_TEST_CASE(MANUAL2) {
BOOST_AUTO_TEST_CASE(MANUAL3) {
ActionAST ast({"MNTH", ".GE.", "MAR", "AND", "MNTH", ".LE.", "OCT", "AND", "GMWL", "HIGH", ".GE.", "4"});
ActionContext context;
SummaryState st;
ActionContext context(st);
context.add("MNTH", 4);
context.add("GMWL", "HIGH", 4);
@ -380,7 +389,8 @@ BOOST_AUTO_TEST_CASE(MANUAL3) {
BOOST_AUTO_TEST_CASE(MANUAL4) {
ActionAST ast({"GWCT", "FIELD", ">", "0.8", "AND", "DAY", ">", "1", "AND", "MNTH", ">", "JUN", "AND", "YEAR", ">=", "2021"});
ActionContext context;
SummaryState st;
ActionContext context(st);
context.add("MNTH", 7);
@ -400,7 +410,8 @@ BOOST_AUTO_TEST_CASE(MANUAL4) {
BOOST_AUTO_TEST_CASE(MANUAL5) {
ActionAST ast({"WCG2", "PROD1", ">", "WCG5", "PROD2", "AND", "GCG3", "G1", ">", "GCG7", "G2", "OR", "FCG1", ">", "FCG7"});
ActionContext context;
SummaryState st;
ActionContext context(st);
context.add("WCG2", "PROD1", 100);
context.add("WCG5", "PROD2", 50);
@ -439,7 +450,8 @@ BOOST_AUTO_TEST_CASE(MANUAL5) {
BOOST_AUTO_TEST_CASE(LGR) {
ActionAST ast({"LWCC" , "OPX", "LOCAL", "1", "2", "3", ">", "100"});
ActionContext context;
SummaryState st;
ActionContext context(st);
context.add("LWCC", "OPX:LOCAL:1:2:3", 200);
BOOST_CHECK(ast.eval(context));
@ -447,3 +459,18 @@ BOOST_AUTO_TEST_CASE(LGR) {
context.add("LWCC", "OPX:LOCAL:1:2:3", 20);
BOOST_CHECK(!ast.eval(context));
}
BOOST_AUTO_TEST_CASE(ActionContextTest) {
SummaryState st;
st.add("WWCT:OP1", 100);
ActionContext context(st);
BOOST_CHECK_EQUAL(context.get("WWCT", "OP1"), 100);
BOOST_REQUIRE_THROW(context.get("WGOR", "B37"), std::out_of_range);
context.add("WWCT", "OP1", 200);
BOOST_CHECK_EQUAL(context.get("WWCT", "OP1"), 200);
BOOST_REQUIRE_THROW(context.get("WGOR", "B37"), std::out_of_range);
}

2
tests/test_Summary.cpp
View File

@ -1321,7 +1321,7 @@ BOOST_AUTO_TEST_CASE(Test_SummaryState) {
Opm::SummaryState st;
st.add("WWCT:OP_2", 100);
BOOST_CHECK_CLOSE(st.get("WWCT:OP_2"), 100, 1e-5);
BOOST_CHECK_THROW(st.get("NO_SUCH_KEY"), std::invalid_argument);
BOOST_CHECK_THROW(st.get("NO_SUCH_KEY"), std::out_of_range);
BOOST_CHECK(st.has("WWCT:OP_2"));
BOOST_CHECK(!st.has("NO_SUCH_KEY"));