Prepare for Creating Network-Level Summary Output

This commit adds a level of indirection to the existing group-level
data (active controls and guiderates), and adds a new 'NodeData'
level to the 'data::' protocol for transporting values from the
simulator to the output layer.

Update all call sites and users accordingly.
This commit is contained in:
Bård Skaflestad
2020-09-19 00:09:16 +02:00
parent ac40c65f64
commit 6ea0e73512
14 changed files with 237 additions and 184 deletions

View File

@@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(EclipseWriteRestartWellInfo) {
solution.insert( "SWAT" , Opm::UnitSystem::measure::identity , std::vector< double >( num_cells, 1 ) , Opm::data::TargetType::RESTART_SOLUTION);
solution.insert( "SGAS" , Opm::UnitSystem::measure::identity , std::vector< double >( num_cells, 1 ) , Opm::data::TargetType::RESTART_SOLUTION);
Opm::data::Wells wells;
Opm::data::GroupValues groups;
Opm::data::GroupAndNetworkValues group_nwrk;
for(int timestep = 0; timestep <= countTimeStep; ++timestep) {
@@ -226,7 +226,7 @@ BOOST_AUTO_TEST_CASE(EclipseWriteRestartWellInfo) {
timestep,
false,
schedule.seconds(timestep),
Opm::RestartValue(solution, wells, groups));
Opm::RestartValue(solution, wells, group_nwrk));
}
for (int i=1; i <=4; i++) {