OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-18 13:32:58 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,036 Commits 24 Branches 102 Tags 90 MiB
2c1df912fe
Commit Graph

11036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
2c1df912fe honor ilulevel for ParallelOverlappingILU0 2020-03-31 16:49:37 +02:00
Markus Blatt
9019a52937 Use enable_if on comm constructor parameter. 
As this is the one we want to check.
 2020-03-31 16:49:37 +02:00
Markus Blatt
b016a1a714 [FlexibleSolver] active CPR if UseCpr is true and adjust maxIter. 
If no LinearSolverConfiguration is specified but UseCpr is true we
use cpr_quasiimpess. If the user does not specify the maximum
iteration number we use 20 for cpr.
 2020-03-31 16:49:37 +02:00
Markus Blatt
74b958c258 Improves exceptions and message and resort to OPM_THROW for flexible solvers. 2020-03-31 16:49:37 +02:00
Markus Blatt
ff0d54d4ea Add sensible defaults for flexible solver properties... 
to prevent throwing. The get methods will throw if called without a
default value. This quite unfortunate and not very user friendly, as
there are many properties and the throwing will happen during the
linear solve and result in time step chopping.

This commit should prevent such throws and allow users to provide
jsdon files omitting some options.
 2020-03-31 16:49:37 +02:00
hnil
fce9f5e57c Manual cherrypicked improvements from f2ed2b6dc3 and 8aad027 
These were a bit hidden, but found. They add a few more customization
options and kamg as a sequential solver. The latter will be broken if
we use update, though.
 2020-03-31 16:49:37 +02:00
Markus Blatt
2e4824cbc7 Change default configuration to "ilu0". 
The previous was "file" which resulted in runtime errors
like

Program threw an exception: No linear-solver-configuration-json-file given for linear-solver-configuration=file
 2020-03-31 16:49:37 +02:00
Markus Blatt
dcb316f442 Make update method of preconditioners parameter-less again. 
Previously, it got passed the weights only needed for CPR.
Additionally those were passed with the parameter tree to the
update method and constructor.

Now the CPR constructor gets a function to use for recalculating
the weights and the property is not changed. Unfortunately this
means that the preconditioner creators of the factory get another
parameter.
 2020-03-31 16:49:37 +02:00
Markus Blatt
95a1e1ca0e Remove property tree parameter from PreconditionerWithUpdate::update 
It is not used, needed parameters can stored in the constructor, and
it made de design a bit suboptimal.
 2020-03-31 16:49:37 +02:00
Markus Blatt
70cff4b342 Refactor to a single function that calculates true impes weights. 
Two identical versions seemed like a lot of maintenance for no gain.
 2020-03-31 16:49:37 +02:00
hnil
2388a9b551 Added simple defaults for flexible solver: current options added ilu0, cpr_quasiimpes, cpr_trueimpes, file (genneal configuration) 
This commit 0c62c8442 cherry-picked and slightly cleaned up and
adapted to recent changes.
 2020-03-31 16:49:37 +02:00
hnil
90b22d8713 changed interface to only have minimal overhead using true impes. 
It gives overhead in constructor when linear system is created. No overhead if reuse is used.

This commit 141903a26 cherry-picked, cleaned and made compilable with
recent changes
 2020-03-31 16:49:37 +02:00
hnil
bfa859c099 changes to make true impes work with flexible solver 
Cherry-picked commit 7da5ce4fec33. Which got cleaned up
(deleted trailing whitespace, tabs) and made compilable with recent changes.
 2020-03-31 16:49:37 +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
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