Commit Graph

20578 Commits

Author SHA1 Message Date
Bård Skaflestad
71079ce737 Initialise Fluid-in-Place Balance Sheets at Restart
Commit 6ba9dc086 (PR #5626) moved the balance sheet report output
logic ahead of the timestep.  As a consequence, the output module's
'inplace_' and 'initialInplace_' data members must be fully
initialised the first time we call 'writeReports()' if the run
requests balance sheet output.

This commit initialises those objects by calling calc_inplace() from
EclWriter<>::endRestart().  Doing so restores the behaviour from
before PR #5626.  Note, however, that using this value for
'initialInplace_' is incorrect as the simulator then, in a restarted
run, will calculate recovery factors based on the fluid distribution
at the restart time instead of at the start of the base run.
Nevertheless this is, as alluded to earlier, how the simulator has
always performed.  The behaviour is just a little more explicit now.
2024-10-10 12:47:13 +02:00
Bård Skaflestad
1475e47901
Merge pull request #5652 from bska/regression-test-equalreg-multy
Activate New Regression Tests for EQUALREG/MULTY
2024-10-10 12:39:08 +02:00
Bård Skaflestad
ffc0b5304f
Merge pull request #5654 from bska/varnish-eclwriter-beginrestart
Varnish EclWriter::beginRestart() Implementation
2024-10-10 12:35:43 +02:00
Bård Skaflestad
9344423d04 Varnish EclWriter::beginRestart() Implementation
In particular,

  - Split some long lines
  - Mark objects 'const' where possible
  - Reduce scope of objects
  - Add braces to single statement control structures
  - Prefer pre-increment
  - Prefer type deduction for induction variables
2024-10-10 11:35:21 +02:00
Bård Skaflestad
8ccf4682a8 Activate New Regression Tests for EQUALREG/MULTY
We use all models generously provided in PR OPM/opm-tests#1239.
2024-10-10 11:35:16 +02:00
Kai Bao
0e127194de
Merge pull request #5631 from vkip/winjmult_damp
Add dampening to the injectivity multipliers (WINJMULT)
2024-10-10 11:28:22 +02:00
Markus Blatt
9300e4819a
Merge pull request #5656 from bska/simplify_logoutput_helper_test
Simplify Unit Tests for LogOutputHelper
2024-10-10 10:09:25 +02:00
Bård Skaflestad
e550fd71d0 Simplify Unit Tests for LogOutputHelper
In particular, put more of the common setup code into the test
fixture and use more powerful constructors for the EclipseState
object.  While here, also switch to using the update_well_var() and
update_group_var() member functions on the SummaryState object where
appropriate since the resulting statements become slightly easier to
understand in isolation.
2024-10-10 09:56:14 +02:00
Vegard Kippe
a2882dc0c8 Resetting WINJMULT dampening factors before fixed BHP calculations 2024-10-10 09:25:28 +02:00
Kai Bao
56619e4476
Merge pull request #5651 from kjetilly/only_one_component
Compile only a select number of components.
2024-10-10 08:58:32 +02:00
Kjetil Olsen Lye
1816e9dfad Added better help message 2024-10-09 20:57:37 +02:00
Razvan Nane
82f32be1d9 fix typo in rocsparsesolver 2024-10-09 20:27:01 +02:00
Kjetil Olsen Lye
10cf9ff839 use fmt::print instead of fmt::println 2024-10-09 16:29:02 +02:00
Kjetil Olsen Lye
d91208099f Use array instead of vector 2024-10-09 13:56:06 +02:00
Kjetil Olsen Lye
ea76a1987c Typo and include cstdlib 2024-10-09 10:16:08 +02:00
Kjetil Olsen Lye
cbf7504030 Added extra error check for OPM_COMPILE_COMPONENTS 2024-10-09 07:17:25 +02:00
Kjetil Olsen Lye
02b31fb9b2 Can now compile only a select number of components. 2024-10-08 20:35:42 +02:00
jakobtorben
e53a3fd3f4 Remove unused well apply 2024-10-08 19:36:34 +02:00
Vegard Kippe
5d1b29ac72 Account for param_ move to parent class 2024-10-08 15:49:11 +02:00
Vegard Kippe
ac5de96ad4 Add dampening to the injectivity multipliers (WINJMULT) 2024-10-08 15:49:10 +02:00
Kai Bao
4e8c793cd6
Merge pull request #5650 from GitPaean/fxing_small_fallout_comp
small range fix for flowexp_comp
2024-10-08 15:45:16 +02:00
Kai Bao
3656654d2b small range fix for flowexp_comp 2024-10-08 14:51:07 +02:00
Kai Bao
cfac494507
Merge pull request #5627 from vkip/fc_clean
Handle cleaning of filter cake in a more intuitive way
2024-10-08 13:54:14 +02:00
Vegard Kippe
a62a326cfa Removing unnessary arrays and eliminate some code duplication 2024-10-08 11:47:47 +02:00
jakobtorben
08bbbbf9fb Map well solution recovery vector to perforated well cells 2024-10-08 11:34:12 +02:00
Bård Skaflestad
dfad8d1ba1
Merge pull request #5644 from akva2/pybind11_bump
Adjust packaging for pybind bump
2024-10-08 10:56:02 +02:00
Bård Skaflestad
6a7efcbcaa
Merge pull request #5645 from kjetilly/flowexp_components
Support for 2 to 7 components in flowexp_comp
2024-10-08 09:25:08 +02:00
Vegard Kippe
ca9cad3f07 Properly update multipliers after cleaning, and ensure that the cleaning occurs before the multipliers are applied to the well. 2024-10-07 19:35:10 +02:00
Vegard Kippe
136bd93fd6 Fix linear case 2024-10-07 19:35:10 +02:00
Vegard Kippe
e19063d957 Fix 'off-by-a-step' error in filter cake cleaning + refactor slightly 2024-10-07 19:35:10 +02:00
Vegard Kippe
60d622fa12 Handle cleaning of filter cake in a more intuitive way, also report actual thickness for radial case 2024-10-07 19:35:10 +02:00
jakobtorben
3680c21f32 Map perforated cell index to global index for CPR weights and add well contrib to matrix 2024-10-07 17:44:23 +02:00
Markus Blatt
3bb137be47
Merge pull request #5648 from bska/enable-equalreg
Enable EQUALREG for Array Operations
2024-10-07 09:42:50 +02:00
jakobtorben
58a8d5ee41 Map global index to local subdomain index in well operator 2024-10-07 09:13:00 +02:00
jakobtorben
60ece76adf Make well equations use only perforated cells 2024-10-07 09:12:59 +02:00
Bård Skaflestad
779522fff1 Enable EQUALREG for Array Operations
The keyword's implementation has reached a point where we can
justify its addition to the simulator's feature set.
2024-10-06 15:22:37 +02:00
Bård Skaflestad
8ae31797b1
Merge pull request #5647 from blattms/feature/pinch-4-all-regression-tests
Also perform regression tests for PINCH(4) being ALL.
2024-10-05 18:04:49 +02:00
Markus Blatt
cb45121575 Also perform regression tests for PINCH(4) being ALL.
These tests will make sure that fixes of #5577 are preserved.
2024-10-04 22:01:38 +02:00
Markus Blatt
ed0e37e31d
Merge pull request #5577 from blattms/feature/full-pinch-option-4-all
Correctly treat transmissibilities for PINCH option(4) ALL.
2024-10-04 16:45:46 +02:00
Kjetil Olsen Lye
98ca0a68b3 Include fixes. 2024-10-04 15:03:31 +02:00
Arne Morten Kvarving
55c42d7b83 one translation unit per instance 2024-10-04 14:45:34 +02:00
Bård Skaflestad
0b94f11b5c
Merge pull request #5625 from GitPaean/zmf_supporet
supporting ZMF explicit solution
2024-10-04 09:16:25 +02:00
Markus Blatt
a04b73d554
Merge pull request #5646 from vkip/actually_USE_fixed_order
Actually use fixed ordering (to get reproducible results in parallel)
2024-10-04 08:22:58 +02:00
Atgeirr Flø Rasmussen
9654215223
Merge pull request #5590 from jakobtorben/convergence_monitors
Convergence monitors
2024-10-04 08:21:03 +02:00
Vegard Kippe
099dabd8a9 Actually update the criterion to use fixed ordering.. 2024-10-04 00:09:04 +02:00
jakobtorben
b830208573 PR review changes 2024-10-03 18:05:06 +02:00
Kjetil Olsen Lye
0dc1cc4106 Formatting fix. 2024-10-03 16:20:47 +02:00
Kjetil Olsen Lye
b49741c77d Only read RUNSPEC to get numComps. 2024-10-03 16:16:46 +02:00
Kai Bao
29deffda26 addressing reviewing comments for PR OPM/opm-simulators#5625 2024-10-03 16:06:23 +02:00
Kjetil Olsen Lye
6adf4a6fb9 Removed whitespace. 2024-10-03 14:12:03 +02:00