Commit Graph

1258 Commits

Author SHA1 Message Date
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
Arne Morten Kvarving
719c008f22 add mpi serialization for PlyshlogTable 2020-03-06 13:54:57 +01:00
Arne Morten Kvarving
c4439976fe
Merge pull request #2421 from akva2/serialize_stone1ex
add mpi serialization for Stone1exTable
2020-03-06 13:52:54 +01:00
Markus Blatt
4baa1ba038 Only compile FieldPropsDataHandle if MPI was found 2020-03-06 13:05:29 +01:00
Arne Morten Kvarving
ce8036918b add mpi serialization for Stone1exTable 2020-03-06 12:12:53 +01:00
Arne Morten Kvarving
5728d19018 remove unused serialization methods 2020-03-06 11:55:41 +01:00
Markus Blatt
1f00870660
Merge pull request #2406 from blattms/loadbalance-fielprops
Use CpGrid::loadBalance to distribute the field properties.
2020-03-06 11:51:14 +01:00
Markus Blatt
77478a59eb Use CpGrid::loadBalance to distribute the field properties.
The created data handle for the communication could in theory be used
with other DUNE grids, too. In reality we will need to merge with the
handle that ALUGrid already uses to communicate the cartesian indices.

This PR gets rid of using the get_global_(double|int) method in
ParallelEclipseState and reduces the amount of boilerplate code there.
2020-03-06 09:48:04 +01:00
Arne Morten Kvarving
1c90a6bb00 serialize ShrateTable 2020-03-05 15:02:12 +01:00
Arne Morten Kvarving
c18beb40f3 Revert "add mpi serialization for PolymerConfig"
This reverts commit 5d0e9164f3.
2020-03-05 14:17:08 +01:00
Arne Morten Kvarving
21ef1103cc fixed: VAPPARS is supported, remove from unsupported features list 2020-03-05 13:41:09 +01:00
Joakim Hove
25b4b9ca18 Update serialization of Dimension class 2020-03-05 13:18:31 +01:00
Arne Morten Kvarving
0e6881ec6e add mpi serialization for PlyvmhTable 2020-03-05 13:11:57 +01:00
Arne Morten Kvarving
579dbe73c1 add mpi serialization for PlmixparTable 2020-03-05 13:05:27 +01:00
Arne Morten Kvarving
5d0e9164f3 add mpi serialization for PolymerConfig 2020-03-05 11:43:04 +01:00
Atgeirr Flø Rasmussen
390c7b21d4
Merge pull request #2402 from akva2/update_foam_serialization
changed: update FoamConfig serialization
2020-03-04 14:18:39 +01:00
Arne Morten Kvarving
cd0a686349 changed: update FoamConfig serialization 2020-03-04 10:53:57 +01:00
Arne Morten Kvarving
2e30487bff remove unused serialization support for Pvt classes 2020-03-04 10:19:19 +01:00
Arne Morten Kvarving
250a7fc33d add mpi serialization for TlmixparTable 2020-03-04 08:32:02 +01:00
Joakim Hove
93964b2fa8
Merge pull request #2389 from joakim-hove/move-wellinjector-enum
InjectorType enum is moved out from Well class
2020-03-03 16:36:40 +01:00
Arne Morten Kvarving
bb1f27bce6 add mpi serialization for StandardCond 2020-03-03 12:16:04 +01:00
Joakim Hove
9268bcb2ac InjectorType enum is moved out from Well class 2020-03-03 09:08:02 +01:00
Joakim Hove
2d31a192b8
Merge pull request #2371 from akva2/simplify_oilvap
adjust to upstream OilVaporization change
2020-03-03 08:22:42 +01:00
Arne Morten Kvarving
293612265e fix build without MPI 2020-02-28 13:03:16 +01:00
Arne Morten Kvarving
8dc9b21dba adjust to upstream OilVaporization change 2020-02-28 10:54:18 +01:00
Arne Morten Kvarving
05c0c4b6e8 Use the ParallelEclipseState and ParallelFieldPropsManager
with these in place, we now only parse the deck on the root process.
2020-02-28 10:26:55 +01:00
Arne Morten Kvarving
35de9fa53d add ParallelEclipseState and ParallelFieldProps
these are wrappers sitting on top of the EclipseState and
FieldPropsManager classes.

The former has some additional methods related to parallelism,
and the latter is a parallel frontend to the FieldPropManager which
only hold the process-local data (in compressed arrays).
2020-02-28 10:26:55 +01:00
Arne Morten Kvarving
55b5ebd3df add mpi serialization for GridDims 2020-02-28 10:24:00 +01:00
Atgeirr Flø Rasmussen
3aeab97aa1 Update for upstream changes to Group. 2020-02-27 15:15:35 +01:00
Arne Morten Kvarving
92303531b9 add mpi serialization for SolventDensityTable 2020-02-26 13:30:43 +01:00
Joakim Hove
c23dd11d6b
Merge pull request #2362 from joakim-hove/serialize-dent
Serialize density-temparture class DenT
2020-02-26 09:56:17 +01:00
Joakim Hove
d94943a741 Serialize new member TableManager::gas_comp_index 2020-02-25 08:04:28 +01:00
Joakim Hove
2ce7b35e69 Serialize density-temparture class DenT 2020-02-25 06:50:31 +01:00
Joakim Hove
87ddba6028 Simplify serialization of WellSegments 2020-02-22 10:49:41 +01:00
Markus Blatt
22d4e784d3
Merge pull request #2356 from akva2/boost_prune
Lessen boost usage
2020-02-21 13:15:03 +01:00
Joakim Hove
c239529565
Merge pull request #2353 from joakim-hove/aquifer-config
Add serialization for AquiferConfig
2020-02-20 08:25:20 +01:00
Joakim Hove
d3bfa83c7c
Merge pull request #2343 from joakim-hove/move-rstconfig
RestartConfig has moved from EclipseState to Schedule
2020-02-20 07:07:37 +01:00
Arne Morten Kvarving
c73c7bef55 avoid use of boost::lexical_cast 2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
bea2459c65 replace boost::optional with std::optional 2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
e262cf8d51 changed: use internal function to uppercase string 2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
4ba7d3a7bc changed: replace boost::any with std::any 2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
39f5e49289 remove unused boost include 2020-02-19 11:20:16 +01:00
Arne Morten Kvarving
d56b7e338d quell warning about unused local typedef
strictly speaking the gcc diagnostics are wrong, the typedef is actually
used once templates are invoked on the structs.
simply use the typedef in the structs itself to avoid the warning
like is done for other variants.
2020-02-19 10:15:07 +01:00
Joakim Hove
9c8d5946b4 Add POC for AquiferConfig can be used 2020-02-18 16:19:25 +01:00
Joakim Hove
86972dc494 Add serialization for AquiferConfig 2020-02-18 16:12:00 +01:00
Kai Bao
5568c73d2c
Merge pull request #2320 from joakim-hove/aquifer-refactor-aquancon
Aquifer refactor aquancon
2020-02-18 11:08:28 +01:00
Atgeirr Flø Rasmussen
3f2ca3283c
Merge pull request #2347 from akva2/disable_json_boost_1.48
disable json input for boost 1.48
2020-02-18 10:58:13 +01:00
Arne Morten Kvarving
abc439d336 remove last usage of boost::filesystem 2020-02-18 08:54:37 +01:00
Joakim Hove
980f6488b0 Serialize Aquifer datastructures 2020-02-18 07:13:30 +01:00
Joakim Hove
3a7f5799af Refactor Aquifer datastructures to follow opm-common
- Replace use of Base:: with this-> in derived classes
- Add AquiferInterface::size() utility functions
- Remove AquiferInterface::cell_idx_ member
2020-02-18 07:13:30 +01:00
Joakim Hove
5ad4936025 RestartConfig has moved from EclipseState to Schedule 2020-02-17 21:48:12 +01:00
Cintia Goncalves Machado
88ed7ed82d
Add missing keywords to list
Add keywords WEIR (Energy Injection Rate) and WEIR (Energy Injection Rate).
2020-02-17 16:50:05 +01:00
Arne Morten Kvarving
226a6cb434 disable json input for boost 1.48 2020-02-17 15:21:07 +01:00
Tor Harald Sandve
76682497e8
Merge pull request #2318 from akva2/fix_brine_module_init
fixed: call initFromDeck for Brine module
2020-02-17 14:17:17 +01:00
Arne Morten Kvarving
99c019a6bb adjust serialization of VFPProdTable 2020-02-17 10:50:55 +01:00
Arne Morten Kvarving
649818730c adjust serialization for VFPInjTable 2020-02-17 10:50:55 +01:00
Joakim Hove
150dc54e79
Merge pull request #2298 from totto82/muliple-group-inj-phases
Allow for multiple group injection phases
2020-02-14 10:31:45 +01:00
Atgeirr Flø Rasmussen
47e6b0d87d
Merge pull request #2340 from joakim-hove/remove-UDQFunctionTable-serialization
Remove serialization support for UDQFunctionTable and UDQFunction
2020-02-14 10:26:12 +01:00
Arne Morten Kvarving
301aa7a7cd
Merge pull request #2339 from atgeirr/fix-binary-op
Remove std::pointer_to_binary_function and silence a warning.
2020-02-14 10:26:03 +01:00
Joakim Hove
e366b4c9f4 Remove serialization support for UDQFunctionTable and UDQFunction 2020-02-13 17:19:12 +01:00
Kai Bao
53e118c31c
Merge pull request #2333 from joakim-hove/segment-remove-flag
Remove members from WellSegment class
2020-02-13 14:39:49 +01:00
Atgeirr Flø Rasmussen
2cbeff2aca Silence warnings. 2020-02-13 11:04:02 +01:00
Atgeirr Flø Rasmussen
83a5cf1f91 Do not use std::pointer_to_binary_function.
Removed from C++17.
2020-02-13 11:03:05 +01:00
Joakim Hove
3ff6279eea Remove unused members when serializing WellSegments 2020-02-13 08:47:24 +01:00
Joakim Hove
f886fdd128 Update enum used in ICD status 2020-02-12 14:48:26 +01:00
Tor Harald Sandve
a784ccc47d fix rebase 2020-02-11 11:18:21 +01:00
Arne Morten Kvarving
ac93e8e110 changed: use std::regex instead of boost::regex 2020-02-11 09:47:22 +01:00
Atgeirr Flø Rasmussen
5fe48dab8b
Merge pull request #2327 from akva2/bump_dune
Bump required dune version to 2.6
2020-02-11 09:41:44 +01:00
Tor Harald Sandve
052f25636c adding blank lines 2020-02-11 09:33:58 +01:00
Tor Harald Sandve
2d2ec82640 fix MPI 2020-02-11 09:33:58 +01:00
Tor Harald Sandve
e39e327451 fix 2p 2020-02-11 09:33:58 +01:00
Tor Harald Sandve
469ffa2cbe allow for multiple group injection phases 2020-02-11 09:30:19 +01:00
Tor Harald Sandve
a840c4f418
Merge pull request #2325 from dr-robertk/PR/async-output
Async output.
2020-02-11 09:07:06 +01:00
Arne Morten Kvarving
22a291a3af
Merge pull request #2331 from akva2/janitoring
changed: rename local typedef to avoid shadowing warning
2020-02-10 15:24:15 +01:00
Arne Morten Kvarving
96b2e97b15 changed: rename local typedef to avoid shadowing warning 2020-02-10 12:30:14 +01:00
Robert Kloefkorn
526f1f9bb1 [bugfix][AsyncOutput] Restore asynchronicity for output and make sure
that all output is written before the simulator is finalized.
2020-02-10 12:11:30 +01:00
Markus Blatt
11c1574405 Merge pull request #2316 from akva2/fix_bda_onephase
fixed: add explicit template instantation for blocksize 1
2020-02-10 11:23:06 +01:00
Joakim Hove
d17b21089f Use member variable in Aquifer code 2020-02-09 10:13:15 +01:00
Arne Morten Kvarving
cfa0904321 fixed: quell deprecation warnings with dune 2.7 2020-02-07 15:19:44 +01:00
Arne Morten Kvarving
d28ed77036 fixed: add explicit template instantation for blocksize 1
fixes linking of flow_onephase with bda/cuda enabled
2020-02-07 15:18:40 +01:00
Atgeirr Flø Rasmussen
d4419fedfb
Merge pull request #2283 from totto82/conditionalCheck
make group constrain check conditional
2020-02-07 15:02:04 +01:00
Joakim Hove
0e1a210ef2 Use std::pair<bool, double> for initial aquifer pressure 2020-02-07 12:32:09 +01:00
Joakim Hove
cb8a76d098 Use [i] instead of at(i) when accessing Aquifer container 2020-02-07 07:31:25 +01:00
Joakim Hove
e910ebe738 Aquifer accessor renamed 2020-02-07 07:31:25 +01:00
Joakim Hove
1c4021f0a3 Use TableManager in AquiferCT constructor 2020-02-07 07:31:25 +01:00
Arne Morten Kvarving
4978e72039 bump required dune version to 2.6
remove compatiblity code with older versions
2020-02-06 16:24:39 +01:00
Bård Skaflestad
115d1107f7 Add Parallel Serialization Support for CurrentControl
This commit adds support for serializing Opm::data::CurrentControl
between parallel processes.
2020-02-06 09:49:30 +01:00
Arne Morten Kvarving
0be763e6b6 add mpi serialization for ConstantCompressibilityBrinePvt 2020-02-05 20:24:56 +01:00
Arne Morten Kvarving
88eae71811 fixed: remove PVTWSALT from missing feature list 2020-02-05 12:23:15 +01:00
Arne Morten Kvarving
df62305673 update for simplified Tuning data structure in opm-common 2020-01-31 13:45:05 +01:00
Arne Morten Kvarving
abb6f22acc cleanup: use macro for explicit template instantations 2020-01-31 11:55:27 +01:00
Atgeirr Flø Rasmussen
066a6e5210
Merge pull request #1936 from GitPaean/support_wgr_wecon
Support WGR limit check for WECON
2020-01-31 09:59:28 +01:00
Atgeirr Flø Rasmussen
64a6d533fc
Merge pull request #2309 from akva2/fix_relperm_diag_parallel
fixed: run RelpermDiagnostics on the global grid in parallel runs
2020-01-31 09:55:52 +01:00
Kai Bao
56580ad431 adding WGR support for WECON 2020-01-30 21:54:36 +01:00
Tor Harald Sandve
b499180776 only double check the current group constraint at the start of a report step 2020-01-30 11:18:23 +01:00
Markus Blatt
daa8f778bb
Merge pull request #2310 from akva2/noecl_small_stuff
Preparatory changes for single-process parsing
2020-01-30 09:13:14 +01:00
Arne Morten Kvarving
75f2b34ba6 avoid deck usage on non-root processes checking for AQUFETP
aquifers are currently broken in parallel, add a throw if used in
a parallel simulation.
2020-01-29 15:30:55 +01:00
Arne Morten Kvarving
737cb0bb3e avoid deck usage on non-root processes checking for AQUCT
aquifers are currently broken in parallel, add a throw if used in
a parallel simulation.
2020-01-29 15:30:55 +01:00
Joakim Hove
fcdd5874a3 Use RockConfig in eclproblem 2020-01-29 15:06:53 +01:00
Joakim Hove
d15ad322c1 Serialize RockConfig 2020-01-29 15:06:20 +01:00
Tor Harald Sandve
f5c6bafd90 make group constrain check conditional 2020-01-29 14:52:01 +01:00
Bård Skaflestad
645b07bf7f
Merge pull request #2305 from akva2/fix_thermal
Parallel thermal simulations
2020-01-29 13:27:45 +01:00
Arne Morten Kvarving
d4d69c4978 fixed: run RelpermDiagnostics on the global grid in parallel runs 2020-01-29 09:40:24 +01:00
Joakim Hove
149722922b Moved IOConfig to become member of RestartConfig 2020-01-29 07:28:56 +01:00
Arne Morten Kvarving
4c46242136 fix WaterPvtMultiplexer serialization after brine addition 2020-01-28 15:27:50 +01:00
Arne Morten Kvarving
bddbf1a47b remove unnecessary and erronous prototypes 2020-01-28 11:36:33 +01:00
Joakim Hove
27246b91f4
Merge pull request #2302 from joakim-hove/use-bc
Use bc
2020-01-28 11:03:33 +01:00
Joakim Hove
bbdbf38f8a fixup! Add class BCCconfig to parallelrestart 2020-01-28 10:59:06 +01:00
Bård Skaflestad
53f05a7df6 Chase Runspec Member Update
The Runspec class gained a new data member of type SatFuncControls.
Update the serialization code accordingly.
2020-01-25 13:09:49 +01:00
Joakim Hove
c9ef6ac843 Add class BCCconfig to parallelrestart 2020-01-25 09:31:28 +01:00
Arne Morten Kvarving
b9ea08519a fix serialization after removed member in IOCOnfig 2020-01-24 13:12:40 +01:00
Joakim Hove
54509c7b56 Use (std::vector<std::time_t>&) constructor when serialing TimeMap 2020-01-22 18:49:55 +01:00
Joakim Hove
2cfe1dce7f
Merge pull request #2295 from akva2/noecl_flush_matman
Avoid deck usage on non-root processes setting up MaterialLawManager
2020-01-22 15:09:57 +01:00
Arne Morten Kvarving
8b4c5c81cb update InitConfig serialization
new member for gravity was added
2020-01-22 12:56:43 +01:00
Arne Morten Kvarving
60f3fea67a avoid deck usage on non-root processes setting up MaterialLawManager 2020-01-22 11:35:55 +01:00
Arne Morten Kvarving
1354656f8b add mpi serialization for EclEpsScalingPointsInfo 2020-01-22 11:35:28 +01:00
Arne Morten Kvarving
468c220bca add mpi serialization for FaultCollection 2020-01-21 15:00:34 +01:00
Arne Morten Kvarving
d00ee94561 add mpi serialization for Fault 2020-01-21 14:57:40 +01:00
Arne Morten Kvarving
1c311743eb add mpi serialization for FaultFace 2020-01-21 14:53:59 +01:00
Arne Morten Kvarving
a9bc24618f add mpi serialization for TransMult 2020-01-21 14:49:40 +01:00
Arne Morten Kvarving
b93efe29f8 add mpi serialization for EclipseConfig 2020-01-21 14:47:08 +01:00
Arne Morten Kvarving
ff8fac563f add mpi serialization for MULTREGTScanner 2020-01-21 14:41:54 +01:00
Arne Morten Kvarving
252f323fb6 add mpi serialization for MULTREGTRecord 2020-01-21 14:35:11 +01:00
Bård Skaflestad
570cf08fc4
Merge pull request #2290 from akva2/noecl_flush_fluidsystem
Avoid deck usage on non-root processes setting up FluidSystem
2020-01-21 10:47:44 +01:00
Arne Morten Kvarving
c3ecedadb1 avoid deck usage on non-root processes setting up FluidSystem 2020-01-20 11:17:31 +01:00
Arne Morten Kvarving
c18f06e155 fixed: we want to use the deserialized approach
not the one from the variable we are deserializing into.
copy-paste issue
2020-01-20 11:17:31 +01:00
Arne Morten Kvarving
c07d98a6f8 add a macro for instancing pack templates for shared_ptrs 2020-01-20 10:37:52 +01:00
Arne Morten Kvarving
22c5698dcc changed: use a variadic macro
need this to use the macro with templated types having
more than parameter
2020-01-20 10:37:52 +01:00
Arne Morten Kvarving
a0af703c26 changed: use a variadic macro
need this to use the macro with templated types having
more than parameter
2020-01-20 10:37:49 +01:00
Atgeirr Flø Rasmussen
f003d37dba
Merge pull request #2276 from totto82/fixREIN
Fix REIN for multi level groups by passing the top phase
2020-01-20 09:55:27 +01:00
Tor Harald Sandve
6e0f26f488 fix typos 2020-01-20 09:14:19 +01:00
Bård Skaflestad
b1fc78056e
Merge pull request #2277 from akva2/noecl_flush_schedule
Avoid using deck setting up Schedule on non-root processes
2020-01-17 15:36:34 +01:00
Arne Morten Kvarving
1b1f613ed4 fixed: 0 processes is too 'special' a special case
this was intended to check for 1 process
2020-01-17 12:32:19 +01:00
Arne Morten Kvarving
1d68e37763 fixed: do not handle GuideRateConfig::GroupTarget as POD
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
446af27a42 fixed: do not handle GuideRateConfig::WellTarget as POD
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
4d0bf970fd fixed: do not handle Well::WellGuideRate as POD
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
8668ecaa64 fixed: do not handle WellPolymerProperties as POD
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
486602ea98 fixed: do not handle JFunc as POD
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
eca6108cbf fixed: do not handle EclHysterConfig as POD
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
720fd66638 fixed: do not handle TimeMap::StepData as POD
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
b7d7ced43d fixed: do not handle RestartSchedule as POD
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
1b81e43e73 fixed: do not handle FoamData as POD
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
64e943176b fixed: do not handle EquilRecord as POD
valgrind is not happy
2020-01-17 10:17:32 +01:00
Arne Morten Kvarving
72b33edf81 fixed: cannot simply deserialize the udq function table
rather we simply create it based on the params as elsewhere.
2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
6bf2f8e285 add missing Connection serialization in Well 2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
b2b398e217 fixed: missing Kind in Connection serialization 2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
2a2379dce9 update serialization for UDAValue due to new dim member 2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
c463bcc54a fixed: disable sanity check when reconstructing Dimension 2020-01-17 10:10:07 +01:00
Arne Morten Kvarving
41853c2622 fixed: we have to reconstruct the exact pointer map for these
we cannot just deserialize as new entities
2020-01-17 10:10:07 +01:00
Atgeirr Flø Rasmussen
b91f6fcc9f Add missing instantiation of pack.
For pack(std::vector<Opm::Tabulated1DFunction<double>>).
2020-01-15 11:25:00 +01:00
Bård Skaflestad
b455faf067 Parallel Restart: Chase RFTConfig API Update
The RFTConfig object gained a new data member and constructor
argument, in addition to altering the type of the data member
well_open_rft_name from an unordered_set to an unordered_map.

Update serialization code accordingly.
2020-01-14 16:49:33 +01:00
Tor Harald Sandve
c1748604f0 Fix REIN for multi level groups by passing the top phase 2020-01-13 11:32:13 +01:00
Atgeirr Flø Rasmussen
725b90504c
Merge pull request #2269 from totto82/fixVREP
fix for vrep and rein for more then one level of groups
2020-01-13 08:33:29 +01:00
Joakim Hove
c20bbbcb1d
Merge pull request #2270 from totto82/trinemykk-smartwater
Trinemykk smartwater
2020-01-11 06:50:56 +01:00
Atgeirr Flø Rasmussen
b39ca125f6 Change auto in prototype to template argument. 2020-01-10 09:59:21 +01:00
Tor Harald Sandve
bc33e482be don't communicate isoThermal when approach is NoWaterPvt 2020-01-10 09:02:16 +01:00
Tor Harald Sandve
2877a984a1 Adapt FluidState in Aquifer model to interface change due to Brine 2020-01-09 15:09:53 +01:00
Tor Harald Sandve
56d7a1ec19 yet another rebase fix 2020-01-09 14:14:38 +01:00
Tor Harald Sandve
8b93953ef5 clean-up after rebase 2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
19a40c6047 update serialization for TableManager and Well due to brine additions 2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
f118ae5036 add mpi serialization for WellBrineProperties 2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
1f8ed78683 add mpi serialization for PvtwsaltTable 2020-01-09 14:14:38 +01:00
Arne Morten Kvarving
b9f8429691 add mpi serialization for BrineDensityTable 2020-01-09 14:14:38 +01:00
Trine S. Mykkeltvedt
99e7785fb5 renamed saltwater-->brine and removed keywords from missingFeatures 2020-01-09 14:14:38 +01:00
Trine S. Mykkeltvedt
5749615bd8 addd simple salt/brine implementation 2020-01-09 14:14:38 +01:00
Bård Skaflestad
736f647936
Merge pull request #2268 from akva2/noecl_flush_summarycfg
Avoid using global ecl state setting up SummaryConfig on non-root processes
2020-01-08 16:48:32 +01:00
Tor Harald Sandve
18c8cc6119 fix vrep and rein for more then one level of groups 2020-01-08 14:26:25 +01:00
Arne Morten Kvarving
fa5f026fe4 add mpi serialization for SummaryConfig 2020-01-08 10:08:30 +01:00
Arne Morten Kvarving
b596ac6e6e add mpi serialization for std::set 2020-01-08 10:08:30 +01:00
Arne Morten Kvarving
725af1442e add mpi serialization for SummaryNode 2020-01-08 10:08:30 +01:00
Arne Morten Kvarving
68225309a1 add helper templates to pack/send and receive/unpack 2020-01-08 10:01:53 +01:00
Markus Blatt
7e700c11e0 Move PreconditionerFactory into namespace Opm.
This fixes name clashes with DUNE's own factory that is introduced
in DUNE 2.7. Hence it closes issue #2266.

BTW: Dune's factory has more template parameters than ours.
2020-01-07 17:59:23 +01:00
Kai Bao
6be8d1b4bb adapting to the interface change from OPM/opm-common#1386 2020-01-07 11:40:06 +01:00
Arne Morten Kvarving
a9a35a2f21
Merge pull request #2262 from akva2/noecl_flush_modules
Avoid global ecl state in setting up additional modules
2020-01-06 12:43:51 +01:00
Arne Morten Kvarving
3b27df91b4 avoid usage of deck on all processes setting up EclSolventModule 2020-01-06 11:19:12 +01:00
Arne Morten Kvarving
66949e0a59 add mpi serialization for Schedule 2020-01-03 10:55:45 +01:00
Arne Morten Kvarving
16ce8af5e9 add mpi serialization for Actions 2020-01-03 08:47:29 +01:00
Arne Morten Kvarving
9fb68ef289 add mpi serialization for Action::ActionX 2020-01-03 08:41:43 +01:00
Arne Morten Kvarving
92811754a8 add mpi serialization for Action::Condition 2020-01-03 08:39:16 +01:00
Arne Morten Kvarving
a0c2d5b0f6 add mpi serialization for Action::Quantity 2020-01-03 08:37:41 +01:00
Arne Morten Kvarving
2a16051d84 add mpi serialization for Action::AST 2020-01-03 08:36:09 +01:00
Arne Morten Kvarving
2d682a0838 add mpi serialization for ASTNode 2020-01-03 08:34:15 +01:00
Arne Morten Kvarving
5be1955e47 add mpi serialization for Tuning 2020-01-03 08:32:41 +01:00
Arne Morten Kvarving
f461db3316 add mpi serialization for Deck 2020-01-03 08:30:26 +01:00
Arne Morten Kvarving
6e8b82ae7d add mpi serialization for std::unique_ptr 2020-01-03 08:30:26 +01:00
Arne Morten Kvarving
1860141771 add mpi serialization for DeckKeyword 2020-01-03 08:27:51 +01:00
Arne Morten Kvarving
8ba18cf038 add mpi serialization for Location 2020-01-03 08:24:58 +01:00
Arne Morten Kvarving
4899056717 add mpi serialization for DeckRecord 2020-01-02 15:33:27 +01:00
Arne Morten Kvarving
13de64985a add mpi serialization for DeckItem 2020-01-02 15:30:48 +01:00
Arne Morten Kvarving
55630acded add mpi serialization for RFTConfig 2020-01-02 15:27:50 +01:00
Arne Morten Kvarving
b925d75def add mpi serialization for GConSump 2020-01-02 15:25:03 +01:00
Arne Morten Kvarving
e7f0a00b00 add mpi serialization for GConSale 2020-01-02 15:22:21 +01:00
Arne Morten Kvarving
5de7605863 add mpi serialization for GuideRateConfig 2020-01-02 15:19:31 +01:00
Arne Morten Kvarving
805f68fdee add mpi serialization for GuideRateModel 2020-01-02 15:15:49 +01:00
Arne Morten Kvarving
34a55ed381 add mpi serialization for std::array 2020-01-02 15:15:48 +01:00
Arne Morten Kvarving
c6e2db1f69
Merge pull request #2259 from akva2/noecl_flush
More MPI serialization support
2020-01-02 15:10:06 +01:00
Tor Harald Sandve
d1ff941adc
Merge pull request #2223 from totto82/makeGrupMPI
communicate group rates
2020-01-02 14:38:56 +01:00
Tor Harald Sandve
77d52e5b53 communicate group rates and add test 2020-01-02 13:57:12 +01:00
Atgeirr Flø Rasmussen
5f979b4ec2
Merge pull request #2241 from GitPaean/fixing_non_defaulted_influx_coefficient
fixing the non-defaulted influx coefficient for AquiferFetkovich
2020-01-02 13:51:35 +01:00
Tor Harald Sandve
1b7af4c1b6
Merge pull request #2239 from totto82/nupcol2
froze wellState at nupcol iterations
2020-01-02 12:47:13 +01:00
Arne Morten Kvarving
ec1a18ca70 add mpi serialization for UDQActive 2020-01-02 12:14:13 +01:00
Arne Morten Kvarving
01d05c9585 add mpi serialization for UDQConfig 2020-01-02 12:12:45 +01:00
Arne Morten Kvarving
dc5a3d0e0e add mpi serialization for UDQIndex 2020-01-02 12:11:15 +01:00
Arne Morten Kvarving
fcd6c7582b add mpi serialization for UDQAssign 2020-01-02 12:09:44 +01:00
Arne Morten Kvarving
3d17266476 add mpi serialization for UDQDefine 2020-01-02 12:08:07 +01:00
Arne Morten Kvarving
7d825cea82 add mpi serialization for UDQASTNode 2020-01-02 12:06:16 +01:00
Arne Morten Kvarving
5873b56025 add mpi serialization for UDQFunctionTable 2020-01-02 12:03:54 +01:00
Arne Morten Kvarving
abe09ae93d add mpi serialization for UDQFunction 2020-01-02 12:02:42 +01:00
Arne Morten Kvarving
b2d454eaf2 add mpi serialization for WListManager 2020-01-02 12:00:03 +01:00
Arne Morten Kvarving
c2bff16e75 add mpi serialization for WList 2020-01-02 11:59:27 +01:00
Arne Morten Kvarving
9fec893834
Merge pull request #2257 from akva2/noecl_flush
More MPI serialization support
2020-01-02 11:51:49 +01:00
Tor Harald Sandve
c0598fcc7b
Merge pull request #2252 from totto82/setBHPWP
set bhp control explicilty for well potential calculations
2020-01-02 11:07:43 +01:00
Kai Bao
d1fd04e635 WIP in fixing the non-defaulted influx coefficient for AquiferFetkovich 2020-01-02 10:55:03 +01:00
Arne Morten Kvarving
f8029133a5 add mpi serialization for Group 2020-01-02 09:05:53 +01:00
Arne Morten Kvarving
dcdba24f53 add mpi serialization for Group::GroupProductionProperties 2020-01-02 09:05:46 +01:00
Arne Morten Kvarving
c030545478 add mpi serialization for Group::GroupInjectionProperties 2020-01-02 09:04:41 +01:00
Arne Morten Kvarving
2df5aaf876 add mpi serialization for IOrderedSet 2020-01-02 09:03:41 +01:00
Arne Morten Kvarving
4e14746405 add mpi serialization for std::unordered_set 2020-01-02 09:03:11 +01:00
Arne Morten Kvarving
d01a389396 add mpi serialization for Well 2020-01-02 09:00:28 +01:00
Arne Morten Kvarving
c31d209295 add mpi serialization for WellSegments 2020-01-02 08:31:06 +01:00
Arne Morten Kvarving
5bc506cd3b add mpi serialization for UnitSystem 2020-01-02 08:27:13 +01:00
Arne Morten Kvarving
e53072faf5 add mpi serialization for Dimension 2020-01-02 08:25:19 +01:00
Arne Morten Kvarving
781625ec63 add mpi serialization for Segment 2020-01-02 08:23:40 +01:00
Arne Morten Kvarving
badc59ca6f add mpi serialization for std::shared_ptr 2020-01-02 08:22:13 +01:00
Arne Morten Kvarving
cf7e81bb07 add mpi serialiation for Valve 2020-01-02 08:19:46 +01:00
Arne Morten Kvarving
9baba1bae9 add mpi serialization for SpiralICD 2020-01-02 08:18:56 +01:00
Atgeirr Flø Rasmussen
63a2460ed4 Bugfix: correct well efficiency factors for MSW
With this, the conservation equations for the mswell are in terms of
effective flows. This is similar to the treatment for standard wells.
The alternative (formulating the equations in full rates) could be
better and clearer in the long run.
2019-12-23 12:37:20 +01:00
Joakim Hove
8ba5caadd4
Merge pull request #2255 from joakim-hove/missing-UDT
Mark UDT as not supported
2019-12-20 17:16:04 +01:00
Bård Skaflestad
8a378249f7
Merge pull request #2250 from akva2/noecl_flush
More MPI serialization support
2019-12-20 17:08:01 +01:00
Joakim Hove
8bba4f0557 Mark UDT as not supported 2019-12-20 16:33:13 +01:00
Arne Morten Kvarving
d840f4b93b add mpi serialization for Well::WellProductionProperties 2019-12-20 15:46:54 +01:00
Kai Bao
7fc81ae228 using range for a few occasions in BlackoilAquiferModel_impl.hpp 2019-12-20 15:32:39 +01:00
Kai Bao
3fb96deb36 re-formatting aquifer files with clang-format 2019-12-20 14:30:13 +01:00
Tor Harald Sandve
7a0ff52bbc set bhp control explicilty for well potential calculations 2019-12-20 13:18:10 +01:00
Tor Harald Sandve
e340f25c42
Merge pull request #2229 from totto82/fixOrderOfCheck
check groups from top
2019-12-20 12:26:20 +01:00
Arne Morten Kvarving
5dc9ac507d add mpi serialization for WellConnections 2019-12-20 11:52:56 +01:00
Arne Morten Kvarving
8bd9f2f68f add mpi serialization for Well::WellGuideRate 2019-12-20 11:51:36 +01:00
Arne Morten Kvarving
c909075f16 add mpi serialization for WellEconProductionLimits 2019-12-20 11:48:38 +01:00