OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-27 11:16:28 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,410 Commits 24 Branches 102 Tags 90 MiB
fce0ba6759
Commit Graph

430 Commits

Author SHA1 Message Date
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
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
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
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
Arne Morten Kvarving
d8028dfa1b remove old serialization support for SummaryNode 2020-03-13 14:09:17 +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
21dc2620fd
Merge pull request #2453 from akva2/eclstate_serialize 
drop serialization from ParallelEclipseState
 2020-03-11 12:15:46 -05: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
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
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
Arne Morten Kvarving
bb1f27bce6 add mpi serialization for StandardCond 2020-03-03 12:16:04 +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
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
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
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
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
5ad4936025 RestartConfig has moved from EclipseState to Schedule 2020-02-17 21:48:12 +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
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
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
Tor Harald Sandve
469ffa2cbe allow for multiple group injection phases 2020-02-11 09:30:19 +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
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
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
Bård Skaflestad
645b07bf7f
Merge pull request #2305 from akva2/fix_thermal 
Parallel thermal simulations
 2020-01-29 13:27:45 +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