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
Markus Blatt
c0a82ff335
Merge pull request #2475 from Tongdongq/separate_wellcontributions_for_gpu
...
Separate wellcontributions for gpu
2020-03-20 12:14:06 +01:00
Arne Morten Kvarving
7775a665d0
Merge pull request #2485 from akva2/i_want_no_deck_dammit
...
fixed: double-parsing of the deck
2020-03-20 11:17:06 +01:00
T.D. (Tongdong) Qiu
ab2d9a8c76
Changed int idx to indicate which matrix is added to WellContributions to an enum
2020-03-20 10:04:58 +01:00
Joakim Hove
b5160008f2
Merge pull request #2487 from joakim-hove/connections-add-global-index
...
Add global index to Connection
2020-03-20 09:08:56 +01:00
Joakim Hove
91572522d6
Add global index to Connection
2020-03-20 08:17:00 +01:00
Bård Skaflestad
fda4a29c7e
Merge pull request #2459 from jalvestad/group_constraints_summary
...
Make available current Production/Injection Group Control parameters for use in Restart
2020-03-19 16:54:34 +01:00
T.D. (Tongdong) Qiu
75268f1166
Changed ISTLSolverEbos-BdaBridge usage. BdaBridge->solve_system() is not called when GPU is not selected or disabled
2020-03-19 16:08:29 +01:00
T.D. (Tongdong) Qiu
7f3f03f63d
Added check to prevent segfaults for unsupported welltypes
2020-03-19 16:06:49 +01:00
Arne Morten Kvarving
595f601b2c
fixed: double-parsing of the deck
...
externalDeck = nullptr -> internalDeck was parsed.
i have no idea why we have this external/internal deck in the first place.
2020-03-19 14:50:34 +01:00
Jostein Alvestad
35d5269ffa
removed unused object opm::data::Group from eclwriter.hh
2020-03-19 14:19:21 +01:00
T.D. (Tongdong) Qiu
947f419ef8
Fixed memory issues when cusparseSolver is disabled by unsupported blocksize
2020-03-19 14:09:42 +01:00
Markus Blatt
0970867e47
Merge pull request #2484 from akva2/janitoring
...
avoid potentially uninitialized warnings in serial
2020-03-19 13:07:08 +01:00
Arne Morten Kvarving
82c65f9f5d
Merge pull request #2483 from akva2/serialize_internal_schedule
...
Internal serialization in Schedule
2020-03-19 12:53:10 +01:00
T.D. (Tongdong) Qiu
04fe46a9da
Only accept CUDA 9.0 for the WellContributions kernel. Also removed unused variables
2020-03-19 11:46:57 +01:00
T.D. (Tongdong) Qiu
8223cd1db8
Simplified filling of WellContributions object. Added comments
2020-03-19 11:15:49 +01:00
Arne Morten Kvarving
42a2d22d89
avoid potentially uninitialized warnings in serial
...
this was actually broken by an upstream change from return-by-reference
to return-by-value, but we were lucky, the return value was
kept in memory until end of block it seems.
2020-03-19 10:14:04 +01:00
Arne Morten Kvarving
a2d840a5f7
changed: put eclipse state broadcast in separate compilation unit
...
to avoid compiling several times for each flow variant
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
4c5f9f2241
add doxy to eclmpiserializer
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
59d1ff9b88
updates in EclMpiSerializer to avoid explicit instances in serializer
...
now the serializer is 'standard', as in we only require basic types
+ stl containers. this should make the actual implementation pretty
pluggable. will ease replacing our serialization routines
with those in Dune 2.7 later.
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
9b545e58a4
remove old serialization support for pointers
2020-03-19 09:31:52 +01:00