making dp is Eval for AquiferFetkovich

This commit is contained in:
Kai Bao
2019-11-08 13:24:16 +01:00
parent ed323b64ed
commit 21d69a7af0
2 changed files with 8 additions and 7 deletions

View File

@@ -145,9 +145,10 @@ namespace Opm
}
}
inline Scalar dpai(int idx)
inline Eval dpai(int idx)
{
Scalar dp = aquifer_pressure_ + Base::rhow_.at(idx).value()*Base::gravity_()*(Base::cell_depth_.at(idx) - aqufetp_data_.d0) - Base::pressure_current_.at(idx).value() ;
const Eval dp = aquifer_pressure_ - Base::pressure_current_.at(idx)
+ Base::rhow_.at(idx) * Base::gravity_()*(Base::cell_depth_.at(idx) - aqufetp_data_.d0);
return dp;
}
@@ -166,14 +167,14 @@ namespace Opm
// This function implements Eq 5.14 of the EclipseTechnicalDescription
inline void calculateInflowRate(int idx, const Simulator& simulator)
{
Scalar td_Tc_ = simulator.timeStepSize() / Base::Tc_ ;
Scalar exp_ = (1 - exp(-td_Tc_)) / td_Tc_;
Base::Qai_.at(idx) = Base::alphai_.at(idx) * aqufetp_data_.J * dpai(idx) * exp_;
const Scalar td_Tc_ = simulator.timeStepSize() / Base::Tc_ ;
const Scalar coef = (1 - exp(-td_Tc_)) / td_Tc_;
Base::Qai_.at(idx) = Base::alphai_[idx] * aqufetp_data_.J * dpai(idx) * coef;
}
inline void calculateAquiferCondition()
{
int pvttableIdx = aqufetp_data_.pvttableID - 1;
const int pvttableIdx = aqufetp_data_.pvttableID - 1;
Base::rhow_.resize(Base::cell_idx_.size(),0.);
if (!aqufetp_data_.p0)
{

View File

@@ -210,7 +210,7 @@ namespace Opm
virtual void initializeConnections(const Aquancon::AquanconOutput& connection) =0;
virtual Scalar dpai(int idx) = 0;
// virtual Scalar dpai(int idx) = 0;
virtual void calculateInflowRate(int idx, const Simulator& simulator) = 0;