Commit Graph

1258 Commits

Author SHA1 Message Date
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
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