OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-26 20:06:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed: initialize members

Browse Source 
caused issues for serialization tests in the debug iterator build
This commit is contained in:
Arne Morten Kvarving 2024-09-12 07:40:12 +02:00
parent ec15bad996
commit 89b8bf711f
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
opm/models/blackoil/blackoilpolymerparams.hpp
View File

@ -94,26 +94,26 @@ struct BlackOilPolymerParams {
TabulatedTwoDFunction table_func;
};
std::vector<Scalar> plyrockDeadPoreVolume_;
std::vector<Scalar> plyrockResidualResistanceFactor_;
std::vector<Scalar> plyrockRockDensityFactor_;
std::vector<Scalar> plyrockAdsorbtionIndex_;
std::vector<Scalar> plyrockMaxAdsorbtion_;
std::vector<TabulatedFunction> plyadsAdsorbedPolymer_;
std::vector<TabulatedFunction> plyviscViscosityMultiplierTable_;
std::vector<Scalar> plymaxMaxConcentration_;
std::vector<Scalar> plymixparToddLongstaff_;
std::vector<std::vector<Scalar>> plyshlogShearEffectRefMultiplier_;
std::vector<std::vector<Scalar>> plyshlogShearEffectRefLogVelocity_;
std::vector<Scalar> shrate_;
bool hasShrate_;
bool hasPlyshlog_;
std::vector<Scalar> plyrockDeadPoreVolume_{};
std::vector<Scalar> plyrockResidualResistanceFactor_{};
std::vector<Scalar> plyrockRockDensityFactor_{};
std::vector<Scalar> plyrockAdsorbtionIndex_{};
std::vector<Scalar> plyrockMaxAdsorbtion_{};
std::vector<TabulatedFunction> plyadsAdsorbedPolymer_{};
std::vector<TabulatedFunction> plyviscViscosityMultiplierTable_{};
std::vector<Scalar> plymaxMaxConcentration_{};
std::vector<Scalar> plymixparToddLongstaff_{};
std::vector<std::vector<Scalar>> plyshlogShearEffectRefMultiplier_{};
std::vector<std::vector<Scalar>> plyshlogShearEffectRefLogVelocity_{};
std::vector<Scalar> shrate_{};
bool hasShrate_ = false;
bool hasPlyshlog_ = false;
std::vector<PlyvmhCoefficients> plyvmhCoefficients_;
std::map<int, TabulatedTwoDFunction> plymwinjTables_;
std::map<int, TabulatedTwoDFunction> skprwatTables_;
std::vector<PlyvmhCoefficients> plyvmhCoefficients_{};
std::map<int, TabulatedTwoDFunction> plymwinjTables_{};
std::map<int, TabulatedTwoDFunction> skprwatTables_{};
std::map<int, SkprpolyTable> skprpolyTables_;
std::map<int, SkprpolyTable> skprpolyTables_{};
};
} // namespace Opm

40
opm/models/blackoil/blackoilsolventparams.hpp
View File

@ -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<TabulatedFunction> ssfnKrg_; // the krg(Fs) column of the SSFN table
std::vector<TabulatedFunction> ssfnKrs_; // the krs(Fs) column of the SSFN table
std::vector<TabulatedFunction> sof2Krn_; // the krn(Sn) column of the SOF2 table
std::vector<TabulatedFunction> misc_; // the misc(Ss) column of the MISC table
std::vector<TabulatedFunction> pmisc_; // the pmisc(pg) column of the PMISC table
std::vector<TabulatedFunction> msfnKrsg_; // the krsg(Ssg) column of the MSFN table
std::vector<TabulatedFunction> msfnKro_; // the kro(Ssg) column of the MSFN table
std::vector<TabulatedFunction> sorwmis_; // the sorwmis(Sw) column of the SORWMIS table
std::vector<TabulatedFunction> sgcwmis_; // the sgcwmis(Sw) column of the SGCWMIS table
std::vector<TabulatedFunction> ssfnKrg_{}; // the krg(Fs) column of the SSFN table
std::vector<TabulatedFunction> ssfnKrs_{}; // the krs(Fs) column of the SSFN table
std::vector<TabulatedFunction> sof2Krn_{}; // the krn(Sn) column of the SOF2 table
std::vector<TabulatedFunction> misc_{}; // the misc(Ss) column of the MISC table
std::vector<TabulatedFunction> pmisc_{}; // the pmisc(pg) column of the PMISC table
std::vector<TabulatedFunction> msfnKrsg_{}; // the krsg(Ssg) column of the MSFN table
std::vector<TabulatedFunction> msfnKro_{}; // the kro(Ssg) column of the MSFN table
std::vector<TabulatedFunction> sorwmis_{}; // the sorwmis(Sw) column of the SORWMIS table
std::vector<TabulatedFunction> sgcwmis_{}; // the sgcwmis(Sw) column of the SGCWMIS table
std::vector<Scalar> tlMixParamViscosity_; // Todd-Longstaff mixing parameter for viscosity
std::vector<Scalar> tlMixParamDensity_; // Todd-Longstaff mixing parameter for density
std::vector<TabulatedFunction> tlPMixTable_; // the tlpmixpa(Po) column of the TLPMIXPA table
std::vector<Scalar> tlMixParamViscosity_{}; // Todd-Longstaff mixing parameter for viscosity
std::vector<Scalar> tlMixParamDensity_{}; // Todd-Longstaff mixing parameter for density
std::vector<TabulatedFunction> 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.