Atgeirr Flø Rasmussen
859db45e45
Merge pull request #2590 from totto82/fixSolventRein
...
Fix solvent reinjection when different reinjection group is given
2020-05-05 11:36:50 +02:00
Tor Harald Sandve
f33737afc4
Fix solvent reinjection when different reinjection group is given
2020-05-05 10:46:49 +02:00
Arne Morten Kvarving
fa5c4a8573
Merge pull request #2586 from atgeirr/fix-tag-for-init
...
Ensure that the typetag used for initialization is correct.
2020-05-04 11:12:44 +02:00
Atgeirr Flø Rasmussen
f0b1ee76b8
Ensure that the typetag used for initialization is correct.
...
Without this, properties set in the static variants of flow such as
flow_blackoil_dunecpr.cpp will be honored in the run. However, the
text for '--help' and the property printout in the .DBG file will not
reflect the true type tag, but the default.
This bug was added during the recent refactoring of all Flow variants
to use the same initialization and setup code.
2020-05-04 08:52:49 +02:00
Joakim Hove
da5042c538
Update connection <-> segment implementation
2020-04-30 14:53:35 +02:00
Joakim Hove
926e904e90
Instantiate std::optional<double> and std::optional<std::string>
2020-04-29 16:26:58 +02:00
Joakim Hove
ec647bcc16
Merge pull request #2574 from joakim-hove/serialize-optional
...
Add support for serializing std::optional
2020-04-29 10:48:43 +02:00
Markus Blatt
ca744231b1
Removes unused member istlSolver_ and method to get it from BlackoilModelEbos
...
It is not used since quite some time and tends to confuse me.
2020-04-28 16:46:17 +02:00
Joakim Hove
40d7cd4381
Add support for serializing std::optional
2020-04-28 16:25:17 +02:00
OPMUSER
163ce3b613
Update Missing Features with PERMFACT
2020-04-28 13:39:40 +02:00
Bård Skaflestad
9756edce50
Remove Unused 'currentControl' Variable
2020-04-27 21:29:10 +02:00
Atgeirr Flø Rasmussen
14bde098ce
Merge pull request #2570 from blattms/fix-prec-factory-dune-master
...
Complete future-proofing ILU usage in the preconditioner factory.
2020-04-27 16:37:27 +02:00
Atgeirr Flø Rasmussen
06e5e6b6ac
Merge pull request #2565 from totto82/avoidOscNupcol
...
use nupcol to avoid oscillation between group controls
2020-04-27 16:02:32 +02:00
Atgeirr Flø Rasmussen
6684cd7cb3
Merge pull request #2564 from totto82/fixGCONSALE
...
Fix GCONSALE
2020-04-27 15:59:29 +02:00
Markus Blatt
f03b56c261
Complete future-proofing ILU usage in the preconditioner factory.
...
SeqILU0/SeqILU0 are removed in master and one should use SeqILU
2020-04-27 15:52:43 +02:00
Joakim Hove
750070fbd7
Remove VISCREF from MissingFeatures
2020-04-27 10:30:50 +02:00
Tor Harald Sandve
33afb332fa
use nupcol to avoid oscilation between group controls
2020-04-27 10:29:00 +02:00
OPMUSER
c62318387d
Update Missing Features with HMMULTSG
...
HMMULTSG
2020-04-25 18:19:31 +02:00
OPMUSER
04295871f4
Update MissingFeatures.cpp
...
Missing features fixed typo SCPDIMS to SCDPDIMS, and added RWGSALT.
2020-04-25 18:19:31 +02:00
Tor Harald Sandve
a046977946
Fix GCONSALE
...
1) Only check GCONSALE limits at the end of a timestep. NB. The simulator still throws if some of the limits are violated
2) BUGFIX: don't remove gas consumption twice
2020-04-24 16:10:07 +02:00
Atgeirr Flø Rasmussen
a720bf9942
Add logging of linear solver parameter tree.
2020-04-24 14:52:04 +02:00
Joakim Hove
0773d07df5
Missing features ( #2562 )
...
Updates to the list of missing features
2020-04-24 13:08:55 +02:00
Atgeirr Flø Rasmussen
c4e020c179
Merge pull request #2556 from totto82/test_atg
...
Fix how the group reduction works
2020-04-24 11:13:22 +02:00
Tor Harald Sandve
e9476e116e
make sure the current_rate is added at the right level
2020-04-23 20:54:59 +02:00
Tor Harald Sandve
3b479af9c4
Fix the fix on how the group reduction works
2020-04-23 09:45:16 +02:00
Atgeirr Flø Rasmussen
0df3a96fa6
Fix how group rate reductions work.
2020-04-23 09:39:03 +02:00
OPMUSER
9d32980821
Added the Water Vaporization keywords to Missing-Features
...
Added the following Water Vaporization keywords to Missing-Features: PRESALT, PVTGW, PVTGWO, SALTPVD, SALTSOL, and VAPWAT
2020-04-21 16:39:51 +08:00
OPMUSER
4906a3e69e
Added ADSORP and CPR to Missing-Features
...
Added ADSORP and CPR to Missing-Features
2020-04-21 16:30:54 +08:00
OPMUSER
048d21fdab
Update MissingFeatures.cpp
...
Changed DIFFMTHT- to DIFFMTH-
2020-04-21 14:29:03 +08:00
OPMUSER
a8dba1a726
Update Missing-Features keywords
...
Added GECONT, changed RIVRDIM to RIVRDIMS, added RPTSOL, RSSPEC, changed SCPDIMS to SCDPDIMS,
2020-04-21 14:05:46 +08:00
Cintia Goncalves Machado
2ac17103f8
Remove BDENSITY
2020-04-20 17:44:40 +02:00
Bård Skaflestad
9625d0b48c
Merge pull request #2531 from GitPaean/msw_keywords
...
adding the summary output for several pressure drop values for MSW
2020-04-17 20:54:49 +02:00
Kai Bao
954e5e769a
addressing comments from OPM/opm-common#1695
2020-04-17 14:34:48 +02:00
Joakim Hove
6260bb7851
Update api for checking availability for group control
2020-04-17 13:03:56 +02:00
Joakim Hove
11d65f41d2
Add keywords to the list of missing features
2020-04-17 08:56:10 +02:00
Kai Bao
251c09a288
adding the several pressure drop values to WellState for MSW
...
segpress_ and segrates_ are renamed to help the name style.
2020-04-17 00:38:38 +02:00
Atgeirr Flø Rasmussen
a1091bd718
Stop simulating if the schedule has set an exit condition.
...
The program will return the value set in the EXIT keyword.
2020-04-16 15:42:17 +02:00
Atgeirr Flø Rasmussen
88525f7c39
Merge pull request #2516 from hakonhagland/refactor_flow_run
...
Refactor main() in flow.cpp.
2020-04-16 13:28:03 +02:00
Atgeirr Flø Rasmussen
07d9ec135b
Make Main a non-template class again, simplify.
2020-04-16 11:35:01 +02:00
Håkon Hægland
1932e42cbb
Fixed minor typo.
2020-04-16 01:22:07 +02:00
Håkon Hægland
954d32c3ab
Refactor main_() into initialize_() and dispatch_().
...
For the Python interface's usage (as opposed to the usage by e.g.
flow.cpp), we do not neccessarily want to run the whole simulation by
calling run(), it is also useful to just run one report step at a time.
According to these different usage scenarios, main_() is refactored into
initialize_() and dispatch_() as a preparatory step for implementing the
Python interface (to be presented in a later PR).
2020-04-16 00:21:10 +02:00
Håkon Hægland
3f97561380
Fixup Deck, EclipseState, Schedule, ....
...
Fixup usage of Deck, EclipseState, Schedule, and SummaryConfig to take
into account the class variables deck_, eclipseState_, schedule_, and
summaryConfig_. These variables might initially be empty (nullptr) when
the object is constructed by calling Main(argc, argv) from flow.cpp,
flow_blackoil_dunecpr.cpp, flow_onephase.cpp, or
flow_onephase_energy.cpp. However, when Opm::Main is constructed from the
Python interface code (to be implemented in a later PR) by using the
constructor Main(argc, argv, deck, eclispeState, schedule, summaryConfig)
the variables will not be intially empty.
2020-04-15 23:49:44 +02:00
Markus Blatt
057a0ceeeb
Removes stale CPR headers that have been superseeded.
...
No need to drag them along and confuse people.
2020-04-15 21:38:28 +02:00
Håkon Hægland
09230808e0
Adapting Main.hpp to the Python interface.
...
Adapting Main.hpp to be called from Python interface, Part 1.
Building on PR #2521 and PR #2535 , we gradually adapt Main.hpp for
being called from the Python interface (to be committed in a later PR)
to the flow executable. This PR introduces a new constructor for class
Opm::Main that takes a Deck, EclipseState, Schedule, and SummaryConfig
as arguments. It also introduces some new class variables that will be
useful when the main_() method is split up (in a later commit).
2020-04-15 20:45:20 +02:00
Atgeirr Flø Rasmussen
302474ade6
Merge pull request #2535 from hakonhagland/flow_tag_new_try
...
Merge flow_tag.hpp into Main.hpp (new try)
2020-04-15 13:29:59 +02:00
Håkon Hægland
de53c98605
Always print banner.
...
Remove the #ifdef OPM_FLOW_MAIN guard on printBanner() as it makes sense
to print the banner in either case.
2020-04-14 14:53:48 +02:00
Håkon Hægland
efa6c54096
Avoid a preprocessor directives.
...
Some of the functions in Main.hpp do not need to be guarded by a
\#ifndef OPM_FLOW_MAIN
Since they are template functions, they will not be included in the
code unless explicitly instantiated.
2020-04-14 14:53:48 +02:00
Håkon Hægland
3624725885
Merge flow_tag.hpp into Main.hpp.
...
Addresses the comments in PR #2521 regarding code duplication in
Main.hpp and flow_tag.hpp. This PR merges the code in flow_tag.hpp
into Main.hpp such that flow_tag.hpp can be eliminated (will be done
in the next PR).
2020-04-14 14:53:48 +02:00
Arne Morten Kvarving
ca697acc60
remove unused lambda parameter
...
quells a compiler warning
2020-04-14 14:17:41 +02:00
Joakim Hove
fcdca0f9e5
The "default" Schedule constructor has Python argument
2020-04-10 07:53:45 +02:00
Tor Harald Sandve
60bb9e4eaa
Merge pull request #2505 from atgeirr/group-controls-at-wells-cleaned
...
Group controls at wells (cleaned)
2020-04-08 12:29:30 +02:00
Atgeirr Flø Rasmussen
e7e4cf6f20
Silence warnings and fix whitespace.
2020-04-08 10:41:20 +02:00
Joakim Hove
fc5875d981
Remove keywords SEPARATE, RUNSUM and DATES from MissingKeywords list
2020-04-07 08:31:22 +02:00
Joakim Hove
76111897a6
MOve String utility in opm-common
2020-04-04 16:28:16 +02:00
Håkon Hægland
8c1a951e09
First PR in a splitting up of PR #2516 .
...
According to private discussion with @joakim-hove PR #2516 is splitted into
smaller parts to facilitate review and a quicker merge into master.
As mentioned in PR #2516 , main() in flow.cpp is refactored to address
the comments on PR #2127 and as preparation for implementing the Python
bindings described in PR #2403 .
2020-04-03 14:53:45 +02:00
Tor Harald Sandve
97876530e3
include wells under individual control when accumulating guiderates
2020-04-03 10:03:05 +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
Tor Harald Sandve
70b7bed057
dont check if group has converged in solveWellEq
2020-04-02 13:57:38 +02:00
Atgeirr Flø Rasmussen
f30ddffdb7
Split WellGroupHelpers to cpp/hpp.
...
Also changed namespace name.
2020-04-02 13:57:38 +02:00
Tor Harald Sandve
21b98b5573
Avoid negative targets and currentWellRates
2020-04-02 13:57:38 +02:00
Atgeirr Flø Rasmussen
d2dac6c19c
Bugfix: rates in assembleControlEqProd() are by canonical phases, not active.
2020-04-02 13:57:38 +02:00
Atgeirr Flø Rasmussen
a8107afc11
Fix handling of FIELD for injector groups.
2020-04-02 13:57:38 +02:00
Tor Harald Sandve
66931b9cb7
Various fixes and refactoring.
...
- Communicate all well rates.
- When changing controls, modify rates to satisfy failed constraint.
- Ensure targets are positive.
- Always solve for potentials for MSW (temporary fix).
2020-04-02 13:57:05 +02:00
Atgeirr Flø Rasmussen
3a5a8c23df
Use generic control equation implementation.
2020-04-02 13:54:58 +02:00
Atgeirr Flø Rasmussen
d703699e62
Avoid recursion above the FIELD group.
2020-04-02 13:54:58 +02:00
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
Arne Morten Kvarving
e165bd56a5
remove old serialization support for UDQIndex
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
18365bf709
remove old serialization support for UDQDefine
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
878885e61f
remove old serialization support for UDQAssign
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
89fcc588e8
remove old serialization support for UDQActive
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
c07fa535bd
remove old serialization support for UDQASTNode
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
30535b472a
remove old mpi serialization support for Runspec
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
e504f68b72
remove old mpi serialization support for SatFuncControls
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
00da8bcaaf
remove old mpi serialization support for Actdims
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
a701c9267e
remove old mpi serialization support for EclHysterConfig
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
808b7cc7f4
remove old mpi serialization support for WellSegmentDims
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
13c8aa6ddb
remove old mpi serialization support for Welldims
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
138673f69c
remove old mpi serialization support for EndpointScaling
2020-03-16 20:52:17 +01:00
Arne Morten Kvarving
6fde65439d
remove old serialization support for Phases
2020-03-16 14:23:40 +01:00
Arne Morten Kvarving
d3115c7afd
Merge pull request #2468 from akva2/serialize_internal_eclstate_part3
...
Internal serialization in EclipseState - part 3
2020-03-16 14:21:50 +01:00
Joakim Hove
65f4635e20
Merge pull request #2464 from joakim-hove/relperm-diag-no-deck
...
Relperm diag no deck
2020-03-16 13:28:44 +01:00
Arne Morten Kvarving
d1b04944d7
remove old serialization support for EclipseConfig
2020-03-16 13:00:02 +01:00
Arne Morten Kvarving
4d5d25bcb6
remove old serialization support for IOConfig
2020-03-16 13:00:02 +01:00
Arne Morten Kvarving
fbe739ec9b
remove old serialization support for InitConfig
2020-03-16 13:00:02 +01:00
Arne Morten Kvarving
0dfdb29851
remove old serialization support for FoamConfig, FoamData
2020-03-16 13:00:02 +01:00
Arne Morten Kvarving
542a10e426
remove old serialization support for Equil, EquilRecord
2020-03-16 13:00:02 +01:00
T.D. (Tongdong) Qiu
d067c08be7
Added header to CMake_files, updated copyright year
2020-03-16 12:57:35 +01:00
Arne Morten Kvarving
edca0f7da0
add necessary explicit template instantations
2020-03-16 11:53:51 +01:00
Arne Morten Kvarving
d342ef5c5c
remove old serialization support for Fault, FaultCollection, FaultFace
2020-03-16 11:44:13 +01:00
Arne Morten Kvarving
0212c5e9be
remove old serialization support for TransMult
2020-03-16 11:44:13 +01:00
Arne Morten Kvarving
aad289841a
remove old serialization support for MULTREGTScanner
2020-03-16 11:44:13 +01:00
Arne Morten Kvarving
e6a117abec
changed: clear string, do not assert on it being empty
...
causes issues when deserializing default init classes
with values for string members.
2020-03-16 10:49:42 +01:00
Arne Morten Kvarving
fa3cccdd64
remove old serialization support for SimulationConfig
2020-03-16 10:49:42 +01:00
Arne Morten Kvarving
be74b0903a
remove old serialization support for RockConfig
2020-03-16 10:49:42 +01:00
Arne Morten Kvarving
855baf2cb6
remove old serialization support for BCConfig
2020-03-16 10:49:42 +01:00
Arne Morten Kvarving
33cf3826aa
remove old serialization support for ThresholdPressure
2020-03-16 10:49:42 +01:00
Arne Morten Kvarving
cdb19da0bd
remove old serialization support for GridDims
2020-03-16 10:49:41 +01:00
Arne Morten Kvarving
a576c786dd
remove old serialization support for NNC and EDITNNC
2020-03-16 10:49:41 +01:00
Jostein Alvestad
6a659339f1
various corrections to code and coding style
2020-03-16 10:39:56 +01:00
Jostein Alvestad
3f81d68c0a
corrections due to rebase to current master
2020-03-16 10:39:54 +01:00
Jostein Alvestad
4006319ff7
further changes to report currentStatusGroupControls to Summary
2020-03-16 10:39:52 +01:00
Jostein Alvestad
0dcacb41d4
intial changes to add current group controls to summary
2020-03-16 10:39:51 +01:00
Arne Morten Kvarving
9cf815ab95
remove unused templates
2020-03-16 08:20:44 +01:00
Arne Morten Kvarving
1e7816a194
remove unnecessary includes
2020-03-16 08:20:44 +01:00
Arne Morten Kvarving
38023fac21
changed: use EclMpiSerializer for Schedule
2020-03-16 08:20:44 +01:00
Kai Bao
3af1d852ef
removing WSEGVALV from MissingFeatures.cpp
2020-03-13 22:18:29 +01:00
Markus Blatt
a45c278c4a
Merge pull request #2458 from blattms/use-indices-for-modifying-matrices
...
Do not use local id set to index matrices.
2020-03-13 20:10:17 +01:00
Markus Blatt
1c2d3fbcc7
Do not use local id set to index matrices.
...
That the local ids were consecutive and starting from 0 was just
a coincidence and they should never be used to access linear systems
or vectors. This commit fixes this by using the correct mappers instead.
Note the we removed some computations from the constructor of
ISTLSolverEbosCpr as it inherits from ISTLSolverEbos and the operations
already happnen in constructor of the base class.
2020-03-13 17:56:49 +01:00
Arne Morten Kvarving
3180974e63
Merge pull request #2471 from akva2/fix_no_mpi
...
fixed: do not build ParallelRestart test without MPI
2020-03-13 17:53:59 +01:00
Arne Morten Kvarving
c40c733a57
fixed: build without MPI
2020-03-13 17:52:37 +01:00
Markus Blatt
e65f6c02bb
Merge pull request #2220 from andrthu/owners-first
...
[For testing] Enable "owners first" ordering. Altered SpMV, SP and ILU.
2020-03-13 17:48:22 +01:00
andrthu
3d0d0f9624
Remove GhostLast ILU
2020-03-13 15:03:31 +01:00
T.D. (Tongdong) Qiu
581cbc6a3e
cusparseSolver can now apply wellcontributions separately, so --matrix-add-wellcontributions=true is not required anymore
2020-03-13 14:21:59 +01:00
Arne Morten Kvarving
d8028dfa1b
remove old serialization support for SummaryNode
2020-03-13 14:09:17 +01:00
Joakim Hove
8473aa38e5
Remove Deck argument to RelpermDiagnostic
2020-03-13 08:54:30 +01:00
Arne Morten Kvarving
a8b3d05c52
changed: move the serialization template definitions for generic scalars to the header
...
this to avoid having to explicitly instance the templates for
various enums when serialization functions are moved into classes
2020-03-12 10:42:49 +01:00
Bård Skaflestad
1af796257c
Merge pull request #2348 from goncalvesmachadoc/patch-1
...
Add missing keywords to list
2020-03-11 15:40:02 -05:00
Bård Skaflestad
21dc2620fd
Merge pull request #2453 from akva2/eclstate_serialize
...
drop serialization from ParallelEclipseState
2020-03-11 12:15:46 -05:00
andrthu
c91eb330d3
remove 2.6 and move ownerFirst in lb
2020-03-11 12:42:55 +01:00
andrthu
866a661255
New owners-first based linear algebra operations (SoMV, SP and ILU.apply).
2020-03-11 12:41:38 +01:00
Arne Morten Kvarving
5b457cbbd6
Merge pull request #2446 from blattms/use-compressed-in-initstateequil.hh
...
Autocreate parallel fieldprops and use compressed ones in initstateequil.hh
2020-03-11 08:14:21 +01:00
Bård Skaflestad
c53d8c58f7
Merge pull request #2450 from akva2/serializer_summaryconfig
...
use eclmpiserializer for SummaryConfig broadcast
2020-03-10 20:32:06 -05:00
Bård Skaflestad
8700ea1310
Merge pull request #2451 from akva2/followup_stonetype
...
update serialization for relocated KrModel
2020-03-10 07:58:43 -05:00
Arne Morten Kvarving
10af852d1e
drop serialization from ParallelEclipseState
...
now done in base class
2020-03-10 13:24:30 +01:00
Arne Morten Kvarving
a7e3a69d8f
Merge pull request #2449 from akva2/dynstate_general
...
put the specialized DynamicState serialization functions in normal hierarchy
2020-03-10 12:31:22 +01:00
Markus Blatt
04311f6337
Allow auto creation of field properties arrays in ParallelEclipseState.
...
There are field properties that can usually be queried even if they
are not explicitly specified in the input
file (e.g. PVTNUM). Unfortunately, the ParallelEclipseState cannot
forsee which of these will be queried at startup and after the
loadbalancing only the master process is able to auto creates
these (easily). Hence this commit uses a fall-back if an unstored
keyword is queried. In this case we use get_global-* to auto create
the keyword and use functions of the cartesian mapper to extract the
relevant values on the process.
Of course this temporarily wastes space and we might want to resort to
a more memory savy approach later.
2020-03-10 11:36:02 +01:00
Markus Blatt
f4876becfb
Improve exception handling in ParallelEclipseState::get_global-*
...
In particular we make sure that all processes throw on unknown
keywords.
2020-03-10 11:36:02 +01:00
Arne Morten Kvarving
a1e9e2a190
update serialization for relocated KrModel
2020-03-10 10:38:12 +01:00
Arne Morten Kvarving
e1bf6ed4a6
use eclmpiserializer for SummaryConfig broadcast
2020-03-10 10:01:26 +01:00
Arne Morten Kvarving
ab5ca03027
put the specialized DynamicState serialization functions in normal hierarchy
...
i am confident it is okay to do this in general now.
2020-03-10 09:57:47 +01:00
Arne Morten Kvarving
dd0f6dd517
changed: simplify eclmpiserializer
...
now users only have to implement a single method for
packsize/pack/unpack
2020-03-10 08:56:40 +01:00
Markus Blatt
1e65a1421b
Merge pull request #2448 from akva2/serialize_aquifer_config
...
fixed: serialize AquiferConfig
2020-03-10 08:37:22 +01:00
Joakim Hove
bb29ad1060
Merge pull request #2392 from joakim-hove/welltype
...
Add serialization for WellType
2020-03-09 16:40:35 +01:00
Atgeirr Flø Rasmussen
724adc31cb
Merge pull request #2436 from akva2/no_serialization_matman
...
No need to serialize MaterialLawManager any longer
2020-03-09 16:05:46 +01:00
Arne Morten Kvarving
0088073d05
fixed: serialize AquiferConfig
2020-03-09 15:58:55 +01:00
Joakim Hove
3ab0e570c7
Use WellType when serializing and constructing Well
2020-03-09 14:45:44 +01:00
Joakim Hove
69871fdefd
Add serialization for WellType
2020-03-09 14:45:44 +01:00
Joakim Hove
bbbf3c42fd
Merge pull request #2414 from joakim-hove/serialize-dimension
...
Update serialization of Dimension class
2020-03-09 13:28:15 +01:00
Arne Morten Kvarving
4ae82687cc
get rid of unused serialization methods
2020-03-09 11:23:12 +01:00
Arne Morten Kvarving
9dc3f926ba
Merge pull request #2433 from akva2/serialize_stonetype
...
update mpi serialization for Runspec
2020-03-09 11:21:40 +01:00
Arne Morten Kvarving
f24c8a3b2f
Merge pull request #2420 from akva2/drop_serialization
...
Drop unused serialization code
2020-03-09 09:56:35 +01:00
Arne Morten Kvarving
ee2c406575
update mpi serialization for Runspec
...
add stonetype
2020-03-09 09:55:48 +01:00
Markus Blatt
eea15e5659
Merge pull request #2417 from blattms/loadbalance-centroids
...
Also distribute the centroids when loadbalancing CpGrid.
2020-03-06 19:47:51 +01:00
Bård Skaflestad
a449b2e2e6
Merge pull request #2415 from akva2/vappars_supported
...
fixed: VAPPARS is supported, remove from unsupported features list
2020-03-06 07:40:41 -06:00
Markus Blatt
4c962e61d1
Also distribute the centroids when loadbalancing CpGrid.
...
They are attached to the cells as well and are now distributed
during CpGrid::loadBalance. Due to this change we also rename
FieldPropsDataHandle to PropsCentroidsDataHandle.
2020-03-06 14:09:32 +01:00
Markus Blatt
1b03b040a3
Merge pull request #2422 from blattms/fix-2406-without-mpi
...
Only compile FieldPropsDataHandle if MPI was found
2020-03-06 14:03:12 +01:00
Arne Morten Kvarving
49ace214ec
fixed: PLYSHLOG and ROCKTAB needs to be serialized as their actual types
...
if not we lose the extra info that is not part of the SimpleTable base
classes.
2020-03-06 13:54:57 +01:00
Arne Morten Kvarving
ab0b5dcec6
use normal shared ptrs
2020-03-06 13:54:57 +01:00
Arne Morten Kvarving
c3e3524753
add mpi serialization for RocktabTable
2020-03-06 13:54:57 +01:00