OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

modification for global assembly

Browse Source
This commit is contained in:
hnil 2022-06-20 12:41:58 +02:00 committed by Atgeirr Flø Rasmussen
parent d9c59efcf1
commit c5d547efff
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ebos/eclproblemtpfa.hh
View File

@ -1930,7 +1930,6 @@ public:
aquiferModel_.initialSolutionApplied();
}
template <class Context>
void source(RateVector& rate,
unsigned globalSpaceIdx,
unsigned timeIdx) const
@ -2104,6 +2103,9 @@ public:
return limitNextTimeStepSize_(newtonMethod.suggestTimeStepSize(simulator.timeStepSize()));
}
Scalar volume(unsigned dofIdx,unsigned /*timidx*/) const{
return this->simulator().model().dofTotalVolume(dofIdx);
}
/*!
* \brief Calculate the porosity multiplier due to water induced rock compaction.
*
@ -2152,34 +2154,35 @@ public:
template <class LhsEval>
LhsEval rockCompTransMultiplier(const IntensiveQuantities& intQuants, unsigned elementIdx) const
{
if (this->rockCompTransMult_.empty() && this->rockCompTransMultWc_.empty())
return 1.0;
return 1.0;
// if (this->rockCompTransMult_.empty() && this->rockCompTransMultWc_.empty())
// return 1.0;
unsigned tableIdx = 0;
if (!this->rockTableIdx_.empty())
tableIdx = this->rockTableIdx_[elementIdx];
// unsigned tableIdx = 0;
// if (!this->rockTableIdx_.empty())
// tableIdx = this->rockTableIdx_[elementIdx];
const auto& fs = intQuants.fluidState();
LhsEval effectiveOilPressure = decay<LhsEval>(fs.pressure(oilPhaseIdx));
// const auto& fs = intQuants.fluidState();
// LhsEval effectiveOilPressure = decay<LhsEval>(fs.pressure(oilPhaseIdx));
if (!this->minOilPressure_.empty())
// The pore space change is irreversible
effectiveOilPressure =
min(decay<LhsEval>(fs.pressure(oilPhaseIdx)),
this->minOilPressure_[elementIdx]);
// if (!this->minOilPressure_.empty())
// // The pore space change is irreversible
// effectiveOilPressure =
// min(decay<LhsEval>(fs.pressure(oilPhaseIdx)),
// this->minOilPressure_[elementIdx]);
if (!this->overburdenPressure_.empty())
effectiveOilPressure -= this->overburdenPressure_[elementIdx];
// if (!this->overburdenPressure_.empty())
// effectiveOilPressure -= this->overburdenPressure_[elementIdx];
if (!this->rockCompTransMult_.empty())
return this->rockCompTransMult_[tableIdx].eval(effectiveOilPressure, /*extrapolation=*/true);
// if (!this->rockCompTransMult_.empty())
// return this->rockCompTransMult_[tableIdx].eval(effectiveOilPressure, /*extrapolation=*/true);
// water compaction
assert(!this->rockCompTransMultWc_.empty());
LhsEval SwMax = max(decay<LhsEval>(fs.saturation(waterPhaseIdx)), this->maxWaterSaturation_[elementIdx]);
LhsEval SwDeltaMax = SwMax - initialFluidStates_[elementIdx].saturation(waterPhaseIdx);
// // water compaction
// assert(!this->rockCompTransMultWc_.empty());
// LhsEval SwMax = max(decay<LhsEval>(fs.saturation(waterPhaseIdx)), this->maxWaterSaturation_[elementIdx]);
// LhsEval SwDeltaMax = SwMax - initialFluidStates_[elementIdx].saturation(waterPhaseIdx);
return this->rockCompTransMultWc_[tableIdx].eval(effectiveOilPressure, SwDeltaMax, /*extrapolation=*/true);
// return this->rockCompTransMultWc_[tableIdx].eval(effectiveOilPressure, SwDeltaMax, /*extrapolation=*/true);
}
private:

3
flow/flow_blackoil_tpfa.cpp
View File

@ -24,6 +24,7 @@
#include <opm/models/discretization/common/fvbaselocalresidualtpfa.hh>
#include <opm/models/discretization/common/fvbaseadlocallinearizertpfa.hh>
#include <opm/models/discretization/common/smallelementcontext.hh>
#include <opm/models/discretization/common/linearizertpfa.hh>
#include <ebos/eclfluxmoduletpfa.hh>
#include <ebos/eclproblemtpfa.hh>
namespace Opm {
@ -48,6 +49,8 @@ namespace Opm {
namespace Opm {
namespace Properties {
template<class TypeTag>
struct Linearizer<TypeTag, TTag::EclFlowProblemTPFA> { using type = LinearizerTPFA<TypeTag>; };
template<class TypeTag>
struct LocalLinearizerSplice<TypeTag, TTag::EclFlowProblemTPFA> {
using type = TTag::AutoDiffLocalLinearizerTPFA;