Commit Graph

10940 Commits

Author SHA1 Message Date
Arne Morten Kvarving
388c6c72f7 Flow: drop ebos from simulator object filenames 2024-03-08 12:39:48 +01:00
Atgeirr Flø Rasmussen
8e60fecb85 Add missing convergence metrics to domain convergence report. 2024-03-08 10:37:20 +01:00
Markus Blatt
f04f4c5765
Merge pull request #5239 from akva2/move_flow_utilities_dedicated_file
changed: rename FlowMain.cpp to FlowUtils.cpp
2024-03-07 17:35:59 +01:00
Arne Morten Kvarving
5618a2b0d2 changed: put SupportsFaceTag in separate header
this way we don't have to pull in alugrid and polyhedralgrid
in simulator objects that does not use them
2024-03-07 12:21:21 +01:00
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
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
Arne Morten Kvarving
fdb285c03a changed: rename FlowMain.cpp to FlowUtils.cpp
and add a dedicated header.

this way we don't need to pull in FlowMain.hpp for the prototypes,
avoiding pulling in the entire simulator machinery just to build
some simple utility functions.
2024-03-06 07:57:25 +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
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
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
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
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
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
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
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
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
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
Arne Morten Kvarving
4aa6dc355f rename TTag::EclFlowProblemTPFA to TTag::FlowProblemTPFA 2024-02-23 09:27:48 +01:00
Arne Morten Kvarving
67c9bba4c9 rename TTag::EclFlowProblem to TTag::FlowProblem 2024-02-23 09:27:48 +01:00
Arne Morten Kvarving
73410e1c3a remove unused includes 2024-02-23 08:20:14 +01:00
Arne Morten Kvarving
9cc13977b0 MultisegmentWell: use CTAD 2024-02-23 08:20:14 +01:00
Arne Morten Kvarving
d8fa9c3396 LogOutputHelper: align table 2024-02-23 08:20:14 +01:00
Vegard Kippe
6a760f40dd Avoid looking up (non-existing) ALQ value for injectors. 2024-02-22 14:33:39 +01:00
Markus Blatt
3dfb808724
Merge pull request #5220 from vkip/actionx_low_parsing_strictness
Respect low parsing strictness in actions
2024-02-22 14:27:01 +01:00
Vegard Kippe
45e63bd498 Readability improvement 2024-02-22 13:03:54 +01:00
Vegard Kippe
b14df39503 Update schedule object after it is actually created.. 2024-02-21 21:47:51 +01:00
Vegard Kippe
cd1b0f808b Respect low parsing strictness when reprocessing the schedule section after action application. 2024-02-21 17:02:33 +01:00
Markus Blatt
4d40197406
Merge pull request #5215 from vkip/nextstep_without_tuning
Ensure NEXTSTEP is respected also without --enable-tuning=true
2024-02-21 16:09:23 +01:00
Atgeirr Flø Rasmussen
283086edeb
Merge pull request #5211 from akva2/flows_simplify_data_structure
Flows: simplify data structure
2024-02-20 13:42:51 +01:00
Atgeirr Flø Rasmussen
f79b5abe8a
Merge pull request #5173 from totto82/relaxed_mb
Add relaxed mb tolerance parameter
2024-02-20 11:30:56 +01:00
Vegard Kippe
b8b9a3810d Ensure NEXTSTEP is respected also withouth --enbale-tuning=true 2024-02-19 19:15:43 +01:00
Arne Morten Kvarving
846da295d6 move ebos/ecltimesteppingparams.hh to opm/simulators/timestepping 2024-02-19 09:28:50 +01:00
Arne Morten Kvarving
e7f32f44e7 remove duplicate EclEnableTuning parameter 2024-02-16 17:53:27 +01:00
Arne Morten Kvarving
7dcc411397 Flows: simplify data structure 2024-02-16 14:51:51 +01:00
Tor Harald Sandve
c73337186e clean-up relaxed tolerances 2024-02-15 09:22:42 +01:00
Tor Harald Sandve
3c8ac1fd74 Use relaxed tolerances if maximum number of iterations are used 2024-02-15 08:27:51 +01:00
Tor Harald Sandve
50670b35c4 Add relaxed mb tolerance parameter 2024-02-15 08:27:51 +01:00
Atgeirr Flø Rasmussen
780f282ed8
Merge pull request #5174 from atgeirr/time-reporting-improvements
Time reporting improvements
2024-02-14 19:36:43 +01:00
Kai Bao
60594a5e1b
Merge pull request #5129 from steink/avoid_reopening_stopped_wells
Avoid re-opening previously stopped wells
2024-02-12 14:44:15 +01:00
Arne Morten Kvarving
d738ad2740 move ebos/ecldummygradientcalculator.hh to opm/simulators/flow 2024-02-12 11:19:23 +01:00
Atgeirr Flø Rasmussen
346e37c218 Removing redundant report output and renaming. 2024-02-12 10:54:50 +01:00
Atgeirr Flø Rasmussen
4a60c3c6c2 Add setup and deck read timing to end-of-run report. 2024-02-09 14:52:34 +01:00
Atgeirr Flø Rasmussen
d78288a401 Minor improvements to timing report.
- Using the term Wasted instead of Failed.
 - Making all indents two spaces.
 - Allowing one more digit for linear solver timing output.
2024-02-09 14:50:21 +01:00
Bård Skaflestad
d69ba021a9
Merge pull request #5168 from lisajulia/feature/removeFilesOnSimulationStartup
Feature/remove files on simulation startup
2024-02-08 17:30:07 +01:00
Lisa Julia Nebel
e4080a3fe4 Add 'prepareResultOutputDirectory' function in Opm namespace that removes possible old simulation output files from the specified output directory.
This function is called during 'setupLogging' before the actual logging starts.
2024-02-08 16:08:50 +01:00
Arne Morten Kvarving
dd290b4a1d RegionAverageCalculator: rename EbosSimulator to Simulator 2024-02-08 14:45:29 +01:00
Arne Morten Kvarving
7706748210 RateConverter: rename EbosSimulator to Simulator 2024-02-08 14:45:02 +01:00
Bård Skaflestad
f569f4bbe9
Merge pull request #5171 from akva2/blackoilmodel_drop_ebos
BlackoilModel: drop ebos in variable names
2024-02-08 13:33:27 +01:00
Arne Morten Kvarving
3b570cdfeb BlackoilModelNldd: rename ebosResid to residual 2024-02-08 11:45:41 +01:00
Arne Morten Kvarving
251efaf38c BlackoilModelNldd: rename ebosProblem to problem 2024-02-08 11:43:46 +01:00
Arne Morten Kvarving
f81d72faef BlackoilModelNldd: rename ebosModel to model 2024-02-08 11:38:47 +01:00
Arne Morten Kvarving
9287374ad8 BlackoilModelNldd: rename ebosNewtonMethod to newtonMethod 2024-02-08 11:31:02 +01:00
Arne Morten Kvarving
16b0b942e9 BlackoilModel: rename ebosProblem to problem 2024-02-08 11:24:49 +01:00
Arne Morten Kvarving
dc798d0a24 BlackoilModel: rename ebosModel to model 2024-02-08 11:16:53 +01:00
Arne Morten Kvarving
aaaf230724 BlackoilModel: rename ebosNewtonMethod to newtonMethod 2024-02-08 11:10:01 +01:00
Arne Morten Kvarving
9a4d984322 BlackoilModel: rename ebosSolver to linSolver 2024-02-08 11:03:33 +01:00
Arne Morten Kvarving
fab4544523 BlackoilModel: rename ebosResid to residual 2024-02-08 10:56:48 +01:00
Arne Morten Kvarving
1f24fb1a35 BlackoilModel: rename ebosJac to jacobian 2024-02-08 10:41:54 +01:00
Arne Morten Kvarving
5e4c5e8174 BlackoilModel: rename ebosSimulator to simulator 2024-02-08 10:38:25 +01:00
Arne Morten Kvarving
c0a50597a1 BlackoilWellModel::computePotentials: improve exception message
- add which well the exception added for
- concatenate message for all exceptions to show all, not just last exception
2024-02-07 14:12:54 +01:00
Arne Morten Kvarving
d4e311f9e0 fixed: display exception message no matter which rank it occurred on 2024-02-07 14:12:54 +01:00
Arne Morten Kvarving
34e883c1de WellInterfaceFluidSystem: rename flowPhaseToEbosPhaseIdx to flowPhaseToModelPhaseIdx 2024-02-07 08:08:30 +01:00
Arne Morten Kvarving
c4c7d2e4f5 WellInterfaceIndices: rename ebosCompIdxToFlowCompIdx to modelCompIdxToFlowCompIdx 2024-02-07 08:08:30 +01:00
Arne Morten Kvarving
c029a57c72 WellInterfaceIndices: rename flowPhaseToEboxCompIdx to flowPhaseToModelCompIdx 2024-02-07 08:08:30 +01:00
Markus Blatt
3ae685d47c
Merge pull request #5146 from akva2/flowmain_drop_ebos
rename FlowMainEbos to FlowMain
2024-02-06 16:24:33 +01:00
Markus Blatt
778a7e2343
Merge pull request #5163 from akva2/fix_comments
Fix some comments
2024-02-06 16:22:56 +01:00
Markus Blatt
b5ad44bdee
Merge pull request #5161 from totto82/coordssys
Ignore Coordsys and print a warning
2024-02-06 16:19:09 +01:00
Arne Morten Kvarving
b389e57d87 ISTLSolver: fix profiling timer names 2024-02-06 14:12:02 +01:00
Arne Morten Kvarving
917f0bca72 ISTLSolver: remove reference to ebos in comments 2024-02-06 14:03:38 +01:00
Arne Morten Kvarving
7a7d4435a4 WellOperators.hpp: fix comment 2024-02-06 14:03:08 +01:00
Arne Morten Kvarving
f4222a4f02 SimulatorReport.cpp: correct comment 2024-02-06 14:02:50 +01:00
Arne Morten Kvarving
de7e442690 Banners.hpp: fix comment 2024-02-06 14:02:02 +01:00
Arne Morten Kvarving
c10b28c1aa Remove reference to ebos in doxygen header 2024-02-06 14:01:55 +01:00
Bård Skaflestad
644ba538d8
Merge pull request #5153 from akva2/actionhandler_drop_ecl
EclActionHandler: rename to ActionHandler
2024-02-06 13:01:04 +01:00
Bård Skaflestad
e44614004a
Merge pull request #5162 from akva2/janitoring
add missing include
2024-02-06 13:00:07 +01:00
Arne Morten Kvarving
1ec34f0da2 EclActionHandler: rename to ActionHandler 2024-02-06 10:43:30 +01:00
Arne Morten Kvarving
2bec00bb9b FlowMain: rename ebosSimulator to modelSimulator 2024-02-06 10:42:23 +01:00
Arne Morten Kvarving
b09c70213b FlowMainEbos: rename to FlowMain 2024-02-06 10:42:23 +01:00