Use std::pair<bool, double> for initial aquifer pressure

This commit is contained in:
Joakim Hove
2020-02-05 22:51:54 +01:00
parent cb8a76d098
commit 0e1a210ef2
2 changed files with 4 additions and 4 deletions

View File

@@ -212,10 +212,10 @@ protected:
int pvttableIdx = aquct_data_.pvttableID - 1;
Base::rhow_.resize(Base::cell_idx_.size(), 0.);
if (!aquct_data_.p0) {
if (!aquct_data_.p0.first) {
Base::pa0_ = calculateReservoirEquilibrium();
} else {
Base::pa0_ = *(aquct_data_.p0);
Base::pa0_ = aquct_data_.p0.second;
}
// use the thermodynamic state of the first active cell as a

View File

@@ -207,10 +207,10 @@ protected:
return;
}
if (!aqufetp_data_.p0) {
if (!aqufetp_data_.p0.first) {
Base::pa0_ = calculateReservoirEquilibrium();
} else {
Base::pa0_ = *(aqufetp_data_.p0);
Base::pa0_ = aqufetp_data_.p0.second;
}
aquifer_pressure_ = Base::pa0_;
}