Commit Graph

13586 Commits

Author SHA1 Message Date
Bård Skaflestad
38f9558c19
Merge pull request #3617 from totto82/micp_ctest
Add micp test case
2021-10-19 18:05:18 +02:00
Bård Skaflestad
9634e401b0
Merge pull request #3596 from joakim-hove/rst-testing
Add RESTART_STEP argument to spe1 and spe9 tests
2021-10-19 16:39:03 +02:00
Bård Skaflestad
c6ca024c74
Merge pull request #3612 from bska/report-gxigr-if-present
Report Group Level Injection Guide Rates if Present
2021-10-19 15:01:01 +02:00
Bård Skaflestad
67f4cf62f1 Report Group Level Injection Guide Rates if Present
We used to tie reporting these quantities to whether or not a group
had any guide rates for production (GuideRate::has()), but this is
clearly insufficient for injection guide rates.
2021-10-19 14:15:36 +02:00
Bård Skaflestad
9b3cf66a31
Merge pull request #3581 from bska/restore-guiderate
Initialise Guide Rate Object From Restart File
2021-10-19 14:14:31 +02:00
Tor Harald Sandve
5dcc584848 Add micp test case 2021-10-19 14:13:28 +02:00
Bård Skaflestad
a7c6203a73 Initialise Guide Rate Object From Restart File
This commit adds an overload set named

    loadRestartGuideRates

which, collectively, initialises the contained GuideRate object
using guide rate values from the restart file.  This is necessary,
but not quite sufficient, to restart models in prediction mode with
group-level constraints.
2021-10-19 13:22:31 +02:00
Bård Skaflestad
8014442a1d Split Restart File Loading Into Multiple Stages
Mostly for readability in preparation of initialising the guide rate
object with values from the restart file.  The new stages, each with
its own 'loadRestart*Data()' member function are

  - Connection
  - Segment
  - Well
  - Group

While here, also switch to using std::any_of() in place of a raw
loop.
2021-10-19 13:22:31 +02:00
Bård Skaflestad
37f589bff1
Merge pull request #3598 from bska/report-siunits-injgr-grouplevel
Report Group Level Inject Guiderate Values in Strict SI Units
2021-10-19 13:20:58 +02:00
Joakim Hove
4c9fd88ce8 Add RESTART_STEP argument to spe1 and spe9 tests 2021-10-19 12:09:28 +02:00
Bård Skaflestad
89adc1919b
Merge pull request #3611 from joakim-hove/broadcast-wtest-state
Broadcast wtest state
2021-10-19 12:01:17 +02:00
Joakim Hove
695254fc7c Broadcast WellTestState after initialization 2021-10-19 11:16:41 +02:00
Joakim Hove
daabe1ca76 Make sure WellTestState is initialized also on non IO rank 2021-10-19 11:16:41 +02:00
Joakim Hove
9a9ccb90b8 Make sure to filter out wells from other processes in WellTestState 2021-10-19 11:16:41 +02:00
Joakim Hove
c8cbd32f85 Add method WellContainer<T>::wells() 2021-10-19 11:16:41 +02:00
Bård Skaflestad
1d0ee3c005 Report Group Level Inject Guiderate Values in Strict SI Units
The output layer expects its input values to be strictly SI, but we
know that the GuideRate container's values are in output units.

Forgotten in PR #3467 (commit 517db198f8).
2021-10-19 09:32:38 +02:00
Tor Harald Sandve
5717a95cb4
Merge pull request #3607 from totto82/operHist
Check operabiliy for wells under history
2021-10-19 09:03:34 +02:00
Bård Skaflestad
dbcba2ff7c
Merge pull request #3614 from joakim-hove/handle-nextstep
Handle NEXTSTEP behavior in time stepper
2021-10-18 21:26:17 +02:00
Bård Skaflestad
4f896aefd6
Merge pull request #3616 from akva2/brine_energy_object_lib
build flow_brine_energy as an object library
2021-10-18 15:06:25 +02:00
Arne Morten Kvarving
8c7f635dc2 build flow_brine_energy as an object library
improves parallel builds
2021-10-18 14:24:55 +02:00
Bård Skaflestad
4a16e2cf3a
Merge pull request #3615 from akva2/energy_not_thermal
rename flow_brine_thermal to flow_brine_energy
2021-10-18 14:12:59 +02:00
Arne Morten Kvarving
21af223b92 rename flow_brine_thermal to flow_brine_energy
naming should be consistent with the established convention
2021-10-18 12:48:11 +02:00
Joakim Hove
56c7c74016 Handle NEXTSTEP behavior in time stepper 2021-10-18 11:52:33 +02:00
Tor Harald Sandve
160c80b574 check operability history wells 2021-10-18 09:21:04 +02:00
Tor Harald Sandve
d925e74b76
Merge pull request #3569 from totto82/operInj
check operability injectors
2021-10-18 08:50:50 +02:00
Bård Skaflestad
09b7f287a0
Merge pull request #3604 from akva2/improve_test_drivers
changed: use getopts in test drivers
2021-10-17 17:48:23 +02:00
Tor Harald Sandve
350875e7c5
Merge pull request #3583 from totto82/brinethermal
brine+thermal
2021-10-15 14:41:26 +02:00
Atgeirr Flø Rasmussen
8ae8e07212
Merge pull request #3609 from atgeirr/fix-init-order
Silence init order and unused argument warnings
2021-10-15 13:41:29 +02:00
Atgeirr Flø Rasmussen
fc80451e3d Silence unused argument warning. 2021-10-15 13:26:44 +02:00
Atgeirr Flø Rasmussen
4c213b25e0 Order of initialization should match order of definition. 2021-10-15 13:24:55 +02:00
Tor Harald Sandve
1c9c5c484b check operability injectors 2021-10-15 12:32:02 +02:00
Tor Harald Sandve
f6f5badfde Add brine and thermal simulator 2021-10-15 11:50:17 +02:00
Tor Harald Sandve
70c9d2e237
Merge pull request #3590 from daavid00/micp-2021-10
micp
2021-10-14 22:28:28 +02:00
daavid00
48b175904a first version of micp implementation in flow 2021-10-14 17:44:57 +02:00
Bård Skaflestad
3174643fe8
Merge pull request #3606 from blattms/fix-non-restart-writes-with-tracers
[bugfix] Make tracerConcentrations_ valid for non-restart writes.
2021-10-14 17:37:20 +02:00
Markus Blatt
6f0461691a [bugfix] Make tracerConcentrations_ valid for non-restart writes.
We decide whether to write tracer concentrations based on the size
of the tracerConcentrations_ container. Hence we need to make sure
that its size is zero after the concentrations have been written
and now resize the container to reflect that.

Before this change only the container inside tracerConcentrations_
were moved (and hence made empty) and next tiem we passed empty
containers to the output writing functions (which in parallel
triggered an assertion).
2021-10-14 11:05:33 +02:00
Atgeirr Flø Rasmussen
5e1853b8e4
Merge pull request #3588 from totto82/improve_switch_output
make multiple well control switching output more readable
2021-10-14 10:56:53 +02:00
Tor Harald Sandve
83ef3730b2 make multiple well control switching output more readable 2021-10-14 09:40:34 +02:00
Atgeirr Flø Rasmussen
dead95ba18
Merge pull request #3519 from totto82/continueOnConvergenceFailure
Option for continue on solver convergence failure
2021-10-14 09:31:23 +02:00
Arne Morten Kvarving
673b049b9a changed: use getopts in test drivers
the number of options were getting unmanagable as
a flat list.

also add help/usage to the scripts
2021-10-13 14:24:55 +02:00
Joakim Hove
a86573c247
Merge pull request #3605 from atgeirr/remove-redundant-wellmanager
Reinstate tests in test_ecl_output.cc and remove unused classes.
2021-10-13 12:37:34 +02:00
Joakim Hove
29caa8b89f
Merge pull request #3601 from joakim-hove/restart-sched-flag
Restart sched flag
2021-10-13 11:28:15 +02:00
Joakim Hove
4b85fc74ae
Merge pull request #3594 from joakim-hove/wtest-rst
load WellTestState from restart file
2021-10-13 11:27:41 +02:00
Atgeirr Flø Rasmussen
347ad2da6b Reinstate tests that were commented out due to EclWellManager issues. 2021-10-13 11:10:48 +02:00
Atgeirr Flø Rasmussen
432f4d8247 Remove unused class EclPeacemanWell 2021-10-13 11:00:08 +02:00
Atgeirr Flø Rasmussen
e6e8eab6d2 Remove unused EclWellManager class. 2021-10-13 10:56:33 +02:00
Atgeirr Flø Rasmussen
2da4165b3e Stop using EclWellManager in test_ecl_output.cc. 2021-10-13 10:55:05 +02:00
Atgeirr Flø Rasmussen
72be136529 Stop using EclWellManager in test_equil.cc. 2021-10-13 10:50:33 +02:00
Atgeirr Flø Rasmussen
54599f3fc6
Merge pull request #3603 from akva2/fix_mpi_double_finalize
fixed: double call to MPI_Finalize
2021-10-13 10:13:12 +02:00
Arne Morten Kvarving
8eb63409cb fixed: double call to MPI_Finalize
I missed this one when moving the MPI handling into RAII style
2021-10-13 09:35:16 +02:00