Commit Graph

14398 Commits

Author SHA1 Message Date
Kai Bao
d69c80b84a simplifying the constructor for AquiferNumerical
removing the unused global_cell and avoid the unnecessary construction of cartesianToCompressed
2022-08-18 15:55:04 +02:00
Atgeirr Flø Rasmussen
6afb386070
Merge pull request #4009 from atgeirr/fix-cartesian-mapping
Bugfix and simplification of cartesian mapping.
2022-08-17 14:50:21 +02:00
Atgeirr Flø Rasmussen
c94ff12e4c Bugfix and simplification of cartesian mapping.
We already have the mapping available, and using the equilGrid() is only valid
on rank 0.
2022-08-17 14:13:13 +02:00
Bård Skaflestad
1ca731a388
Merge pull request #4007 from atgeirr/limit-terminal-warnings-during-deck-input
Limit warnings to terminal during deck input.
2022-08-16 18:20:05 +02:00
Markus Blatt
acff71c3d1
Merge pull request #4006 from akva2/milu_refactor
changed: put MILU in separate compile unit
2022-08-16 15:31:23 +02:00
Markus Blatt
7a0a4c647c
Merge pull request #4005 from akva2/use_std_array
changed: consistently use std::array
2022-08-16 15:08:39 +02:00
Atgeirr Flø Rasmussen
04180031e1 Limit warnings to terminal during deck input.
With this, the tag limit of 10 is used from the very start of the run,
and not only after the deck has been read.
2022-08-16 14:43:07 +02:00
Arne Morten Kvarving
a32a32649d changed: put MILU in separate compile unit 2022-08-16 10:46:20 +02:00
Arne Morten Kvarving
6ed8a38ba5 changed: consistently use std::array 2022-08-16 08:38:54 +02:00
Bård Skaflestad
874e4f818c
Merge pull request #4000 from akva2/action_handler_refactor2
Move action handling from eclproblem to separate class
2022-08-15 14:02:39 +02:00
Arne Morten Kvarving
8cc0aa24de changed: switch to using libfmt 2022-08-15 13:48:19 +02:00
Arne Morten Kvarving
a3e46876fb minor cosmetics 2022-08-15 12:40:13 +02:00
Arne Morten Kvarving
99090ebf72 remove unused method
this was previously used by the ebos simulators
2022-08-15 12:40:13 +02:00
Arne Morten Kvarving
c405d718b1 changed: move action update handling to separate class
clearer interface boundaries plus it allows to build code only once
2022-08-15 12:40:13 +02:00
Arne Morten Kvarving
465623ce9f
Merge pull request #3999 from atgeirr/fix-missing-angle-bracket
Fix missing angle bracket.
2022-08-15 12:01:50 +02:00
Atgeirr Flø Rasmussen
03352ff0fc Fix missing angle bracket. 2022-08-15 11:29:26 +02:00
Bård Skaflestad
d277ca8670
Merge pull request #3998 from akva2/more_generic_problem
changed: move two more methods to generic problem class
2022-08-15 11:14:47 +02:00
Arne Morten Kvarving
ff922364f2
Merge pull request #3997 from bska/actionx-wpimult-regtest
Add Regression Test for WPIMULT in ACTIONX Block
2022-08-15 11:11:48 +02:00
Bård Skaflestad
9a171582b4 Add Regression Test for WPIMULT in ACTIONX Block
To keep this feature working as intended.
2022-08-15 10:35:40 +02:00
Arne Morten Kvarving
4d5f6dde42 changed: move three more methods to generic problem class 2022-08-15 10:30:59 +02:00
Arne Morten Kvarving
88b944f60d
Merge pull request #3990 from bska/fix-nonhc-fpr
Fix Averaged Quantities for Non-HC Simulations
2022-08-12 11:54:26 +02:00
Bård Skaflestad
2f4020a72f Add Regression Test for Single-Phase Water Run
Uses test model contributed by Edmund Stephens.
2022-08-11 17:51:17 +02:00
Bård Skaflestad
27b695d0be Fix Averaged Quantities for Non-HC Simulations
Commit 6d3da3d2e introduced the notion of a "dynamic", pressure
dependent pore-volume and switched the 'PoreVolume' aggregates to
reference condition evaluation for output to the 'PORV' field in the
.PRT file.  We did however fail to update all existing uses of
'PoreVolume' which introduced an inconsistency.  In particular, for
simulation models without hydrocarbons-e.g., a single-phase water
run-the numerator of the volume weighted average would include
pressure effects through the rock compressibility but the
denominator would not.

Thanks to Edmund Stephens for discovering the issue and providing an
example model for analysing the underlying issue.
2022-08-11 16:07:00 +02:00
Bård Skaflestad
b9e170fdbe
Merge pull request #3991 from akva2/equil_init_priv_template
Make the equilbrium initialization code a private template
2022-08-11 16:05:54 +02:00
Arne Morten Kvarving
f57383f416 initstateequil: make it a private template 2022-08-11 15:34:55 +02:00
Arne Morten Kvarving
54cf35e821 equilibrationhelpers: make templates private 2022-08-11 15:34:55 +02:00
Arne Morten Kvarving
b399f72777 changed: avoid typetag dependence in equil initializer 2022-08-11 15:27:38 +02:00
Bård Skaflestad
624d7e51cd
Merge pull request #3977 from totto82/output_drsdtvon
output drsdtcon values to restart files
2022-08-11 14:51:12 +02:00
Bård Skaflestad
8cc5847826
Merge pull request #3995 from akva2/remove_empty_well_header
remove include of Well header
2022-08-11 12:55:36 +02:00
Arne Morten Kvarving
d2ba2e75e8 remove include of Well header 2022-08-11 11:49:42 +02:00
Kai Bao
de09fbaea7
Merge pull request #3994 from akva2/aquifer_use_through_if
BlackOilAquiferModel: use implementations through interface
2022-08-11 11:29:10 +02:00
Arne Morten Kvarving
4917c860fe BlackOilAquiferModel: use aquifers through base interface 2022-08-11 10:04:49 +02:00
Arne Morten Kvarving
271d5bee3a added: (re)introduce AquiferInterface
now a base class for both analytical and numerical aquifers
2022-08-11 09:59:49 +02:00
Arne Morten Kvarving
f166920e75 changed: rename AquiferInterface to AquiferAnalytical 2022-08-11 09:59:49 +02:00
Arne Morten Kvarving
66b4f1edb7 Aquiferxxx: some modernization
- typedef -> using
- use constexpr
2022-08-11 09:59:46 +02:00
Bård Skaflestad
e73d3368e0
Merge pull request #3989 from Tongdongq/tweak-opencl-launch-params
Tweak opencl launch params v2
2022-08-10 14:22:52 +02:00
Tong Dong Qiu
18d9f8cca7 Include missing header 2022-08-10 14:03:32 +02:00
Bård Skaflestad
766543dd18
Merge pull request #3992 from akva2/ecl_modernization
Some small modernization changes in ecl classes
2022-08-10 13:26:25 +02:00
Arne Morten Kvarving
c69ee0d321 VtkEclTracerModule: some modernization
- typedef -> using
- use constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
8ce0f63ef6 FemCpGridCompat: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
5e9610fdb9 EclThresholdPressure: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
58b71c94af EclProblem: some modernization
- use if constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
17dc99f3cd EclPolyhedralGridVanguard: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
c626dc7488 EclNewtonMethod: some modernization
- typedef -> using
- use constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
beaf8c20f4 EclGenericWriter: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
834a54686c EclGenericTracerModel: some modernization
- use constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
f97f29fa3a EclFluxModule: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
ef8c5962b3 EclEquilInitializer: some modernization
- use if constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
35fa52f0b9 EclDummyGradientCalculator: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
07283aa780 EclCpGridVanguard: some modernization
- typedef -> using
- use constexpr
2022-08-10 12:44:53 +02:00