From 6be8d1b4bb2b010de3d5cea79450de7fc40c0f5a Mon Sep 17 00:00:00 2001 From: Kai Bao Date: Sun, 5 Jan 2020 15:22:53 +0100 Subject: [PATCH] adapting to the interface change from OPM/opm-common#1386 --- opm/simulators/utils/ParallelRestart.cpp | 44 ++++++++++++++++-------- tests/test_ParallelRestart.cpp | 2 ++ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 54dcc9085..1c2a25ecb 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -1048,8 +1048,10 @@ std::size_t packSize(const Well::WellInjectionProperties& data, return packSize(data.name, comm) + packSize(data.surfaceInjectionRate, comm) + packSize(data.reservoirInjectionRate, comm) + - packSize(data.BHPLimit, comm) + - packSize(data.THPLimit, comm) + + packSize(data.BHPTarget, comm) + + packSize(data.THPTarget, comm) + + packSize(data.bhp_hist_limit, comm) + + packSize(data.thp_hist_limit, comm) + packSize(data.temperature, comm) + packSize(data.BHPH, comm) + packSize(data.THPH, comm) + @@ -1098,8 +1100,10 @@ std::size_t packSize(const Well::WellProductionProperties& data, packSize(data.GasRate, comm) + packSize(data.LiquidRate, comm) + packSize(data.ResVRate, comm) + - packSize(data.BHPLimit, comm) + - packSize(data.THPLimit, comm) + + packSize(data.BHPTarget, comm) + + packSize(data.THPTarget, comm) + + packSize(data.bhp_hist_limit, comm) + + packSize(data.thp_hist_limit, comm) + packSize(data.BHPH, comm) + packSize(data.THPH, comm) + packSize(data.VFPTableNumber, comm) + @@ -2690,8 +2694,10 @@ void pack(const Well::WellInjectionProperties& data, pack(data.name, buffer, position, comm); pack(data.surfaceInjectionRate, buffer, position, comm); pack(data.reservoirInjectionRate, buffer, position, comm); - pack(data.BHPLimit, buffer, position, comm); - pack(data.THPLimit, buffer, position, comm); + pack(data.BHPTarget, buffer, position, comm); + pack(data.THPTarget, buffer, position, comm); + pack(data.bhp_hist_limit, buffer, position, comm); + pack(data.thp_hist_limit, buffer, position, comm); pack(data.temperature, buffer, position, comm); pack(data.BHPH, buffer, position, comm); pack(data.THPH, buffer, position, comm); @@ -2743,8 +2749,10 @@ void pack(const Well::WellProductionProperties& data, pack(data.GasRate, buffer, position, comm); pack(data.LiquidRate, buffer, position, comm); pack(data.ResVRate, buffer, position, comm); - pack(data.BHPLimit, buffer, position, comm); - pack(data.THPLimit, buffer, position, comm); + pack(data.BHPTarget, buffer, position, comm); + pack(data.THPTarget, buffer, position, comm); + pack(data.bhp_hist_limit, buffer, position, comm); + pack(data.thp_hist_limit, buffer, position, comm); pack(data.BHPH, buffer, position, comm); pack(data.THPH, buffer, position, comm); pack(data.VFPTableNumber, buffer, position, comm); @@ -4753,8 +4761,10 @@ void unpack(Well::WellInjectionProperties& data, unpack(data.name, buffer, position, comm); unpack(data.surfaceInjectionRate, buffer, position, comm); unpack(data.reservoirInjectionRate, buffer, position, comm); - unpack(data.BHPLimit, buffer, position, comm); - unpack(data.THPLimit, buffer, position, comm); + unpack(data.BHPTarget, buffer, position, comm); + unpack(data.THPTarget, buffer, position, comm); + unpack(data.bhp_hist_limit, buffer, position, comm); + unpack(data.thp_hist_limit, buffer, position, comm); unpack(data.temperature, buffer, position, comm); unpack(data.BHPH, buffer, position, comm); unpack(data.THPH, buffer, position, comm); @@ -4822,7 +4832,8 @@ void unpack(Well::WellProductionProperties& data, { std::string name; UDAValue OilRate, WaterRate, GasRate, LiquidRate, ResVRate; - UDAValue BHPLimit, THPLimit; + UDAValue BHPTarget, THPTarget; + double bhp_hist_limit, thp_hist_limit; double BHPH, THPH; int VFPTableNumber; double ALQValue; @@ -4836,8 +4847,10 @@ void unpack(Well::WellProductionProperties& data, unpack(GasRate, buffer, position, comm); unpack(LiquidRate, buffer, position, comm); unpack(ResVRate, buffer, position, comm); - unpack(BHPLimit, buffer, position, comm); - unpack(THPLimit, buffer, position, comm); + unpack(BHPTarget, buffer, position, comm); + unpack(THPTarget, buffer, position, comm); + unpack(bhp_hist_limit, buffer, position, comm); + unpack(thp_hist_limit, buffer, position, comm); unpack(BHPH, buffer, position, comm); unpack(THPH, buffer, position, comm); unpack(VFPTableNumber, buffer, position, comm); @@ -4847,8 +4860,9 @@ void unpack(Well::WellProductionProperties& data, unpack(whistctl_cmode, buffer, position, comm); unpack(prodCtrls, buffer, position, comm); data = Well::WellProductionProperties(name, OilRate, WaterRate, GasRate, - LiquidRate, ResVRate, BHPLimit, - THPLimit, BHPH, THPH, VFPTableNumber, + LiquidRate, ResVRate, BHPTarget, + THPTarget, bhp_hist_limit, thp_hist_limit, + BHPH, THPH, VFPTableNumber, ALQValue, predictionMode, controlMode, whistctl_cmode, prodCtrls); } diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index cc2dd94ef..61f2c3c61 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1575,6 +1575,7 @@ BOOST_AUTO_TEST_CASE(WellInjectionProperties) Opm::UDAValue("test"), Opm::UDAValue(2.0), Opm::UDAValue(3.0), + 2.0, 3.0, 4.0, 5.0, 6.0, 7, true, @@ -1643,6 +1644,7 @@ BOOST_AUTO_TEST_CASE(WellProductionProperties) Opm::UDAValue(4.0), Opm::UDAValue(5.0), Opm::UDAValue(6.0), + 5.0, 6.0, 7.0, 8.0, 9, 10.0,