OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-24 22:57:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add subsystem argument to detail profiling macros.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen committed 2025-09-22 11:02:50 +02:00
1 parent 6e9d33abc4
commit 5b31ef1edd
11 files changed
+53 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
+12 -12
View File
@@ -175,7 +175,7 @@ public:
{
this->extrusionFactor_ = 1.0;// to avoid fixing parent update
OPM_TIMEBLOCK_LOCAL(UpdateIntensiveQuantities);
OPM_TIMEBLOCK_LOCAL(UpdateIntensiveQuantities, Subsystem::PvtProps | Subsystem::SatProps);
Scalar RvMax = FluidSystem::enableVaporizedOil()
? problem.maxOilVaporizationFactor(timeIdx, globalSpaceIdx)
: 0.0;
@@ -269,7 +269,7 @@ public:
fluidState_.setRs(Rs);
} else {
if (FluidSystem::enableDissolvedGas()) { // Add So > 0? i.e. if only water set rs = 0)
OPM_TIMEBLOCK_LOCAL(UpdateSaturatedRs);
OPM_TIMEBLOCK_LOCAL(UpdateSaturatedRs, Subsystem::PvtProps);
const Evaluation& RsSat = enableExtbo ? asImp_().rs() :
FluidSystem::saturatedDissolutionFactor(fluidState_,
oilPhaseIdx,
@@ -287,7 +287,7 @@ public:
fluidState_.setRv(Rv);
} else {
if (FluidSystem::enableVaporizedOil() ) { // Add Sg > 0? i.e. if only water set rv = 0)
OPM_TIMEBLOCK_LOCAL(UpdateSaturatedRv);
OPM_TIMEBLOCK_LOCAL(UpdateSaturatedRv, Subsystem::PvtProps);
//NB! should save the indexing for later evalustion
const Evaluation& RvSat = enableExtbo ? asImp_().rv() :
FluidSystem::saturatedDissolutionFactor(fluidState_,
@@ -308,7 +308,7 @@ public:
} else {
//NB! should save the indexing for later evaluation
if (FluidSystem::enableVaporizedWater()) { // Add Sg > 0? i.e. if only water set rv = 0)
OPM_TIMEBLOCK_LOCAL(UpdateSaturatedRv);
OPM_TIMEBLOCK_LOCAL(UpdateSaturatedRv, Subsystem::PvtProps);
const Evaluation& RvwSat = FluidSystem::saturatedVaporizationFactor(fluidState_,
gasPhaseIdx,
pvtRegionIdx);
@@ -328,14 +328,14 @@ public:
// calculate the phase densities
Evaluation rho;
if (FluidSystem::phaseIsActive(waterPhaseIdx)) {
OPM_TIMEBLOCK_LOCAL(UpdateWDensity);
OPM_TIMEBLOCK_LOCAL(UpdateWDensity, Subsystem::PvtProps);
rho = fluidState_.invB(waterPhaseIdx);
rho *= FluidSystem::referenceDensity(waterPhaseIdx, pvtRegionIdx);
fluidState_.setDensity(waterPhaseIdx, rho);
}
if (FluidSystem::phaseIsActive(gasPhaseIdx)) {
OPM_TIMEBLOCK_LOCAL(UpdateGDensity);
OPM_TIMEBLOCK_LOCAL(UpdateGDensity, Subsystem::PvtProps);
rho = fluidState_.invB(gasPhaseIdx);
rho *= FluidSystem::referenceDensity(gasPhaseIdx, pvtRegionIdx);
if (FluidSystem::enableVaporizedOil()) {
@@ -352,7 +352,7 @@ public:
}
if (FluidSystem::phaseIsActive(oilPhaseIdx)) {
OPM_TIMEBLOCK_LOCAL(UpdateODensity);
OPM_TIMEBLOCK_LOCAL(UpdateODensity, Subsystem::PvtProps);
rho = fluidState_.invB(oilPhaseIdx);
rho *= FluidSystem::referenceDensity(oilPhaseIdx, pvtRegionIdx);
if (FluidSystem::enableDissolvedGas()) {
@@ -370,7 +370,7 @@ public:
// rock...
Scalar rockCompressibility = problem.rockCompressibility(globalSpaceIdx);
if (rockCompressibility > 0.0) {
OPM_TIMEBLOCK_LOCAL(UpdateRockCompressibility);
OPM_TIMEBLOCK_LOCAL(UpdateRockCompressibility, Subsystem::PvtProps);
Scalar rockRefPressure = problem.rockReferencePressure(globalSpaceIdx);
Evaluation x;
if (FluidSystem::phaseIsActive(oilPhaseIdx)) {
@@ -444,14 +444,14 @@ public:
void computeInverseFormationVolumeFactorAndViscosity(FluidState& fluidState,
unsigned phaseIdx,
unsigned pvtRegionIdx) {
OPM_TIMEBLOCK_LOCAL(UpdateInverseFormationFactorAndViscosity);
OPM_TIMEBLOCK_LOCAL(UpdateInverseFormationFactorAndViscosity, Subsystem::PvtProps);
{
OPM_TIMEBLOCK_LOCAL(UpdateFormationFactor);
OPM_TIMEBLOCK_LOCAL(UpdateFormationFactor, Subsystem::PvtProps);
const auto& b = FluidSystem::inverseFormationVolumeFactor(fluidState, phaseIdx, pvtRegionIdx);
fluidState_.setInvB(phaseIdx, b);
}
{
OPM_TIMEBLOCK_LOCAL(UpdateViscosity);
OPM_TIMEBLOCK_LOCAL(UpdateViscosity, Subsystem::PvtProps);
typename FluidSystem::template ParameterCache<Evaluation> paramCache;
paramCache.setRegionIndex(pvtRegionIdx);
paramCache.updateAll(fluidState_);
@@ -466,7 +466,7 @@ public:
const Problem& problem,
const FluidState& fluidState,
unsigned globalSpaceIdx){
OPM_TIMEBLOCK_LOCAL(UpdateRelperm);
OPM_TIMEBLOCK_LOCAL(UpdateRelperm, Subsystem::SatProps);
const auto& materialParams = problem.materialLawParams(globalSpaceIdx);
MaterialLaw::capillaryPressures(pC, materialParams, fluidState_);
problem.updateRelperms(mobility, dirMob_, fluidState, globalSpaceIdx);
flowexperimental/FIBlackOilModelNoCache.hpp
+1 -1
View File
@@ -18,7 +18,7 @@ public:
IntensiveQuantities intensiveQuantities(unsigned globalIdx, unsigned timeIdx) const
{
OPM_TIMEBLOCK_LOCAL(intensiveQuantitiesNoCache);
OPM_TIMEBLOCK_LOCAL(intensiveQuantitiesNoCache, Subsystem::PvtProps | Subsystem::SatProps);
const auto& primaryVar = this->solution(timeIdx)[globalIdx];
const auto& problem = this->simulator_.problem();
if (!(this->enableIntensiveQuantityCache_) ||
opm/models/blackoil/blackoilintensivequantities.hh
+2 -1
View File
@@ -453,6 +453,7 @@ public:
void updateMobilityAndInvB()
{
OPM_TIMEBLOCK_LOCAL(updateMobilityAndInvB, Subsystem::PvtProps);
const unsigned pvtRegionIdx = fluidState_.pvtRegionIndex();
// compute the phase densities and transform the phase permeabilities into mobilities
@@ -706,7 +707,7 @@ public:
template <class ...Args>
void updateCommonPart(const Problem& problem, const PrimaryVariables& priVars, const unsigned globalSpaceIdx, const unsigned timeIdx)
{
OPM_TIMEBLOCK_LOCAL(blackoilIntensiveQuanititiesUpdate);
OPM_TIMEBLOCK_LOCAL(blackoilIntensiveQuanititiesUpdate, Subsystem::SatProps | Subsystem::PvtProps);
const auto& linearizationType = problem.model().linearizer().getLinearizationType();
const unsigned pvtRegionIdx = priVars.pvtRegionIndex();
opm/models/blackoil/blackoillocalresidualtpfa.hh
+8 -8
View File
@@ -162,7 +162,7 @@ public:
static void computeStorage(Dune::FieldVector<LhsEval, numEq>& storage,
const IntensiveQuantities& intQuants)
{
OPM_TIMEBLOCK_LOCAL(computeStorage);
OPM_TIMEBLOCK_LOCAL(computeStorage, Subsystem::Assembly);
// retrieve the intensive quantities for the SCV at the specified point in time
const auto& fs = intQuants.fluidState();
storage = 0.0;
@@ -251,7 +251,7 @@ public:
const ResidualNBInfo& nbInfo,
const ModuleParams& moduleParams)
{
OPM_TIMEBLOCK_LOCAL(computeFlux);
OPM_TIMEBLOCK_LOCAL(computeFlux, Subsystem::Assembly);
flux = 0.0;
darcy = 0.0;
@@ -273,7 +273,7 @@ public:
unsigned scvfIdx,
unsigned timeIdx)
{
OPM_TIMEBLOCK_LOCAL(computeFlux);
OPM_TIMEBLOCK_LOCAL(computeFlux, Subsystem::Assembly);
assert(timeIdx == 0);
flux = 0.0;
@@ -345,7 +345,7 @@ public:
const ResidualNBInfo& nbInfo,
const ModuleParams& moduleParams)
{
OPM_TIMEBLOCK_LOCAL(calculateFluxes);
OPM_TIMEBLOCK_LOCAL(calculateFluxes, Subsystem::Assembly);
const Scalar Vin = nbInfo.Vin;
const Scalar Vex = nbInfo.Vex;
const Scalar distZg = nbInfo.dZg;
@@ -570,7 +570,7 @@ public:
const IntensiveQuantities& insideIntQuants,
unsigned globalSpaceIdx)
{
OPM_TIMEBLOCK_LOCAL(computeBoundaryFluxFree);
OPM_TIMEBLOCK_LOCAL(computeBoundaryFluxFree, Subsystem::Assembly);
std::array<short, numPhases> upIdx;
std::array<short, numPhases> dnIdx;
std::array<Evaluation, numPhases> volumeFlux;
@@ -679,7 +679,7 @@ public:
const IntensiveQuantities& insideIntQuants,
[[maybe_unused]] unsigned globalSpaceIdx)
{
OPM_TIMEBLOCK_LOCAL(computeBoundaryThermal);
OPM_TIMEBLOCK_LOCAL(computeBoundaryThermal, Subsystem::Assembly);
// only heat is allowed to flow through this boundary
bdyFlux = 0.0;
@@ -714,7 +714,7 @@ public:
unsigned globalSpaceIdex,
unsigned timeIdx)
{
OPM_TIMEBLOCK_LOCAL(computeSource);
OPM_TIMEBLOCK_LOCAL(computeSource, Subsystem::Assembly);
// retrieve the source term intrinsic to the problem
problem.source(source, globalSpaceIdex, timeIdx);
@@ -753,7 +753,7 @@ public:
unsigned dofIdx,
unsigned timeIdx) const
{
OPM_TIMEBLOCK_LOCAL(computeSource);
OPM_TIMEBLOCK_LOCAL(computeSource, Subsystem::Assembly);
// retrieve the source term intrinsic to the problem
elemCtx.problem().source(source, elemCtx, dofIdx, timeIdx);
opm/models/discretization/common/tpfalinearizer.hh
+8 -8
View File
@@ -658,17 +658,17 @@ public:
#pragma omp parallel for
#endif
for (unsigned globI = 0; globI < numCells; ++globI) {
OPM_TIMEBLOCK_LOCAL(linearizationForEachCell);
OPM_TIMEBLOCK_LOCAL(linearizationForEachCell, Subsystem::Assembly);
const auto& nbInfos = neighborInfo_[globI];
ADVectorBlock adres(0.0);
ADVectorBlock darcyFlux(0.0);
const IntensiveQuantities& intQuantsIn = model_().intensiveQuantities(globI, /*timeIdx*/ 0);
// Flux term.
{
OPM_TIMEBLOCK_LOCAL(fluxCalculationForEachCell);
OPM_TIMEBLOCK_LOCAL(fluxCalculationForEachCell, Subsystem::Assembly);
short loc = 0;
for (const auto& nbInfo : nbInfos) {
OPM_TIMEBLOCK_LOCAL(fluxCalculationForEachFace);
OPM_TIMEBLOCK_LOCAL(fluxCalculationForEachFace, Subsystem::Assembly);
const unsigned globJ = nbInfo.neighbor;
assert(globJ != globI);
adres = 0.0;
@@ -743,7 +743,7 @@ private:
#pragma omp parallel for
#endif
for (unsigned ii = 0; ii < numCells; ++ii) {
OPM_TIMEBLOCK_LOCAL(linearizationForEachCell);
OPM_TIMEBLOCK_LOCAL(linearizationForEachCell, Subsystem::Assembly);
const unsigned globI = domain.cells[ii];
const auto& nbInfos = neighborInfo_[globI];
VectorBlock res(0.0);
@@ -754,10 +754,10 @@ private:
// Flux term.
{
OPM_TIMEBLOCK_LOCAL(fluxCalculationForEachCell);
OPM_TIMEBLOCK_LOCAL(fluxCalculationForEachCell, Subsystem::Assembly);
short loc = 0;
for (const auto& nbInfo : nbInfos) {
OPM_TIMEBLOCK_LOCAL(fluxCalculationForEachFace);
OPM_TIMEBLOCK_LOCAL(fluxCalculationForEachFace, Subsystem::Assembly);
const unsigned globJ = nbInfo.neighbor;
assert(globJ != globI);
res = 0.0;
@@ -790,7 +790,7 @@ private:
const Scalar storefac = volume / dt;
adres = 0.0;
{
OPM_TIMEBLOCK_LOCAL(computeStorage);
OPM_TIMEBLOCK_LOCAL(computeStorage, Subsystem::Assembly);
LocalResidual::computeStorage(adres, intQuantsIn);
}
setResAndJacobi(res, bMat, adres);
@@ -825,7 +825,7 @@ private:
res -= model_().cachedStorage(globI, 1);
}
else {
OPM_TIMEBLOCK_LOCAL(computeStorage0);
OPM_TIMEBLOCK_LOCAL(computeStorage0, Subsystem::Assembly);
Dune::FieldVector<Scalar, numEq> tmp;
const IntensiveQuantities intQuantOld = model_().intensiveQuantities(globI, 1);
LocalResidual::computeStorage(tmp, intQuantOld);
opm/simulators/flow/FlowProblem.hpp
+10 -10
View File
@@ -790,7 +790,7 @@ public:
unsigned globalSpaceIdx) const
{
using ContainerT = std::array<Evaluation, numPhases>;
OPM_TIMEBLOCK_LOCAL(updateRelperms);
OPM_TIMEBLOCK_LOCAL(updateRelperms, Subsystem::SatProps);
{
// calculate relative permeabilities. note that we store the result into the
// mobility_ class attribute. the division by the phase viscosity happens later.
@@ -982,7 +982,7 @@ public:
unsigned globalDofIdx,
unsigned timeIdx) const
{
OPM_TIMEBLOCK_LOCAL(eclProblemSource);
OPM_TIMEBLOCK_LOCAL(eclProblemSource, Subsystem::Assembly);
rate = 0.0;
// Add well contribution to source here.
@@ -1060,7 +1060,7 @@ public:
template <class LhsEval>
LhsEval rockCompPoroMultiplier(const IntensiveQuantities& intQuants, unsigned elementIdx) const
{
OPM_TIMEBLOCK_LOCAL(rockCompPoroMultiplier);
OPM_TIMEBLOCK_LOCAL(rockCompPoroMultiplier, Subsystem::PvtProps);
if (this->rockCompPoroMult_.empty() && this->rockCompPoroMultWc_.empty())
return 1.0;
@@ -1116,7 +1116,7 @@ public:
template <class LhsEval>
LhsEval wellTransMultiplier(const IntensiveQuantities& intQuants, unsigned elementIdx) const
{
OPM_TIMEBLOCK_LOCAL(wellTransMultiplier);
OPM_TIMEBLOCK_LOCAL(wellTransMultiplier, Subsystem::Wells);
const bool implicit = !this->explicitRockCompaction_;
double trans_mult = implicit ? this->simulator().problem().template computeRockCompTransMultiplier_<double>(intQuants, elementIdx)
@@ -1128,7 +1128,7 @@ public:
std::pair<BCType, RateVector> boundaryCondition(const unsigned int globalSpaceIdx, const int directionId) const
{
OPM_TIMEBLOCK_LOCAL(boundaryCondition);
OPM_TIMEBLOCK_LOCAL(boundaryCondition, Subsystem::Assembly);
if (!nonTrivialBoundaryConditions_) {
return { BCType::NONE, RateVector(0.0) };
}
@@ -1239,7 +1239,7 @@ protected:
bool updateMaxOilSaturation_(unsigned compressedDofIdx, const IntensiveQuantities& iq)
{
OPM_TIMEBLOCK_LOCAL(updateMaxOilSaturation);
OPM_TIMEBLOCK_LOCAL(updateMaxOilSaturation, Subsystem::SatProps);
const auto& fs = iq.fluidState();
const Scalar So = decay<Scalar>(fs.saturation(refPressurePhaseIdx_()));
auto& mos = this->maxOilSaturation_;
@@ -1270,7 +1270,7 @@ protected:
bool updateMaxWaterSaturation_(unsigned compressedDofIdx, const IntensiveQuantities& iq)
{
OPM_TIMEBLOCK_LOCAL(updateMaxWaterSaturation);
OPM_TIMEBLOCK_LOCAL(updateMaxWaterSaturation, Subsystem::SatProps);
const auto& fs = iq.fluidState();
const Scalar Sw = decay<Scalar>(fs.saturation(waterPhaseIdx));
auto& mow = this->maxWaterSaturation_;
@@ -1298,7 +1298,7 @@ protected:
}
bool updateMinPressure_(unsigned compressedDofIdx, const IntensiveQuantities& iq){
OPM_TIMEBLOCK_LOCAL(updateMinPressure);
OPM_TIMEBLOCK_LOCAL(updateMinPressure, Subsystem::PvtProps);
const auto& fs = iq.fluidState();
const Scalar min_pressure = getValue(fs.pressure(refPressurePhaseIdx_()));
auto& min_pressures = this->minRefPressure_;
@@ -1461,7 +1461,7 @@ protected:
bool updateHysteresis_(unsigned compressedDofIdx, const IntensiveQuantities& iq)
{
OPM_TIMEBLOCK_LOCAL(updateHysteresis_);
OPM_TIMEBLOCK_LOCAL(updateHysteresis_, Subsystem::SatProps);
materialLawManager_->updateHysteresis(iq.fluidState(), compressedDofIdx);
//TODO change materials to give a bool
return true;
@@ -1638,7 +1638,7 @@ protected:
template <class LhsEval>
LhsEval computeRockCompTransMultiplier_(const IntensiveQuantities& intQuants, unsigned elementIdx) const
{
OPM_TIMEBLOCK_LOCAL(computeRockCompTransMultiplier);
OPM_TIMEBLOCK_LOCAL(computeRockCompTransMultiplier, Subsystem::PvtProps);
if (this->rockCompTransMult_.empty() && this->rockCompTransMultWc_.empty())
return 1.0;
opm/simulators/flow/FlowProblemBlackoil.hpp
+3 -3
View File
@@ -702,7 +702,7 @@ public:
template <class LhsEval>
LhsEval permFactTransMultiplier(const IntensiveQuantities& intQuants, unsigned elementIdx) const
{
OPM_TIMEBLOCK_LOCAL(permFactTransMultiplier);
OPM_TIMEBLOCK_LOCAL(permFactTransMultiplier, Subsystem::PvtProps);
if constexpr (enableSaltPrecipitation) {
const auto& fs = intQuants.fluidState();
unsigned tableIdx = this->simulator().problem().satnumRegionIndex(elementIdx);
@@ -740,7 +740,7 @@ public:
InitialFluidState boundaryFluidState(unsigned globalDofIdx, const int directionId) const
{
OPM_TIMEBLOCK_LOCAL(boundaryFluidState);
OPM_TIMEBLOCK_LOCAL(boundaryFluidState, Subsystem::Assembly);
const auto& bcprop = this->simulator().vanguard().schedule()[this->episodeIndex()].bcprop;
if (bcprop.size() > 0) {
FaceDir::DirEnum dir = FaceDir::FromIntersectionIndex(directionId);
@@ -965,7 +965,7 @@ public:
unsigned spaceIdx,
unsigned timeIdx) const
{
OPM_TIMEBLOCK_LOCAL(eclProblemBoundary);
OPM_TIMEBLOCK_LOCAL(eclProblemBoundary, Subsystem::Assembly);
if (!context.intersection(spaceIdx).boundary())
return;
opm/simulators/flow/FlowProblemComp.hpp
+1 -1
View File
@@ -307,7 +307,7 @@ public:
unsigned spaceIdx,
unsigned /* timeIdx */) const
{
OPM_TIMEBLOCK_LOCAL(eclProblemBoundary);
OPM_TIMEBLOCK_LOCAL(eclProblemBoundary, Subsystem::Assembly);
if (!context.intersection(spaceIdx).boundary())
return;
opm/simulators/flow/OutputBlackoilModule.hpp
+4 -4
View File
@@ -236,7 +236,7 @@ public:
*/
void processElement(const ElementContext& elemCtx)
{
OPM_TIMEBLOCK_LOCAL(processElement);
OPM_TIMEBLOCK_LOCAL(processElement, Subsystem::Output);
if (!std::is_same<Discretization, EcfvDiscretization<TypeTag>>::value) {
return;
}
@@ -282,7 +282,7 @@ public:
void processElementBlockData(const ElementContext& elemCtx)
{
OPM_TIMEBLOCK_LOCAL(processElementBlockData);
OPM_TIMEBLOCK_LOCAL(processElementBlockData, Subsystem::Output);
if (!std::is_same<Discretization, EcfvDiscretization<TypeTag>>::value) {
return;
}
@@ -445,7 +445,7 @@ public:
ActiveIndex&& activeIndex,
CartesianIndex&& cartesianIndex)
{
OPM_TIMEBLOCK_LOCAL(processFluxes);
OPM_TIMEBLOCK_LOCAL(processFluxes, Subsystem::Output);
const auto identifyCell = [&activeIndex, &cartesianIndex](const Element& elem)
-> InterRegFlowMap::Cell
{
@@ -676,7 +676,7 @@ private:
const IntensiveQuantities& intQuants,
const double totVolume)
{
OPM_TIMEBLOCK_LOCAL(updateFluidInPlace);
OPM_TIMEBLOCK_LOCAL(updateFluidInPlace, Subsystem::Output);
this->updateTotalVolumesAndPressures_(globalDofIdx, intQuants, totVolume);
opm/simulators/flow/OutputCompositionalModule.hpp
+3 -3
View File
@@ -247,7 +247,7 @@ public:
*/
void processElement(const ElementContext& elemCtx)
{
OPM_TIMEBLOCK_LOCAL(processElement);
OPM_TIMEBLOCK_LOCAL(processElement, Subsystem::Output);
if (!std::is_same<Discretization, EcfvDiscretization<TypeTag>>::value) {
return;
}
@@ -272,14 +272,14 @@ public:
void processElementFlows(const ElementContext& /* elemCtx */)
{
OPM_TIMEBLOCK_LOCAL(processElementBlockData);
OPM_TIMEBLOCK_LOCAL(processElementBlockData, Subsystem::Output);
if (!std::is_same_v<Discretization, EcfvDiscretization<TypeTag>>)
return;
}
void processElementBlockData(const ElementContext& /* elemCtx */)
{
OPM_TIMEBLOCK_LOCAL(processElementBlockData);
OPM_TIMEBLOCK_LOCAL(processElementBlockData, Subsystem::Output);
if (!std::is_same<Discretization, EcfvDiscretization<TypeTag>>::value)
return;
}
opm/simulators/wells/WellInterface_impl.hpp
+1 -1
View File
@@ -1714,7 +1714,7 @@ namespace Opm
const Scalar trans_mult,
const SingleWellStateType& ws) const
{
OPM_TIMEFUNCTION_LOCAL();
OPM_TIMEFUNCTION_LOCAL(Subsystem::Wells);
// Add a Forchheimer term to the gas phase CTF if the run uses
// either of the WDFAC or the WDFACCOR keywords.
if (static_cast<std::size_t>(perf) >= this->well_cells_.size()) {