OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 17:02:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

don't communicate isoThermal when approach is NoWaterPvt

Browse Source
This commit is contained in:
Tor Harald Sandve committed 2020-01-10 09:02:16 +01:00
1 parent 2877a984a1
commit bc33e482be
1 file changed
+7 -2
Download Patch File Download Diff File Expand all files Collapse all files
opm/simulators/utils/ParallelRestart.cpp
+7 -2
View File
@@ -940,7 +940,8 @@ std::size_t packSize(const WaterPvtThermal<Scalar>& data,
packSize(data.enableThermalViscosity(), comm) + packSize(data.enableThermalViscosity(), comm) +
packSize(data.enableInternalEnergy(), comm); packSize(data.enableInternalEnergy(), comm);
size += packSize(bool(), comm); size += packSize(bool(), comm);
if (data.isoThermalPvt()) using PvtApproach = WaterPvtThermal<Scalar>;
if (data.isoThermalPvt()->approach() != PvtApproach::IsothermalPvt::NoWaterPvt)
size += packSize(*data.isoThermalPvt(), comm); size += packSize(*data.isoThermalPvt(), comm);
return size; return size;
@@ -2624,7 +2625,9 @@ void pack(const WaterPvtThermal<Scalar>& data,
pack(data.enableThermalViscosity(), buffer, position, comm); pack(data.enableThermalViscosity(), buffer, position, comm);
pack(data.enableInternalEnergy(), buffer, position, comm); pack(data.enableInternalEnergy(), buffer, position, comm);
pack(data.isoThermalPvt() != nullptr, buffer, position, comm); pack(data.isoThermalPvt() != nullptr, buffer, position, comm);
if (data.isoThermalPvt())
using PvtApproach = WaterPvtThermal<Scalar>;
if (data.isoThermalPvt()->approach() != PvtApproach::IsothermalPvt::NoWaterPvt)
pack(*data.isoThermalPvt(), buffer, position, comm); pack(*data.isoThermalPvt(), buffer, position, comm);
} }
@@ -4671,6 +4674,8 @@ void unpack(WaterPvtThermal<Scalar>& data,
typename WaterPvtThermal<Scalar>::IsothermalPvt* pvt = nullptr; typename WaterPvtThermal<Scalar>::IsothermalPvt* pvt = nullptr;
if (isothermal) { if (isothermal) {
pvt = new typename WaterPvtThermal<Scalar>::IsothermalPvt; pvt = new typename WaterPvtThermal<Scalar>::IsothermalPvt;
using PvtApproach = WaterPvtThermal<Scalar>;
if (pvt->approach() != PvtApproach::IsothermalPvt::NoWaterPvt)
unpack(*pvt, buffer, position, comm); unpack(*pvt, buffer, position, comm);
} }
data = WaterPvtThermal<Scalar>(pvt, viscrefPress, watdentRefTemp, data = WaterPvtThermal<Scalar>(pvt, viscrefPress, watdentRefTemp,