OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,258 Commits 24 Branches 102 Tags 90 MiB
0f273ebdf6
Commit Graph

7117 Commits

Author SHA1 Message Date
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
Joakim Hove
58717905ee Use only wconnection transmissibility without WellPI scaling 2020-03-31 18:12:29 +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
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
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
c8524a139e Add build time to flow startup banner 2020-03-31 08:42:24 +02: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
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
Atgeirr Flø Rasmussen
1e84624ea7 Add override spec to silence warnings. 2020-03-23 11:57:59 +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
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
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
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
T.D. (Tongdong) Qiu
947f419ef8 Fixed memory issues when cusparseSolver is disabled by unsupported blocksize 2020-03-19 14:09:42 +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
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
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
Arne Morten Kvarving
aa7eba1f98 remove old serialization support for DynamicState 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
e71670e231 remove old serialization support for OrderedMap 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
777e2f7683 remove old serialization support for VFPProdTable 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
58b0ed66fc remove old serialization support for VFPInjTable 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
d905e0f037 remove old serialization support for UnitSystem 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
02af915917 remove old serialization support for Dimension 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
37ab44d805 remove old serialization support for UDAValue 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
eef690f910 remove old serialization support for Group 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
714caef9c6 remove old serialization support for GroupProductionProperties 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
d496b93cfa remove old serialization support for GroupInjectionProperties 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
c8b14dcbb1 remove old serialization support for IOrderSet 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
2c41427f3b remove old serialization support for Well 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
eda5fc2d33 remove old serialization support for WellType 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
9aa464c4ac remove old serialization support for WellSegments 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
fde0e42e8d remove old serialization support for Segment 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
e53584ffec remove old serialization support for Valve 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
2bb892139d remove old serialization support for SpiralICD 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
41950690fd remove old serialization support for WellInjectionProperties 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
0cb3e1426c remove old serialization support for WellProductionProperties 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
a35ba93629 remove old serialization support for WellConnections 2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
8cd3d3c9b9 remove old serialization support for Connection 2020-03-19 09:31:08 +01:00
Arne Morten Kvarving
1a4f8f861f remove old serialization support for WellTracerProperties 2020-03-19 09:31:08 +01:00
Arne Morten Kvarving
2e34b91b53 remove old serialization support for WellBrineProperties 2020-03-19 09:31:08 +01:00
Arne Morten Kvarving
8a0959b026 remove old serialization support for WellPolymerProperties 2020-03-19 09:31:08 +01:00
Arne Morten Kvarving
99898ad79e remove old serialization support for WellFoamProperties 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
d6c49bf801 remove old serialization support for WellEconProductionLimits 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
d791636919 remove old serialization support for WellGuideRate 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
c4e3d9c806 add necessary explicit template instantations 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
eb53bb0db9 remove old serialization support for DynamicVector 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
faffa0678b remove old serialization support for Deck 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
81663e2942 remove old serialization support for Action::Actions 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
781b11fb07 remove old serialization support for Action::Condition 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
18a1e735fb remove old serialization support for Action::Quantity 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
5c89c48554 remove old serialization support for Action::AST 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
2c1d45ea54 remove old serialization support for ActionX 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
c5f36bd7cc remove old serialization support for DeckKeyword 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
a289008c96 remove old serialization support for Location 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
96cadcc43a remove old serialization support for DeckRecord 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
d9ab0e7522 remove old serialization support for ASTNode 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
195bb87712 remove old serialization support for DeckItem 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
32176b90ef remove old serialization support for GConSump 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
486c9ce8dd remove old serialization support for GConSale 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
52bd4cb81c remove old serialization support for GuideRateConfig 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
1d254914e1 remove old serialization support for GuideRateModel 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
7389959b88 remove old serialization support for WListManager 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
778f1cfb8e remove old serialization support for WellTestConfig 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
a936523165 remove old serialization support for MessageLimits 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
07d91add01 remove old serialization support for Tuning 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
9071072565 remove old serialization support for Events 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
e5e8c0c516 remove old serialization support for OilVaporiationProperties 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
c00d2f2cb3 remove old serialization support for TimeMap 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
bbf3b80b3a remove old serialization support for RFTConfig 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
6d74eb8e88 remove old serialization support for RestartConfig 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
e87ec7b5a4 remove old serialization support for TimeStampUTC 2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
563e1d9fbc
Merge pull request #2482 from joakim-hove/remove-removed 
Remove numRemoved member from WellConnections
 2020-03-19 09:29:02 +01:00
Bård Skaflestad
3b67bee169
Merge pull request #2476 from blattms/rely-on-persistent-local-id 
Rely on local ids being persistent across grid modifications
 2020-03-18 22:51:06 +01:00
T.D. (Tongdong) Qiu
fdcf46792a BdaBridge and WellContributions are only included and compiled when CUDA is found 2020-03-18 19:03:14 +01:00
Joakim Hove
006b87050d Remove numRemoved member from WellConnections 2020-03-18 15:41:21 +01:00
T.D. (Tongdong) Qiu
d29b6a6e5e Removed unnecessary line continuation chars. Merged unsupported cases in switch 2020-03-18 15:14:38 +01:00
T.D. (Tongdong) Qiu
009b5076a4 Removed CPU implementation of WellContributions 2020-03-18 15:08:48 +01:00
Joakim Hove
805236ee22 Move Connection ordering attribute from Well to WellConnections 2020-03-18 14:28:29 +01:00
T.D. (Tongdong) Qiu
ce73337769 Disable GPU when using MPI 2020-03-18 13:53:40 +01:00
Arne Morten Kvarving
f12c83bd8e remove old serialization support for TableManager 2020-03-17 12:29:35 +01:00
Arne Morten Kvarving
258fed1bd5 remove old serialization support for Tabdims 2020-03-17 12:29:16 +01:00
Arne Morten Kvarving
8a3cb58981 remove old serialization support for Aqudims 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
6c8ff61c1c remove old serialization support for PlyvmhTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
05d02dcd66 remove old serialization support for TableSchema 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
7f2f1309bd remove old serialization support for TableContainer 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
198ea25dcb remove old serialization support for TableColumn 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
1459b8bfd1 remove old serialization support for StandardCond 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
9002949707 remove old serialization support for SolventDensityTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
c409f7a084 remove old serialization support for SkprpolyTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
d9e28a7129 remove old serialization support for SimpleTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
4ad1353e53 remove old serialization support for RocktabTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
44cab76c57 remove old serialization support for Rock2dtrTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
cda171ff47 remove old serialization support for Rock2dTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
6f070e6bcf remove old serialization support for Regdims 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
2784dc5800 remove old serialization support for PvtgTable, PvtoTable, PvtxTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
5c5afb1b4a remove old serialization support for PvtwsaltTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
cfe091ce1e remove old serialization support for PolyInjTable, SkprwatTable, PlymwinjTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
937a27471b remove old serialization support for PlyshlogTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
3a440a5388 remove old serialization support for JFunc 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
e46cd524e4 remove old serialization support for WatdentTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
d76769d738 remove old serialization support for ViscrefTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
b1b3223f83 remove old serialization support for TlmixparTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
1f952e214c remove old serialization support for Stone1exTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
7820a887d4 remove old serialization support for ShrateTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
da136522ba remove old serialization support for PlmixparTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
5feeedaacd remove old serialization support for PvcdoTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
775e5a4802 remove old serialization support for RockTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
46c2144275 remove old serialization support for PvtwTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
720b305ef2 remove old serialization support for DensityTable 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
92dd3314d7 remove old serialization support for Eqldims 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
1d279ac245 remove old serialization support for DenT 2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
a3398d58d2 remove old serialization support for ColumnSchema 2020-03-17 12:27:59 +01:00
Markus Blatt
5fc248f786 Rely on local ids being persistent across grid modifications 
as the issue in CpGrid was fixed, recently.
 2020-03-17 12:26:30 +01:00
Arne Morten Kvarving
dc21682b3e remove old serialization support for BrineDensityTable 2020-03-17 11:41:07 +01:00
Arne Morten Kvarving
c9f810e18e remove old serialization support for AquiferConfig 2020-03-17 11:41:07 +01:00
Arne Morten Kvarving
4a34e7336c remove old serialization support for Aquifetp 2020-03-17 11:41:07 +01:00
Arne Morten Kvarving
52508559bb remove old serialization support for AquiferCT 2020-03-17 11:41:07 +01:00
Arne Morten Kvarving
dca5b06045 remove old serialization support for Aquancon 2020-03-17 11:41:07 +01:00
Arne Morten Kvarving
6ce41ba87b remove unused template 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
327ae5ce11 remove old serialization support for UDQParams 2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
d7cfb92edc remove old serialization support for UDQCOnfig 2020-03-16 20:52:17 +01:00