Commit Graph

17345 Commits

Author SHA1 Message Date
Kai Bao
75f38ca726
Merge pull request #5178 from akva2/baseaquifermodel_move
move ebos/eclbaseaquifermodel.hh to opm/simulators/flow
2024-03-06 12:47:51 +01:00
Kai Bao
aa2fa12598
Merge pull request #5167 from akva2/drop_ebos_simulator_params
Rename ebos_simulator parameters to simulator
2024-03-06 11:48:03 +01:00
Kai Bao
5f2c9192d0
Merge pull request #5177 from akva2/move_collect_iorank
ebos/collecttoiorank: move to opm/simulators/flow
2024-03-06 11:44:46 +01:00
Arne Morten Kvarving
3475da7d8c Rename ebos_simulator members/parameters to simulator 2024-03-06 10:53:00 +01:00
Kai Bao
339cc29f47
Merge pull request #5165 from akva2/drop_ebos_in_function_names
Drop ebos in function names
2024-03-06 10:48:13 +01:00
Arne Morten Kvarving
d5748b6c55 Drop ebos in function names 2024-03-06 10:13:01 +01:00
Arne Morten Kvarving
233d4c90ac ebos/collecttoiorank: move to opm/simulators/flow 2024-03-06 09:30:21 +01:00
Arne Morten Kvarving
8d033f94de move ebos/eclbaseaquifermodel.hh to opm/simulators/flow 2024-03-06 09:17:19 +01:00
Kai Bao
9f13a25ebc
Merge pull request #5175 from akva2/move_alugrid
Move AluGrid files from ebos to opm/simulators/flow
2024-03-06 00:02:12 +01:00
Kai Bao
ed9876a5c4
Merge pull request #5185 from akva2/move_outputblackoilmodule
Move BlackoilOutputModule from ebos to opm/simulators/flow
2024-03-05 23:31:44 +01:00
Kai Bao
cd9a208757
Merge pull request #5166 from akva2/indices_drop_ebos
Drop ebos in index functions
2024-03-05 23:31:27 +01:00
Kai Bao
d764eb416c
Merge pull request #5203 from akva2/rename_drift_parameter
rename EclEnableDriftCompensation parameter to EnableDriftCompensation
2024-03-05 21:10:50 +01:00
Arne Morten Kvarving
6f1071f321 rename EclEnableDriftCompensation parameter to EnableDriftCompensation 2024-03-05 20:36:41 +01:00
Markus Blatt
d061d70ba9
Merge pull request #5222 from blattms/actionx-instant-nextstep
[Fix] Correct handling of NEXTSTEP in ACTIONX
2024-03-05 15:00:06 +01:00
Markus Blatt
2cd490b601 [Fix] Correct handling of NEXTSTEP in ACTIONX
Previously, the step size would only have used for the first time step
of the next report step (at least of --enable-tuning=true was used).
2024-03-05 13:59:24 +01:00
Arne Morten Kvarving
c94da66810
Merge pull request #5242 from hakonhagland/python_doc
Add docstrings for Python bindings
2024-03-05 11:33:46 +01:00
Håkon Hægland
8cbb1707e7 Move statements to after target is defined 2024-03-05 11:11:53 +01:00
Håkon Hægland
1c5143f02e Improve CMakeLists.txt
Add the generated .hpp file directly to pybind11 sources instead of
creating a custom target.
2024-03-05 10:48:04 +01:00
Håkon Hægland
e20faa255c Add docstrings for Python bindings 2024-03-05 10:18:54 +01:00
Arne Morten Kvarving
2019d40d3d
Merge pull request #4950 from hakonhagland/pybind5
Get primary variables and fluid state from Python
2024-03-05 09:39:34 +01:00
Håkon Hægland
67bcc491ff Remove unused variables 2024-03-05 09:22:15 +01:00
Håkon Hægland
66eb6e1625 use the elements() range generator 2024-03-05 08:53:54 +01:00
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
Arne Morten Kvarving
b6cbf513bc move ebos/ecloutputblackoilmodule.hh to opm/simulators/flow 2024-03-04 13:09:48 +01:00
Arne Morten Kvarving
41319eab7d move ebos/eclgenericoutputblackoilmodule.[hh|cc] to opm/simulators/flow 2024-03-04 13:03:42 +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
Håkon Hægland
757c67f284 Return vectors by value
Return vectors by value instead of unique pointers to arrays.
2024-03-01 14:22:37 +01:00
Håkon Hægland
55aab60549 Get primary variables and fluid state from Python
Added methods to Python module opm.simulators.BlackOilSimulator to
access primary variables and fluid state variables.
2024-03-01 14:22:35 +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
0039c1f25f move ebos/eclalugridvanguard.hh to opm/simulators/flow 2024-02-23 15:27:53 +01:00
Arne Morten Kvarving
f95c114716 move ebos/alucartesianindexmapper.hh to opm/simulators/flow 2024-02-23 15:27:28 +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