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

Refactor SummaryState

Browse Source 
- Change SummaryState::add() -> SummaryState::update(), the
   SummaryState::update() method is semantically aware of totals.

 - Add an internal variable to the SummaryState class to keep track of the
   elapsed simulation time.
This commit is contained in:
Joakim Hove
2019-05-12 10:01:26 +02:00
parent 294c8aa2f7
commit 9e288a9d78
11 changed files with 461 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
tests/test_AggregateWellData.cpp
View File

@@ -218,74 +218,74 @@ TSTEP -- 8
{
auto state = Opm::SummaryState{};
state.add("WOPR:OP_1" , 1.0);
state.add("WWPR:OP_1" , 2.0);
state.add("WGPR:OP_1" , 3.0);
state.add("WVPR:OP_1" , 4.0);
state.add("WOPT:OP_1" , 10.0);
state.add("WWPT:OP_1" , 20.0);
state.add("WGPT:OP_1" , 30.0);
state.add("WVPT:OP_1" , 40.0);
state.add("WWIR:OP_1" , 0.0);
state.add("WGIR:OP_1" , 0.0);
state.add("WWIT:OP_1" , 0.0);
state.add("WGIT:OP_1" , 0.0);
state.add("WWCT:OP_1" , 0.625);
state.add("WGOR:OP_1" , 234.5);
state.add("WBHP:OP_1" , 314.15);
state.add("WOPTH:OP_1", 345.6);
state.add("WWPTH:OP_1", 456.7);
state.add("WGPTH:OP_1", 567.8);
state.add("WWITH:OP_1", 0.0);
state.add("WGITH:OP_1", 0.0);
state.add("WGVIR:OP_1", 0.0);
state.add("WWVIR:OP_1", 0.0);
state.update("WOPR:OP_1" , 1.0);
state.update("WWPR:OP_1" , 2.0);
state.update("WGPR:OP_1" , 3.0);
state.update("WVPR:OP_1" , 4.0);
state.update("WOPT:OP_1" , 10.0);
state.update("WWPT:OP_1" , 20.0);
state.update("WGPT:OP_1" , 30.0);
state.update("WVPT:OP_1" , 40.0);
state.update("WWIR:OP_1" , 0.0);
state.update("WGIR:OP_1" , 0.0);
state.update("WWIT:OP_1" , 0.0);
state.update("WGIT:OP_1" , 0.0);
state.update("WWCT:OP_1" , 0.625);
state.update("WGOR:OP_1" , 234.5);
state.update("WBHP:OP_1" , 314.15);
state.update("WOPTH:OP_1", 345.6);
state.update("WWPTH:OP_1", 456.7);
state.update("WGPTH:OP_1", 567.8);
state.update("WWITH:OP_1", 0.0);
state.update("WGITH:OP_1", 0.0);
state.update("WGVIR:OP_1", 0.0);
state.update("WWVIR:OP_1", 0.0);
state.add("WOPR:OP_2" , 0.0);
state.add("WWPR:OP_2" , 0.0);
state.add("WGPR:OP_2" , 0.0);
state.add("WVPR:OP_2" , 0.0);
state.add("WOPT:OP_2" , 0.0);
state.add("WWPT:OP_2" , 0.0);
state.add("WGPT:OP_2" , 0.0);
state.add("WVPT:OP_2" , 0.0);
state.add("WWIR:OP_2" , 100.0);
state.add("WGIR:OP_2" , 200.0);
state.add("WWIT:OP_2" , 1000.0);
state.add("WGIT:OP_2" , 2000.0);
state.add("WWCT:OP_2" , 0.0);
state.add("WGOR:OP_2" , 0.0);
state.add("WBHP:OP_2" , 400.6);
state.add("WOPTH:OP_2", 0.0);
state.add("WWPTH:OP_2", 0.0);
state.add("WGPTH:OP_2", 0.0);
state.add("WWITH:OP_2", 1515.0);
state.add("WGITH:OP_2", 3030.0);
state.add("WGVIR:OP_2", 1234.0);
state.add("WWVIR:OP_2", 4321.0);
state.update("WOPR:OP_2" , 0.0);
state.update("WWPR:OP_2" , 0.0);
state.update("WGPR:OP_2" , 0.0);
state.update("WVPR:OP_2" , 0.0);
state.update("WOPT:OP_2" , 0.0);
state.update("WWPT:OP_2" , 0.0);
state.update("WGPT:OP_2" , 0.0);
state.update("WVPT:OP_2" , 0.0);
state.update("WWIR:OP_2" , 100.0);
state.update("WGIR:OP_2" , 200.0);
state.update("WWIT:OP_2" , 1000.0);
state.update("WGIT:OP_2" , 2000.0);
state.update("WWCT:OP_2" , 0.0);
state.update("WGOR:OP_2" , 0.0);
state.update("WBHP:OP_2" , 400.6);
state.update("WOPTH:OP_2", 0.0);
state.update("WWPTH:OP_2", 0.0);
state.update("WGPTH:OP_2", 0.0);
state.update("WWITH:OP_2", 1515.0);
state.update("WGITH:OP_2", 3030.0);
state.update("WGVIR:OP_2", 1234.0);
state.update("WWVIR:OP_2", 4321.0);
state.add("WOPR:OP_3" , 11.0);
state.add("WWPR:OP_3" , 12.0);
state.add("WGPR:OP_3" , 13.0);
state.add("WVPR:OP_3" , 14.0);
state.add("WOPT:OP_3" , 110.0);
state.add("WWPT:OP_3" , 120.0);
state.add("WGPT:OP_3" , 130.0);
state.add("WVPT:OP_3" , 140.0);
state.add("WWIR:OP_3" , 0.0);
state.add("WGIR:OP_3" , 0.0);
state.add("WWIT:OP_3" , 0.0);
state.add("WGIT:OP_3" , 0.0);
state.add("WWCT:OP_3" , 0.0625);
state.add("WGOR:OP_3" , 1234.5);
state.add("WBHP:OP_3" , 314.15);
state.add("WOPTH:OP_3", 2345.6);
state.add("WWPTH:OP_3", 3456.7);
state.add("WGPTH:OP_3", 4567.8);
state.add("WWITH:OP_3", 0.0);
state.add("WGITH:OP_3", 0.0);
state.add("WGVIR:OP_3", 0.0);
state.add("WWVIR:OP_3", 43.21);
state.update("WOPR:OP_3" , 11.0);
state.update("WWPR:OP_3" , 12.0);
state.update("WGPR:OP_3" , 13.0);
state.update("WVPR:OP_3" , 14.0);
state.update("WOPT:OP_3" , 110.0);
state.update("WWPT:OP_3" , 120.0);
state.update("WGPT:OP_3" , 130.0);
state.update("WVPT:OP_3" , 140.0);
state.update("WWIR:OP_3" , 0.0);
state.update("WGIR:OP_3" , 0.0);
state.update("WWIT:OP_3" , 0.0);
state.update("WGIT:OP_3" , 0.0);
state.update("WWCT:OP_3" , 0.0625);
state.update("WGOR:OP_3" , 1234.5);
state.update("WBHP:OP_3" , 314.15);
state.update("WOPTH:OP_3", 2345.6);
state.update("WWPTH:OP_3", 3456.7);
state.update("WGPTH:OP_3", 4567.8);
state.update("WWITH:OP_3", 0.0);
state.update("WGITH:OP_3", 0.0);
state.update("WGVIR:OP_3", 0.0);
state.update("WWVIR:OP_3", 43.21);
return state;
}