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
10,804 Commits 24 Branches 102 Tags 90 MiB
38023fac21
Commit Graph

6826 Commits

Author SHA1 Message Date
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
Markus Blatt
396f84b764
Merge pull request #2372 from akva2/compressed_props_material 
Use compressed properties in material law setup
 2020-03-02 09:47:09 +01:00
Arne Morten Kvarving
293612265e fix build without MPI 2020-02-28 13:03:16 +01:00
Arne Morten Kvarving
3c050f4dda use compressed field properties setting up MaterialLawManager 2020-02-28 12:31:14 +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