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

restructuring to be able to call without local indices

Browse Source
This commit is contained in:
hnil 2022-06-17 11:15:15 +02:00 committed by Atgeirr Flø Rasmussen
parent d53b6ad9fa
commit 8f5e0940fe
5 changed files with 171 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
ebos/eclfluxmoduletpfa.hh
View File

@ -219,7 +219,6 @@ public:
EvalType& pressureDifference, EvalType& pressureDifference,
const IntensiveQuantities& intQuantsIn, const IntensiveQuantities& intQuantsIn,
const IntensiveQuantities& intQuantsEx, const IntensiveQuantities& intQuantsEx,
const unsigned scvfIdx,
const unsigned timeIdx, const unsigned timeIdx,
const unsigned phaseIdx, const unsigned phaseIdx,
const unsigned interiorDofIdx, const unsigned interiorDofIdx,
@ -315,6 +314,106 @@ public:
} }
} }
// static void volumeAndPhasePressureDifferences(short (&upIdx)[numPhases] ,
// Evaluation (&volumeFlux)[numPhases],
// Evaluation (&pressureDifferences)[numPhases],
// const Problem& problem,
// const unsigned globalIndexIn,
// const unsinged globalIndexOut,
// const IntensiveQuantities& intQuantsIn,
// const IntensiveQuantities& intQuantsIn,
// const unsinged timeIdx)
// {
// //Valgrind::SetUndefined(*this);
// //const auto& problem = elemCtx.problem();
// //const auto& stencil = elemCtx.stencil(timeIdx);
// //const auto& scvf = stencil.interiorFace(scvfIdx);
// //unsigned interiorDofIdx = scvf.interiorIndex();
// //unsigned exteriorDofIdx = scvf.exteriorIndex();
// //const auto& globalIndexIn = stencil.globalSpaceIndex(interiorDofIdx);
// //const auto& globalIndexEx = stencil.globalSpaceIndex(exteriorDofIdx);
// assert(interiorDofIdx != exteriorDofIdx);
// //unsigned I = stencil.globalSpaceIndex(interiorDofIdx_);
// //unsigned J = stencil.globalSpaceIndex(exteriorDofIdx_);
// Scalar Vin = model.dofTotalVolume(globalIndexIn, /*timeIdx=*/0);
// Scalar Vex = model.dofTotalVolume(globalIndexOut, /*timeIdx=*/0);
// Scalar trans = problem.transmissibility(globalIndexIn,globalIndexOut);
// Scalar faceArea = problem.area(globalIndexIn,globalIndexOut);
// Scalar thpres = problem.thresholdPressure(globalIndexIn, globalIndexEx);
// // estimate the gravity correction: for performance reasons we use a simplified
// // approach for this flux module that assumes that gravity is constant and always
// // acts into the downwards direction. (i.e., no centrifuge experiments, sorry.)
// constexpr Scalar g = 9.8;
// // this is quite hacky because the dune grid interface does not provide a
// // cellCenterDepth() method (so we ask the problem to provide it). The "good"
// // solution would be to take the Z coordinate of the element centroids, but since
// // ECL seems to like to be inconsistent on that front, it needs to be done like
// // here...
// Scalar zIn = problem.dofCenterDepth(globalIndexIn, timeIdx);
// Scalar zEx = problem.dofCenterDepth(globalIndexOut, timeIdx);
// // the distances from the DOF's depths. (i.e., the additional depth of the
// // exterior DOF)
// Scalar distZ = zIn - zEx;
// for (unsigned phaseIdx=0; phaseIdx < numPhases; phaseIdx++) {
// if (!FluidSystem::phaseIsActive(phaseIdx))
// continue;
// short dnIdx;
// calculatePhasePressureDiff_(upIdx[phaseIdx],
// dnIdx,
// pressureDifferences[phaseIdx],
// intQuantsIn,
// intQuantsEx,
// timeIdx,//input
// phaseIdx,//input
// interiorDofIdx,//input
// exteriorDofIdx,//intput
// Vin,
// Vex,
// globalIndexIn,
// globalIndexEx,
// distZ*g,
// thpres);
// if(pressureDifferences[phaseIdx] == 0){
// volumeFlux[phaseIdx] = 0.0;
// continue;
// }
// IntensiveQuantities up;
// unsigned globalIndex;
// if(upIdx[phaseIdx] == interiorDofIdx){
// up = intQuantsIn;
// globalIndex = globalIndexIn;
// }else{
// up = intQuantsEx;
// globalIndex = globalIndexEx;
// }
// // TODO: should the rock compaction transmissibility multiplier be upstreamed
// // or averaged? all fluids should see the same compaction?!
// //const auto& globalIndex = stencil.globalSpaceIndex(upstreamIdx);
// const Evaluation& transMult =
// problem.template rockCompTransMultiplier<Evaluation>(up, globalIndex);
// if (upIdx[phaseIdx] == interiorDofIdx)
// volumeFlux[phaseIdx] =
// pressureDifferences[phaseIdx]*up.mobility(phaseIdx)*transMult*(-trans/faceArea);
// else
// volumeFlux[phaseIdx] =
// pressureDifferences[phaseIdx]*(Toolbox::value(up.mobility(phaseIdx))*Toolbox::value(transMult)*(-trans/faceArea));
// }
// }
static void volumeAndPhasePressureDifferences(short (&upIdx)[numPhases] , static void volumeAndPhasePressureDifferences(short (&upIdx)[numPhases] ,
Evaluation (&volumeFlux)[numPhases], Evaluation (&volumeFlux)[numPhases],
Evaluation (&pressureDifferences)[numPhases], Evaluation (&pressureDifferences)[numPhases],
@ -326,17 +425,20 @@ public:
const auto& problem = elemCtx.problem(); const auto& problem = elemCtx.problem();
const auto& stencil = elemCtx.stencil(timeIdx); const auto& stencil = elemCtx.stencil(timeIdx);
const auto& scvf = stencil.interiorFace(scvfIdx); const auto& scvf = stencil.interiorFace(scvfIdx);
unsigned interiorDofIdx = scvf.interiorIndex(); unsigned interiorDofIdx = scvf.interiorIndex();
unsigned exteriorDofIdx = scvf.exteriorIndex(); unsigned exteriorDofIdx = scvf.exteriorIndex();
const auto& globalIndexIn = stencil.globalSpaceIndex(interiorDofIdx);
const auto& globalIndexEx = stencil.globalSpaceIndex(exteriorDofIdx);
assert(interiorDofIdx != exteriorDofIdx); assert(interiorDofIdx != exteriorDofIdx);
//unsigned I = stencil.globalSpaceIndex(interiorDofIdx_); //unsigned I = stencil.globalSpaceIndex(interiorDofIdx_);
//unsigned J = stencil.globalSpaceIndex(exteriorDofIdx_); //unsigned J = stencil.globalSpaceIndex(exteriorDofIdx_);
Scalar Vin = elemCtx.dofVolume(interiorDofIdx, /*timeIdx=*/0); Scalar Vin = elemCtx.dofVolume(interiorDofIdx, /*timeIdx=*/0);
Scalar Vex = elemCtx.dofVolume(exteriorDofIdx, /*timeIdx=*/0); Scalar Vex = elemCtx.dofVolume(exteriorDofIdx, /*timeIdx=*/0);
const auto& globalIndexIn = stencil.globalSpaceIndex(interiorDofIdx);
const auto& globalIndexEx = stencil.globalSpaceIndex(exteriorDofIdx);
Scalar trans = problem.transmissibility(elemCtx, interiorDofIdx, exteriorDofIdx); Scalar trans = problem.transmissibility(elemCtx, interiorDofIdx, exteriorDofIdx);
Scalar faceArea = scvf.area(); Scalar faceArea = scvf.area();
Scalar thpres = problem.thresholdPressure(globalIndexIn, globalIndexEx); Scalar thpres = problem.thresholdPressure(globalIndexIn, globalIndexEx);
@ -344,7 +446,7 @@ public:
// estimate the gravity correction: for performance reasons we use a simplified // estimate the gravity correction: for performance reasons we use a simplified
// approach for this flux module that assumes that gravity is constant and always // approach for this flux module that assumes that gravity is constant and always
// acts into the downwards direction. (i.e., no centrifuge experiments, sorry.) // acts into the downwards direction. (i.e., no centrifuge experiments, sorry.)
Scalar g = elemCtx.problem().gravity()[dimWorld - 1]; constexpr Scalar g = 9.8;
const auto& intQuantsIn = elemCtx.intensiveQuantities(interiorDofIdx, timeIdx); const auto& intQuantsIn = elemCtx.intensiveQuantities(interiorDofIdx, timeIdx);
const auto& intQuantsEx = elemCtx.intensiveQuantities(exteriorDofIdx, timeIdx); const auto& intQuantsEx = elemCtx.intensiveQuantities(exteriorDofIdx, timeIdx);
@ -370,7 +472,6 @@ public:
pressureDifferences[phaseIdx], pressureDifferences[phaseIdx],
intQuantsIn, intQuantsIn,
intQuantsEx, intQuantsEx,
scvfIdx,//input
timeIdx,//input timeIdx,//input
phaseIdx,//input phaseIdx,//input
interiorDofIdx,//input interiorDofIdx,//input
@ -465,7 +566,6 @@ protected:
pressureDifference_[phaseIdx], pressureDifference_[phaseIdx],
intQuantsIn, intQuantsIn,
intQuantsEx, intQuantsEx,
scvfIdx,//input
timeIdx,//input timeIdx,//input
phaseIdx,//input phaseIdx,//input
interiorDofIdx_,//input interiorDofIdx_,//input
@ -492,6 +592,7 @@ protected:
// TODO: should the rock compaction transmissibility multiplier be upstreamed // TODO: should the rock compaction transmissibility multiplier be upstreamed
// or averaged? all fluids should see the same compaction?! // or averaged? all fluids should see the same compaction?!
//const auto& globalIndex = stencil.globalSpaceIndex(upstreamIdx); //const auto& globalIndex = stencil.globalSpaceIndex(upstreamIdx);
//NB as long as this is upwinded it could be an intensive quantity
const Evaluation& transMult = const Evaluation& transMult =
problem.template rockCompTransMultiplier<Evaluation>(up, globalIndex); problem.template rockCompTransMultiplier<Evaluation>(up, globalIndex);

1
ebos/eclthresholdpressure.hh
View File

@ -170,7 +170,6 @@ private:
pressureDifference, pressureDifference,
intQuantsIn, intQuantsIn,
intQuantsEx, intQuantsEx,
scvfIdx,//input
/*timeIdx*/0,//input /*timeIdx*/0,//input
phaseIdx,//input phaseIdx,//input
i,//input i,//input

54
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@ -574,20 +574,54 @@ namespace Opm {
template<class IntensiveQuantity> template<class IntensiveQuantity>
void updateIntensiveQuantity(const Problem& /*problem*/, void updateIntensiveQuantity(const Problem& /*problem*/,
const SolutionVector& /*solution*/, SolutionVector& solution,
const BVector& dx,
const IntensiveQuantity*) const IntensiveQuantity*)
{ {
ebosSimulator_.model().newtonMethod().update_(/*nextSolution=*/solution,
/*curSolution=*/solution,
/*update=*/dx,
/*resid=*/dx); // the update routines of the black
// oil model do not care about the
// residual
ebosSimulator_.model().invalidateAndUpdateIntensiveQuantities(/*timeIdx=*/0); ebosSimulator_.model().invalidateAndUpdateIntensiveQuantities(/*timeIdx=*/0);
} }
void updateIntensiveQuantity(const Problem& problem, void updateIntensiveQuantity(const Problem& problem,
const SolutionVector& solution, SolutionVector& solution,
const BVector& dx,
const BlackOilIntensiveQuantitiesSimple<TypeTag>* /*intensive*/) const BlackOilIntensiveQuantitiesSimple<TypeTag>* /*intensive*/)
{ {
ebosSimulator_.model().invalidateAndUpdateIntensiveQuantitiesSimple(problem, auto& model = ebosSimulator_.model();
solution, auto& ebosNewtonMethod = model.newtonMethod();
/*timeIdx*/0); if(false){
if (!std::isfinite(dx.one_norm()))
throw NumericalIssue("Non-finite update!");
size_t numGridDof = model.numGridDof();
for (unsigned dofIdx = 0; dofIdx < numGridDof; ++dofIdx) {
ebosNewtonMethod.updatePrimaryVariables_(dofIdx,
solution[dofIdx],
solution[dofIdx],
dx[dofIdx],
dx[dofIdx]);
model.invalidateAndUpdateIntensiveSingleQuantitiesSimple(problem,
solution[dofIdx],
dofIdx,
/*timeIdx*/0);
}
}else{
ebosNewtonMethod.update_(/*nextSolution*/solution,
/*curSolution=*/solution,
/*update=*/dx,
/*resid=*/dx); // the update routines of the black
// oil model do not care about the
// residual
model.invalidateAndUpdateIntensiveQuantitiesSimple(problem,
solution,
/*timeIdx*/0);
}
} }
/// Apply an update to the primary variables. /// Apply an update to the primary variables.
@ -597,17 +631,11 @@ namespace Opm {
auto& ebosNewtonMethod = ebosSimulator_.model().newtonMethod(); auto& ebosNewtonMethod = ebosSimulator_.model().newtonMethod();
SolutionVector& solution = ebosSimulator_.model().solution(/*timeIdx=*/0); SolutionVector& solution = ebosSimulator_.model().solution(/*timeIdx=*/0);
ebosNewtonMethod.update_(/*nextSolution=*/solution,
/*curSolution=*/solution,
/*update=*/dx,
/*resid=*/dx); // the update routines of the black
// oil model do not care about the
// residual
// if the solution is updated, the intensive quantities need to be recalculated // if the solution is updated, the intensive quantities need to be recalculated
//ebosSimulator_.model().invalidateAndUpdateIntensiveQuantities(/*timeIdx=*/0); //ebosSimulator_.model().invalidateAndUpdateIntensiveQuantities(/*timeIdx=*/0);
IntensiveQuantities* dummy = NULL;//only for template spesialization IntensiveQuantities* dummy = NULL;//only for template spesialization
this->updateIntensiveQuantity(problem,solution, dummy); this->updateIntensiveQuantity(problem,solution, dx, dummy);
//ebosSimulator_.model().invalidateAndUpdateIntensiveQuantitiesSimple<IntensiveQuantities>(problem, //ebosSimulator_.model().invalidateAndUpdateIntensiveQuantitiesSimple<IntensiveQuantities>(problem,
//solution, //solution,
// /*timeIdx=*/0); // /*timeIdx=*/0);

6
opm/simulators/wells/BlackoilWellModel.hpp
View File

@ -210,7 +210,13 @@ namespace Opm {
{ {
endReportStep(); endReportStep();
} }
void computeTotalRatesForDof(RateVector& rate,
unsigned globalIdx,
unsigned timeIdx) const;
template <class Context> template <class Context>
void computeTotalRatesForDof(RateVector& rate, void computeTotalRatesForDof(RateVector& rate,
const Context& context, const Context& context,

16
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -499,7 +499,23 @@ namespace Opm {
this->computeWellTemperature(); this->computeWellTemperature();
} }
template<typename TypeTag>
void
BlackoilWellModel<TypeTag>::
computeTotalRatesForDof(RateVector& rate,
unsigned elemIdx,
unsigned timeIdx) const
{
rate = 0;
if (!is_cell_perforated_[elemIdx])
return;
for (const auto& well : well_container_)
well->addCellRates(rate, elemIdx);
}
template<typename TypeTag> template<typename TypeTag>
template <class Context> template <class Context>
void void