Commit Graph
17314 Commits
Author SHA1 Message Date
Kai Bao a9a0ae1eb0 Merge pull request #5234 from GitPaean/not_limiting_normal_segments
not using spres_lower_limit limit non-top segments
2024-03-04 23:28:47 +01:00
Bård Skaflestad 488da80228 Merge pull request #5241 from bska/datumrx-supported
Permit DATUMR and DATUMRX Keywords in Input File
2024-03-04 14:07:57 +01:00
Bård Skaflestad 553d3c811e Permit DATUMR and DATUMRX Keywords in Input File
Following PRs

  * OPM/opm-common#3958
  * OPM/opm-simulators#5240

these keywords are nominally supported, at least for the block
level summary keywords (BPPx).
2024-03-04 13:50:26 +01:00
Bård Skaflestad 58875a1483 Merge pull request #5224 from bska/fix-per-cell-fip-rst-output
Add Special Case Handling for Fluid-In-Place of Pure Phases
2024-03-04 12:01:14 +01:00
Bård Skaflestad 7d79a86ae4 Merge pull request #5240 from bska/depth-corr-press
Add Support for Calculating Block Level Depth Corrected Pressures
2024-03-04 10:12:12 +01:00
Kai Bao c61f0b104c outputting segments with pressure close to lower limit
if the well does not get converged.
2024-03-02 16:28:33 +01:00
Kai Bao f7ad5cb211 not using spres_lower_limit limit non-top segments
with multi-segments, the segment pressure can be lower than the bhp, so
it is not desirable to use spres_lower_limit to limit the segment
pressure. We only use spres_lower_limit to limit the bhp, which is still
valid until we begin using bhp limit lower than 1 bar.
2024-03-02 15:19:17 +01:00
Bård Skaflestad aa77c2ac41 Add Support for Calculating Block Level Depth Corrected Pressures
This commit calculates the block-level depth-corrected phase
pressures BPPO, BPPG, and BPPW.  We use the simulation
configuration's DatumDepth feature to extract the reference depths
for the FIPNUM region set per cell and accumulate average phase
densities per PVT regions using the RegionPhasePoreVolAverage
utility.  To that end, add a new optional<> data member of this type
to the generic output module and initialise this if the input model
requests such summary output.
2024-03-01 16:11:38 +01:00
Bård Skaflestad d4569dba7d Add Special Case Handling for Fluid-In-Place of Pure Phases
In particular, output the per-cell oil, gas, and water fluid in
place vectors using compatible array names and surface condition
unit conversion tags.

While here, also relax certain parallel and restart case regression
test tolerances to make the tests pass once we generate the arrays.
2024-03-01 11:40:36 +01:00
Atgeirr Flø Rasmussen c7e7204727 Merge pull request #5235 from akva2/fix_odr_violations_python
fixed: don't link python module to flow_libblackoil
2024-03-01 10:51:57 +01:00
Bård Skaflestad 56b492069b Merge pull request #5238 from akva2/fix_flows_regression
fixed: if we write the size as a size_t we better read it as a size_t
2024-03-01 09:52:13 +01:00
Arne Morten Kvarving a016407f81 fixed: if we write the size as a size_t we better read it as a size_t
fixes regression after 7dcc411397
2024-03-01 08:51:47 +01:00
Markus Blatt bb85fc9939 Merge pull request #5237 from akva2/timestepping_use_fmt
AdaptiveTimeStepping: use {fmt} to format messages
2024-02-29 14:25:26 +01:00
Arne Morten Kvarving def5c9cb24 AdaptiveTimeStepping: use {fmt} to format messages
std::to_string doesn't use generic format and thus small numbers
are truncated to 0.0000000
2024-02-29 11:58:26 +01:00
Arne Morten Kvarving f8b22631b0 fixed: don't link python module to flow_libblackoil
this leads to ODR violations which causes all sorts
of havoc. this was done to reuse a trivial method,
duplicate it in the python source instead.
2024-02-29 09:24:07 +01:00
Markus Blatt 5bafd76b94 Merge pull request #5230 from akva2/fractioncalculator_split
FractionCalculator: put in separate translation unit
2024-02-29 08:22:59 +01:00
Bård Skaflestad ee6083c358 Merge pull request #5231 from bska/phase-pv-region-average
Add Utility for Region-Based Phase-Filled Averages
2024-02-28 12:49:45 +01:00
Bård Skaflestad d1d22668ea Add Utility for Region-Based Phase-Filled Averages
The initial use case is calculating the phase-filled pore-volume
weighted average of the fluid mass densities per PVT region.  This
value goes into calculating depth-corrected per-cell phase pressure
values such as the BPPO and BPPG summary vectors.

This class manages a single linear array which separately tracks the
averages' numerators and denominators as running sums per region and
region set.  We pick this data structure to simplify the cross-rank
reduction needed in MPI parallel runs.  Client code is expected to
add individual per-cell and per-phase contributions using the
addCell() member function and then call the accumulateParallel()
member to affect the cross-rank reduction.  The averages will then
be available through the fieldValue() and value() member functions.

As a further view towards the initial use case, we track two
different types of average per phase--one for the phase-filled
volume and one for the pore-volume filled volume.  The latter is the
average we would get for the case of the phase saturation being one
throughout the region.  This alternative value is the fallback
option for the case of the phase saturation being identically zero
throughout the region.
2024-02-28 12:08:24 +01:00
Kai Bao 06dba324d2 Merge pull request #5221 from vkip/avoid_injector_alq_lookup
Avoid injector alq lookup
2024-02-28 11:40:27 +01:00
Arne Morten Kvarving 33dcc0bd50 FractionCalculator: put in separate translation unit 2024-02-27 13:00:23 +01:00
Arne Morten Kvarving 3087950c35 Merge pull request #5181 from akva2/move_gradient_calculator
move ebos/ecldummygradientcalculator.hh to opm/simulators/flow
2024-02-23 15:24:44 +01:00
Markus Blatt bc807a4fc4 Merge pull request #5201 from akva2/rename_typetag_entries
Drop Ecl from two typetag entries/cl-parameters
2024-02-23 11:29:33 +01:00
Arne Morten Kvarving 6b0dbfdf2d rename EclAquiferModel property to AquiferModel 2024-02-23 10:25:16 +01:00
Arne Morten Kvarving 991f89816e rename EclWellModel property to WellModel 2024-02-23 10:24:53 +01:00
Markus Blatt cc9d9bab41 Merge pull request #5193 from akva2/move_timestepping_params
move ebos/ecltimesteppingparams.hh to opm/simulators/timestepping
2024-02-23 10:13:24 +01:00
Markus Blatt 72d8abb837 Merge pull request #5209 from akva2/drop_ecl_typetags
Rename typetags - drop Ecl prefix
2024-02-23 10:01:26 +01:00
Markus Blatt b8bc29b544 Merge pull request #5223 from akva2/janitoring
Some janitoring
2024-02-23 09:53:07 +01:00
Arne Morten Kvarving f8e78e7731 rename TTag::EclFlowSolventFoamProblem to TTag::FlowSolventFoamProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving fa3bed7e96 rename TTag::EclFlowSolventProblem to TTag::FlowSolventProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 372c584c06 rename TTag::EclFlowPolymerProblem to TTag::FlowPolymerProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 41341a9753 rename TTag::EclFlowProblemWaterOnlyEnergy to TTag::FlowWaterOnlyEnergyProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving fc90700010 rename TTag::EclFlowProblemWaterOnly to TTag::FlowWaterOnlyProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving ac462ed09a rename TTag::EclFlowOilWaterPolymerInjectivityProblem to TTag::FlowOilWaterPolymerInjectivityProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 7d1e237ad3 rename TTag::EclFlowOilWaterPolymerProblem to TTag::FlowOilWaterPolymerProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving cc8dd22b9a rename TTag::EclFlowOilWaterProblem to TTag::FlowOilWaterProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 7b6021050d rename TTag::EclFlowOilWaterBrineProblem to TTag::FlowOilWaterBrineProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving a862fc0f31 rename TTag::EclFlowMICPProblem to TTag::FlowMICPProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving a7fd02f510 rename TTag::EclFlowGasWaterSolventProblem to TTag::FlowGasWaterSolventProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving fe13dfddfa rename TTag::EclFlowGasWaterSaltprecVapwatProblem to TTag::FlowGasWaterSaltprecVapwatProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 27a5033db8 rename TTag::EclFlowGasWaterSaltprecEnergyProblem to TTag::FlowGasWaterSaltprecEnergyProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving e0474238e1 rename TTag::EclFlowGasWaterEnergyProblem to TTag::FlowGasWaterEnergyProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 192fbdb239 rename TTag::EclFlowGasWaterDissolutionDiffuseProblem to TTag::FlowGasWaterDissolutionDiffuseProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 4dc472fa7c rename TTag::EclFlowGasWaterDissolutionProblem to TTag::FlowGasWaterDissolutionProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 0b6d2748e6 rename TTag::EclFlowGasWaterProblem to TTag::FlowGasWaterProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 2988e99e72 rename TTag::EclFlowGasWaterBrineProblem to TTag::FlowGasWaterBrineProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 39320e1a7e rename TTag::EclFlowGasOilEnergyProblem to TTag::FlowGasOilEnergyProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving ebe030c3fd rename TTag::EclFlowGasOilDiffuseProblem to TTag::FlowGasOilDiffuseProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 0ce0924146 rename TTag::EclFlowGasOilProblem to TTag::FlowGasOilProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 6fc11d57dc rename TTag::EclFlowFoamProblem to TTag::FlowFoamProblem 2024-02-23 09:28:19 +01:00
Arne Morten Kvarving 60c1b30ecf rename TTag::EclFlowExtboProblem to TTag::FlowExtboProblem 2024-02-23 09:28:19 +01:00