Merge pull request #199 from joakim-hove/group-group

Groups of groups summary data.
OPM · Jul 26, 2017 · c0c5874 · c0c5874
2 parents e2a31d8 + 3c2a376
commit c0c5874
Show file tree

Hide file tree

Showing 4 changed files with 584 additions and 10 deletions.
diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
@@ -67,6 +67,7 @@ list (APPEND TEST_SOURCE_FILES
 list (APPEND TEST_DATA_FILES
         tests/FIRST_SIM.DATA
         tests/summary_deck.DATA
+        tests/group_group.DATA
         tests/testBlackoilState3.DATA
         tests/testRFT.DATA
         tests/table_deck.DATA

diff --git a/opm/output/eclipse/Summary.cpp b/opm/output/eclipse/Summary.cpp
@@ -772,16 +772,7 @@ inline std::vector< const Well* > find_wells( const Schedule& schedule,
     if( type == ECL_SMSPEC_GROUP_VAR ) {
         if( !schedule.hasGroup( name ) ) return {};
 
-        const auto& names = schedule.getGroup( name ).getWells( timestep );
-        auto get = [&schedule]( const std::string& w ) {
-            return schedule.getWell( w );
-        };
-
-        std::vector< const Well* > wells;
-        auto insert = std::back_inserter( wells );
-        std::transform( names.begin(), names.end(), insert, get );
-
-        return wells;
+        return schedule.getWells( name, timestep );
     }
 
     if( type == ECL_SMSPEC_FIELD_VAR )