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

extending drsdtcon with regimes, and option for GAS/WATER

Browse Source
This commit is contained in:
Trine Mykkeltvedt
2024-06-07 07:35:16 +02:00
committed by Tor Harald Sandve
parent ad8dd1e4b8
commit 2b5825e0e5
6 changed files with 340 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
opm/models/blackoil/blackoillocalresidualtpfa.hh
View File

@@ -36,6 +36,7 @@
#include "blackoilfoammodules.hh"
#include "blackoilbrinemodules.hh"
#include "blackoildiffusionmodule.hh"
#include "blackoilconvectivemixingmodule.hh"
#include "blackoildispersionmodule.hh"
#include "blackoilmicpmodules.hh"
#include <opm/material/fluidstates/BlackOilFluidState.hpp>
@@ -103,6 +104,9 @@ class BlackOilLocalResidualTPFA : public GetPropType<TypeTag, Properties::DiscLo
using FoamModule = BlackOilFoamModule<TypeTag>;
using BrineModule = BlackOilBrineModule<TypeTag>;
using DiffusionModule = BlackOilDiffusionModule<TypeTag, enableDiffusion>;
using ConvectiveMixingModule = BlackOilConvectiveMixingModule<TypeTag>;
using ConvectiveMixingModuleParam = typename ConvectiveMixingModule::ConvectiveMixingModuleParam;
using DispersionModule = BlackOilDispersionModule<TypeTag, enableDispersion>;
using MICPModule = BlackOilMICPModule<TypeTag>;
@@ -124,6 +128,11 @@ public:
double diffusivity;
double dispersivity;
};
struct ModuleParams {
ConvectiveMixingModuleParam convectiveMixingModuleParam;
};
/*!
* \copydoc FvBaseLocalResidual::computeStorage
*/
@@ -227,7 +236,8 @@ public:
const unsigned globalIndexEx,
const IntensiveQuantities& intQuantsIn,
const IntensiveQuantities& intQuantsEx,
const ResidualNBInfo& nbInfo)
const ResidualNBInfo& nbInfo,
const ModuleParams& moduleParams)
{
OPM_TIMEBLOCK_LOCAL(computeFlux);
flux = 0.0;
@@ -239,7 +249,8 @@ public:
intQuantsEx,
globalIndexIn,
globalIndexEx,
nbInfo);
nbInfo,
moduleParams);
}
// This function demonstrates compatibility with the ElementContext-based interface.
@@ -306,7 +317,8 @@ public:
intQuantsEx,
globalIndexIn,
globalIndexEx,
res_nbinfo);
res_nbinfo,
problem.moduleParams());
}
static void calculateFluxes_(RateVector& flux,
@@ -315,7 +327,8 @@ public:
const IntensiveQuantities& intQuantsEx,
const unsigned& globalIndexIn,
const unsigned& globalIndexEx,
const ResidualNBInfo& nbInfo)
const ResidualNBInfo& nbInfo,
const ModuleParams& moduleParams)
{
OPM_TIMEBLOCK_LOCAL(calculateFluxes);
const Scalar Vin = nbInfo.Vin;
@@ -395,7 +408,7 @@ public:
}
}
}
}
// deal with solvents (if present)
static_assert(!enableSolvent, "Relevant computeFlux() method must be implemented for this module before enabling.");
@@ -443,6 +456,18 @@ public:
static_assert(!enableBrine, "Relevant computeFlux() method must be implemented for this module before enabling.");
// BrineModule::computeFlux(flux, elemCtx, scvfIdx, timeIdx);
// deal with convective mixing
ConvectiveMixingModule::addConvectiveMixingFlux(flux,
intQuantsIn,
intQuantsEx,
globalIndexIn,
globalIndexEx,
nbInfo.dZg,
nbInfo.trans,
nbInfo.faceArea,
moduleParams.convectiveMixingModuleParam);
// deal with diffusion (if present). opm-models expects per area flux (added in the tmpdiffusivity).
if constexpr(enableDiffusion){
typename DiffusionModule::ExtensiveQuantities::EvaluationArray effectiveDiffusionCoefficient;
@@ -617,7 +642,7 @@ public:
RateVector& bdyFlux,
const BoundaryConditionData& bdyInfo,
const IntensiveQuantities& insideIntQuants,
[[maybe_unused]] unsigned globalSpaceIdx)
unsigned globalSpaceIdx)
{
OPM_TIMEBLOCK_LOCAL(computeBoundaryThermal);
// only heat is allowed to flow through this boundary