Atgeirr Flø Rasmussen
d2dac6c19c
Bugfix: rates in assembleControlEqProd() are by canonical phases, not active.
2020-04-02 13:57:38 +02:00
Atgeirr Flø Rasmussen
a8107afc11
Fix handling of FIELD for injector groups.
2020-04-02 13:57:38 +02:00
Tor Harald Sandve
66931b9cb7
Various fixes and refactoring.
...
- Communicate all well rates.
- When changing controls, modify rates to satisfy failed constraint.
- Ensure targets are positive.
- Always solve for potentials for MSW (temporary fix).
2020-04-02 13:57:05 +02:00
Atgeirr Flø Rasmussen
3a5a8c23df
Use generic control equation implementation.
2020-04-02 13:54:58 +02:00
Atgeirr Flø Rasmussen
d703699e62
Avoid recursion above the FIELD group.
2020-04-02 13:54:58 +02:00
Atgeirr Flø Rasmussen
766d02cacc
Unify group control equation codes.
2020-04-02 13:54:58 +02:00
Tor Harald Sandve
92ee56c3b3
scale guiderate by current well rate
2020-04-02 13:54:47 +02:00
Atgeirr Flø Rasmussen
27f62399f5
Handle guide-rate based well constraints from groups.
2020-04-02 10:41:57 +02:00
Tor Harald Sandve
202235abe0
Merge pull request #2510 from dr-robertk/PR/bugfix-gridview-mixup
...
[bugfix][ISTLSolverEbos] fix compilation when dune-fem is used in
2020-04-01 10:05:51 +02:00
Atgeirr Flø Rasmussen
2fbad2eb59
Merge pull request #2511 from joakim-hove/wellpi
...
Use only wconnection transmissibility without WellPI scaling
2020-03-31 18:59:51 +02:00
Joakim Hove
58717905ee
Use only wconnection transmissibility without WellPI scaling
2020-03-31 18:12:29 +02:00
Joakim Hove
3c621b9f33
Merge pull request #2507 from joakim-hove/python-shared-ptr
...
Use std::shared_ptr for Python handle to Schedule
2020-03-31 16:50:58 +02:00
Atgeirr Flø Rasmussen
1f5e032427
Merge pull request #2506 from joakim-hove/compile-time
...
Add build time to flow startup banner
2020-03-31 15:04:50 +02:00
Robert Kloefkorn
8afe8c3f96
[bugfix][ISTLSolverEbos] fix compilation when dune-fem is used in
...
conjunction with opm-simulators.
2020-03-31 14:22:11 +02:00
Joakim Hove
d6a1d3029e
Use std::shared_ptr for Python handle to Schedule
2020-03-31 12:28:07 +02:00
Joakim Hove
c8524a139e
Add build time to flow startup banner
2020-03-31 08:42:24 +02:00
Joakim Hove
4a6814d6bc
Merge pull request #2502 from joakim-hove/msw-rst-testing
...
Add integration test for restart & MSW
2020-03-31 07:53:58 +02:00
Arne Morten Kvarving
e4be6b28ab
Merge pull request #2504 from akva2/fix_broadcast
...
fixed: broadcasting an int and receiving as a size_t is a very bad idea
2020-03-30 12:23:29 +02:00
Arne Morten Kvarving
a456b7dff5
fixed: broadcasting an int and receiving as a size_t is a very bad idea
...
pointy-hat: me
2020-03-30 11:48:00 +02:00
Joakim Hove
51144a49a9
Add integration test for restart & MSW
2020-03-28 09:49:31 +01:00
Joakim Hove
f425758c25
Merge pull request #2501 from joakim-hove/add-python-arg
...
Add Python argument to Schedule constructor
2020-03-27 13:44:09 +01:00
Bård Skaflestad
54ef525e07
Merge pull request #2328 from bska/currctrl-restart-io
...
Save and Restore Well's Current Control Target Mode
2020-03-26 15:11:25 +01:00
Bård Skaflestad
d95eb32510
Save and Restore Well's Current Control Target Mode
...
This commit uses the new restart file support for active well
control target modes to save and restore the run's active targets.
2020-03-26 14:20:12 +01:00
Joakim Hove
ec848b08f0
Merge pull request #2499 from akva2/janitoring
...
prune some unnecessary includes
2020-03-26 10:46:13 +01:00
Joakim Hove
30216212c4
Add Python argument to Schedule constructor
2020-03-26 10:15:07 +01:00
Joakim Hove
54cd4f96f7
Merge pull request #2496 from akva2/tracers_from_state
...
Use tracers from EclipseState
2020-03-25 10:17:56 +01:00
Arne Morten Kvarving
b698fe2c90
prune some unnecessary includes
2020-03-25 09:42:02 +01:00
Atgeirr Flø Rasmussen
8ef508cc08
Merge pull request #2491 from blattms/flexible-fixes
...
Fixes ILU0 when using flexible solvers.
2020-03-24 17:39:27 +01:00
Bård Skaflestad
7e6d283665
Merge pull request #2495 from akva2/use_aquifer_config
...
changed: use AquiferConfig when setting up aquifers
2020-03-24 14:31:52 +01:00
Arne Morten Kvarving
9906cc47f7
changed: use AquiferConfig when setting up aquifers
2020-03-24 13:36:39 +01:00
Arne Morten Kvarving
5fd85c1446
Merge pull request #2497 from akva2/deck_avoid
...
Avoid deck usage in simulator
2020-03-24 08:28:21 +01:00
Arne Morten Kvarving
30eb7256bc
remove call to checkMissingFeatures
...
once is enough. as a bonus avoids deck usage in simulator
2020-03-23 15:54:48 +01:00
Arne Morten Kvarving
1424b8e859
changed: use Deck unit system from EclipseState
...
to avoid deck usage in simulator
2020-03-23 15:54:48 +01:00
Arne Morten Kvarving
b3bf3c58b2
changed: use TracerConfig from opm-common
2020-03-23 15:52:53 +01:00
Arne Morten Kvarving
55ad96a067
use TracerVdTable from opm-common
2020-03-23 15:50:13 +01:00
Atgeirr Flø Rasmussen
070fafb31f
Merge pull request #2494 from atgeirr/fix-ptr-overload
...
Fix ptr() template for strict compilers (clang)
2020-03-23 14:28:49 +01:00
Atgeirr Flø Rasmussen
56222d4350
Make is_ptr() for unique_ptr handle two template parameters.
2020-03-23 13:36:07 +01:00
Arne Morten Kvarving
187534780c
Merge pull request #2492 from akva2/move_ser_object
...
changed: use serialization objects from opm-common in tests
2020-03-23 12:40:38 +01:00
Atgeirr Flø Rasmussen
1e84624ea7
Add override spec to silence warnings.
2020-03-23 11:57:59 +01:00
Atgeirr Flø Rasmussen
652c7d239b
Simplify ptr(), avoiding a template template parameter.
...
Since unique_ptr<T, Deleter> takes two arguments it cannot strictly
speaking be used via a template template parameter that takes one,
even though the second has a default. GCC allows this anyway, but
not clang.
2020-03-23 11:55:45 +01:00
Markus Blatt
3d04df9759
Merge pull request #2493 from blattms/fix-cuda-version-fix
...
Check for cuda 9.0 or newer as we are supposed to.
2020-03-23 11:11:35 +01:00
Markus Blatt
1f876e693b
Check for cuda 9.0 or newer as we are supposed to.
...
9.7 was a local change to see whether deactivating CUDA for old
version works.
Completes #2488
2020-03-23 11:10:17 +01:00
Arne Morten Kvarving
3b64e9875c
changed: use serialization objects from opm-common in tests
...
this allows us to macrofy the test instantations
2020-03-23 09:57:54 +01:00
Markus Blatt
53d636a3b1
Merge pull request #2488 from blattms/fix-cuda-version-check
...
Fix CUDA version check to allow versions 9.0 or newer.
2020-03-23 09:45:20 +01:00
Markus Blatt
03b2c44dce
Prevent some unnecessary copies.
2020-03-23 09:40:14 +01:00
Markus Blatt
b41b449c7d
Removed suplicated code for calculating quasi impes weights.
...
Maintaining two versions is just to error prone.
2020-03-23 09:40:14 +01:00
Markus Blatt
c14bf078a1
Make ParallelOverlappingILU0 updateable & use it to construct ILU0/n
...
This should force the flexible solver approach to recalculate the
decomposition during update.
Closes #2490
2020-03-23 09:39:51 +01:00
Joakim Hove
81b9947e92
Merge pull request #2489 from joakim-hove/serialize-pyaction
...
Update serialization testing with PyAction
2020-03-20 18:38:34 +01:00
Joakim Hove
8cfed1ec13
Update serialization testing with PyAction
2020-03-20 17:24:42 +01:00
Markus Blatt
74051ebf01
Fix CUDA version check to allow versions 9.0 or newer.
2020-03-20 14:36:24 +01:00