OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,060 Commits 31 Branches 117 Tags
affeb9361ca34db90bb67436e4c20aad4e32b37f
Commit Graph
11060 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad affeb9361c Merge pull request #2515 from blattms/add-missing-comm-headers 
[FlexibleSolver] Added missing headers determine IsComm.
 2020-04-02 18:48:12 +02:00
Markus Blatt 20f26bffbf fixup! [FlexibleSolver] Added missing headers determine IsComm. 2020-04-02 17:16:17 +02:00
Markus Blatt 9ce008ef7d [FlexibleSolver] Added missing headers determine IsComm. 
Seems needed for some compilers
 2020-04-02 17:10:43 +02:00
Atgeirr Flø Rasmussen 0c8ce54b71 Merge pull request #2498 from blattms/cherry-pick-hnil-flexible-clean-interface-rebased 
Cleaned up flexible solver improvements.
 2020-04-02 15:28:10 +02:00
Bård Skaflestad 74368c5f98 Merge pull request #2452 from blattms/use-region-temperature-cleaned 
Use correct region temperature when calculating RS/RV
 2020-04-02 15:08:53 +02:00
Markus Blatt e8145656de Merge pull request #2512 from alfbr/enable-owner-first 
Enable owner first ordering by default
 2020-04-02 13:07:48 +02:00
Alf Birger Rustad 62f5ba95b4 Enable owner first ordering by default 2020-04-01 12:58:59 +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
Markus Blatt a8184df3c2 Corrected expected exception type in PreconditionerFactory test 2020-03-31 16:49:37 +02:00
Markus Blatt 2c432e09af Error when json file is requested for insufficient boost version. 2020-03-31 16:49:37 +02:00
Markus Blatt 589b70ff26 Correct errror message when json file is not specified. 2020-03-31 16:49:37 +02:00
Markus Blatt 910ecdb78d Addedmissing space. 2020-03-31 16:49:37 +02:00
Markus Blatt b16f635b90 Deleted commented out code. 2020-03-31 16:49:37 +02:00
Markus Blatt a72ab9d283 Fixed typo and reworded. 2020-03-31 16:49:37 +02:00
Markus Blatt 2fc2703aba Use special default for LinearSolverMaxIter for CPR and honor CprMaxEllIter 2020-03-31 16:49:37 +02:00
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
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