Commit Graph

14384 Commits

Author SHA1 Message Date
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
Arne Morten Kvarving
c2de02a04d EclAluGridVanguard: some modernization
- typedef -> using
- use constexpr
- use nullptr, not 0
- fix some indents
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
d0c528a240 collecttoiorank: use constexpr 2022-08-10 12:37:04 +02:00
Arne Morten Kvarving
7b74c75f7c eclalucartesianindexmapper: some modernization
- typedef -> using
- use constexpr
2022-08-10 12:37:04 +02:00
Atgeirr Flø Rasmussen
a242dadb6f
Merge pull request #3988 from atgeirr/faster_assembly_minimal
Faster assembly minimal
2022-08-10 11:20:59 +02:00
Atgeirr Flø Rasmussen
a5c8d40cfa Remove unneeded timeIdx arguments, also silence other warnings. 2022-08-10 10:01:54 +02:00
Atgeirr Flø Rasmussen
923b1c555c Make flow_blackoil_tpfa.cpp an OPM Flow variant in the build system. 2022-08-09 14:53:58 +02:00
Tong Dong Qiu
58b20fe2fb Tweak ILU opencl kernel launch params 2022-08-09 13:39:35 +02:00
Tong Dong Qiu
d0aa42e9e3 Reduce source code line lengths 2022-08-09 13:38:57 +02:00
Tong Dong Qiu
5607329b05 Backport to fix ChowPatelIlu 2022-08-09 11:49:47 +02:00
Atgeirr Flø Rasmussen
90e8a9af69 Do not change true impes weights. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
727bf8d01f Do not make changes to eclthresholdpressure.hh and ecltracermodel.hh.
Not required for first version, but should be added later.
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
322dcbfb36 Make getWaterFlux() take const ref argument. Minor formatting cleanups. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
254330463e Disable diffusion for flow_blackoil_tpfa. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
cabe64cc58 Further reduction of modifications. 2022-08-09 11:11:36 +02:00