Commit Graph

13605 Commits

Author SHA1 Message Date
Markus Blatt
a1e90be2aa Use grid view from simulator for element mapper.
With dune-fem the type of the grid view is
Dune::Fem::AdaptiveLeafGridPart and not the LeafGridView
of the grid. The old approach therefore did not compile
as we passed the wrong view.
2021-10-26 21:55:04 +02:00
Markus Blatt
b8a1f04a48 Added missing explicit template instatiations for dune-fem 2.8. 2021-10-26 21:54:41 +02:00
Joakim Hove
567eea2c19
Merge pull request #3630 from joakim-hove/actionx-udq
Add regression testing for model ACTIONX_UDQ
2021-10-26 08:24:07 +02:00
Bård Skaflestad
3cfec109db
Merge pull request #3620 from blattms/removeSetupCart-rebased
[refactor] Remove cartesianToCompressed Mapping from well model
2021-10-25 16:43:08 +02:00
Bård Skaflestad
102a6b9507
Merge pull request #3631 from alfbr/default-sched
Changed default for sched-restart to false
2021-10-25 13:51:52 +02:00
Alf Birger Rustad
0a1143abff Changed default for sched-restart to false 2021-10-25 12:14:33 +02:00
Joakim Hove
8673e02317 Add regression testing for model ACTIONX_UDQ 2021-10-25 11:45:32 +02:00
Joakim Hove
f1ecaf0231
Merge pull request #3624 from joakim-hove/serialize-array
Add serializer support for std::array<T,N>
2021-10-25 11:36:39 +02:00
Joakim Hove
059efcd260 Add serializer support for std::array<T,N> 2021-10-25 10:50:34 +02:00
Atgeirr Flø Rasmussen
b568237c04
Merge pull request #3625 from atgeirr/bump-version
Bump version.
2021-10-25 09:06:06 +02:00
Atgeirr Flø Rasmussen
760099a692 Bump version. 2021-10-22 10:18:22 +02:00
Bård Skaflestad
1ee8322a51
Merge pull request #3618 from joakim-hove/remove-extra
Remove unnecessary call to simulator.setStartTime()
2021-10-20 14:29:41 +02:00
Bård Skaflestad
5a282a1b34
Merge pull request #3621 from bska/model6-regression-tests
Model6 regression tests
2021-10-20 13:30:17 +02:00
jilocode
ad8e709550 Regression tests added 2021-10-20 11:39:52 +02:00
jilocode
10207cfbb8 Regression added test BASE model6 2021-10-19 19:27:24 +02:00
Bård Skaflestad
38f9558c19
Merge pull request #3617 from totto82/micp_ctest
Add micp test case
2021-10-19 18:05:18 +02:00
Markus Blatt
fa9e93529b Only consider perforation in the interior of the local grid.
This is needed for distributed wells to save most of the code
from checking whether a perforation is in the interior.

We add new methods compressedIndexForInterior that return -1
for non-interior cells and use that for the wells. This restores
the old behaviour before 1cfe3e0aad
2021-10-19 16:50:42 +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
Joakim Hove
85a103022b Remove unnecessary call to simulator.setStartTime() 2021-10-19 14:34:36 +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
Markus Blatt
23e0b06387 Allow communicators other than MPI_COMM_WORLD. 2021-10-19 12:44:41 +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
Tor Harald Sandve
1cfe3e0aad remove cartesian to compressed vector 2021-10-19 11:03:46 +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