Atgeirr Flø Rasmussen
fa3b619ec9
Merge pull request #3644 from blattms/use-cl2.hpp
...
[enhancement][opencl} Use cl2.hpp instead of cl.hpp (missing on bullseye)
2021-11-01 10:10:30 +01:00
Bård Skaflestad
1a80378b0a
Merge pull request #3613 from bska/accumulate-guiderate-once
...
Switch Guide Rate Accumulation to Post-Order Traversal
2021-10-29 22:29:13 +02:00
Bård Skaflestad
767b5ca58b
Switch Guide Rate Accumulation to Post-Order Traversal
...
This guarantees, under the assumption that the group tree does not
have cycles, that we do not accumulate group-level guide rate values
until all of its children are fully evaluated. We use an iterative
depth-first post-order tree traversal with an explicit stack instead
of a recursive implementation.
The previous implementation, which tried to do the same kind of
child-to-parent accumulation, might visit a parent group multiple
times which in turn might lead to losing updates. This is a more
formalised approach to the value accumulation than was originally
employed.
2021-10-29 21:21:49 +02:00
Bård Skaflestad
b94a6e290d
Merge pull request #3632 from bska/create-micp-helper
...
Separate MICP Case Out to Helper Function
2021-10-29 21:17:40 +02:00
Bård Skaflestad
f212c946c7
Separate MICP Case Out to Helper Function
...
In keeping with the other simulation cases.
2021-10-29 16:15:44 +02:00
Atgeirr Flø Rasmussen
fe8df97266
Merge pull request #3637 from akva2/fix_mpiabort_no_input_case
...
changed: special case no input deck given handling
2021-10-29 15:35:35 +02:00
Atgeirr Flø Rasmussen
2a7a9d46ce
Merge pull request #3640 from totto82/inj_comm
...
communicate inj_resv/surface_rates
2021-10-29 15:35:24 +02:00
Bård Skaflestad
66989bcd78
Merge pull request #3646 from akva2/fix_dep_warning_comm
...
fix deprecation warning with dune 2.7+
2021-10-29 12:47:05 +02:00
Atgeirr Flø Rasmussen
b4fe98b739
Merge pull request #3636 from joakim-hove/mark-as-supported-diffuse-diffc-gpmaint
...
Mark keywords DIFFC, DIFFUSE and GPMAINT as supported
2021-10-29 12:25:00 +02:00
Arne Morten Kvarving
371f26ac6b
fix deprecation warning with dune 2.7+
2021-10-29 12:18:36 +02:00
Arne Morten Kvarving
a056aa858a
changed: special case no input deck given handling
...
we do not want to invoke MPI_Abort in this case
2021-10-29 12:16:01 +02:00
Markus Blatt
9197ee3e20
Prevent deprecation warning about cl2.hpp: __CL_ENABLE_EXCEPTIONS.
2021-10-28 17:09:22 +02:00
Markus Blatt
4de52a8d30
Use OpenCl's CL/cl2.hpp instead of CL/cl.hpp
...
We still request Standard version 1.2 only.
We need to use KernelFunctor instead of make_kernel.
In addition cl::Sources now works on std::string and
does not support std::pair<const char*, in> anymore.
2021-10-28 16:42:43 +02:00
Tor Harald Sandve
b9f16018ac
remove unused inj_potentials
2021-10-28 14:17:33 +02:00
Tor Harald Sandve
93c7ba6b92
communicate inj_surface_rates
2021-10-28 08:55:50 +02:00
Joakim Hove
5a54bb0728
Merge pull request #3634 from alfbr/error-message
...
Do not print confusing message to terminal.
2021-10-27 11:21:09 +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
Joakim Hove
a79fd67104
Mark keywords DIFFC, DIFFUSE and GPMAINT as supported
2021-10-26 07:42:14 +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
Alf Birger Rustad
a10387fcec
Do not print confusing message to terminal.
2021-10-25 15:35:30 +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