From 89b8bf711f983344e28fa01ab2bc2b5f77494cd2 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 12 Sep 2024 07:40:12 +0200 Subject: [PATCH] fixed: initialize members caused issues for serialization tests in the debug iterator build --- opm/models/blackoil/blackoilpolymerparams.hpp | 36 ++++++++--------- opm/models/blackoil/blackoilsolventparams.hpp | 40 +++++++++---------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/opm/models/blackoil/blackoilpolymerparams.hpp b/opm/models/blackoil/blackoilpolymerparams.hpp index c67a3b133..e21c9978b 100644 --- a/opm/models/blackoil/blackoilpolymerparams.hpp +++ b/opm/models/blackoil/blackoilpolymerparams.hpp @@ -94,26 +94,26 @@ struct BlackOilPolymerParams { TabulatedTwoDFunction table_func; }; - std::vector plyrockDeadPoreVolume_; - std::vector plyrockResidualResistanceFactor_; - std::vector plyrockRockDensityFactor_; - std::vector plyrockAdsorbtionIndex_; - std::vector plyrockMaxAdsorbtion_; - std::vector plyadsAdsorbedPolymer_; - std::vector plyviscViscosityMultiplierTable_; - std::vector plymaxMaxConcentration_; - std::vector plymixparToddLongstaff_; - std::vector> plyshlogShearEffectRefMultiplier_; - std::vector> plyshlogShearEffectRefLogVelocity_; - std::vector shrate_; - bool hasShrate_; - bool hasPlyshlog_; + std::vector plyrockDeadPoreVolume_{}; + std::vector plyrockResidualResistanceFactor_{}; + std::vector plyrockRockDensityFactor_{}; + std::vector plyrockAdsorbtionIndex_{}; + std::vector plyrockMaxAdsorbtion_{}; + std::vector plyadsAdsorbedPolymer_{}; + std::vector plyviscViscosityMultiplierTable_{}; + std::vector plymaxMaxConcentration_{}; + std::vector plymixparToddLongstaff_{}; + std::vector> plyshlogShearEffectRefMultiplier_{}; + std::vector> plyshlogShearEffectRefLogVelocity_{}; + std::vector shrate_{}; + bool hasShrate_ = false; + bool hasPlyshlog_ = false; - std::vector plyvmhCoefficients_; - std::map plymwinjTables_; - std::map skprwatTables_; + std::vector plyvmhCoefficients_{}; + std::map plymwinjTables_{}; + std::map skprwatTables_{}; - std::map skprpolyTables_; + std::map skprpolyTables_{}; }; } // namespace Opm diff --git a/opm/models/blackoil/blackoilsolventparams.hpp b/opm/models/blackoil/blackoilsolventparams.hpp index 3962bf63c..bafd97581 100644 --- a/opm/models/blackoil/blackoilsolventparams.hpp +++ b/opm/models/blackoil/blackoilsolventparams.hpp @@ -59,30 +59,30 @@ struct BlackOilSolventParams void initFromState(const EclipseState& eclState, const Schedule& schedule); #endif - BrineCo2Pvt brineCo2Pvt_; - BrineH2Pvt brineH2Pvt_; - Co2GasPvt co2GasPvt_; - H2GasPvt h2GasPvt_; - SolventPvt solventPvt_; + BrineCo2Pvt brineCo2Pvt_{}; + BrineH2Pvt brineH2Pvt_{}; + Co2GasPvt co2GasPvt_{}; + H2GasPvt h2GasPvt_{}; + SolventPvt solventPvt_{}; - std::vector ssfnKrg_; // the krg(Fs) column of the SSFN table - std::vector ssfnKrs_; // the krs(Fs) column of the SSFN table - std::vector sof2Krn_; // the krn(Sn) column of the SOF2 table - std::vector misc_; // the misc(Ss) column of the MISC table - std::vector pmisc_; // the pmisc(pg) column of the PMISC table - std::vector msfnKrsg_; // the krsg(Ssg) column of the MSFN table - std::vector msfnKro_; // the kro(Ssg) column of the MSFN table - std::vector sorwmis_; // the sorwmis(Sw) column of the SORWMIS table - std::vector sgcwmis_; // the sgcwmis(Sw) column of the SGCWMIS table + std::vector ssfnKrg_{}; // the krg(Fs) column of the SSFN table + std::vector ssfnKrs_{}; // the krs(Fs) column of the SSFN table + std::vector sof2Krn_{}; // the krn(Sn) column of the SOF2 table + std::vector misc_{}; // the misc(Ss) column of the MISC table + std::vector pmisc_{}; // the pmisc(pg) column of the PMISC table + std::vector msfnKrsg_{}; // the krsg(Ssg) column of the MSFN table + std::vector msfnKro_{}; // the kro(Ssg) column of the MSFN table + std::vector sorwmis_{}; // the sorwmis(Sw) column of the SORWMIS table + std::vector sgcwmis_{}; // the sgcwmis(Sw) column of the SGCWMIS table - std::vector tlMixParamViscosity_; // Todd-Longstaff mixing parameter for viscosity - std::vector tlMixParamDensity_; // Todd-Longstaff mixing parameter for density - std::vector tlPMixTable_; // the tlpmixpa(Po) column of the TLPMIXPA table + std::vector tlMixParamViscosity_{}; // Todd-Longstaff mixing parameter for viscosity + std::vector tlMixParamDensity_{}; // Todd-Longstaff mixing parameter for density + std::vector tlPMixTable_{}; // the tlpmixpa(Po) column of the TLPMIXPA table - bool isMiscible_; + bool isMiscible_ = false; bool rsSolw_active_ = false; - bool co2sol_; - bool h2sol_; + bool co2sol_ = false; + bool h2sol_ = false; /*! * \brief Specify the number of satuation regions.