From 06b2eb2cd33981f2febd8d52d2016ec4ec5c88ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= Date: Fri, 28 Oct 2016 14:23:36 +0200 Subject: [PATCH] Look up correct fluid-in-place keyword --- src/opm/output/eclipse/Summary.cpp | 8 ++++---- tests/test_Summary.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/opm/output/eclipse/Summary.cpp b/src/opm/output/eclipse/Summary.cpp index a333300d8..40324babd 100644 --- a/src/opm/output/eclipse/Summary.cpp +++ b/src/opm/output/eclipse/Summary.cpp @@ -359,20 +359,20 @@ quantity rpr(const fn_args& args) { } quantity roip(const fn_args& args) { - return region_sum( args , "ROIP", measure::volume ); + return region_sum( args , "OIP", measure::volume ); } quantity rgip(const fn_args& args) { - return region_sum( args , "RGIP", measure::volume ); + return region_sum( args , "GIP", measure::volume ); } quantity roipl(const fn_args& args) { - return region_sum( args , "ROIPL", measure::volume ); + return region_sum( args , "OIPL", measure::volume ); } quantity roipg(const fn_args& args) { - return region_sum( args , "ROIPG", measure::volume ); + return region_sum( args , "OIPG", measure::volume ); } diff --git a/tests/test_Summary.cpp b/tests/test_Summary.cpp index 25a4b99fc..f40dfb513 100644 --- a/tests/test_Summary.cpp +++ b/tests/test_Summary.cpp @@ -89,11 +89,11 @@ static data::Solution make_solution( const EclipseGrid& grid ) { } } - sol.insert( "PRESSURE" , UnitSystem::measure::pressure , pres , data::TargetType::RESTART_SOLUTION); - sol.insert( "ROIP" , UnitSystem::measure::volume , roip , data::TargetType::RESTART_AUXILLARY); - sol.insert( "ROIPL" , UnitSystem::measure::volume , roipl, data::TargetType::RESTART_AUXILLARY); - sol.insert( "ROIPG" , UnitSystem::measure::volume , roipg, data::TargetType::RESTART_AUXILLARY); - sol.insert( "RGIP" , UnitSystem::measure::volume , rgip , data::TargetType::RESTART_AUXILLARY); + sol.insert( "PRESSURE", UnitSystem::measure::pressure , pres , data::TargetType::RESTART_SOLUTION); + sol.insert( "OIP" , UnitSystem::measure::volume , roip , data::TargetType::RESTART_AUXILLARY); + sol.insert( "OIPL" , UnitSystem::measure::volume , roipl, data::TargetType::RESTART_AUXILLARY); + sol.insert( "OIPG" , UnitSystem::measure::volume , roipg, data::TargetType::RESTART_AUXILLARY); + sol.insert( "GIP" , UnitSystem::measure::volume , rgip , data::TargetType::RESTART_AUXILLARY); } return sol; }