Commit Graph
703 Commits
Author SHA1 Message Date
Markus Blatt eb8ac2af2d Use correct region temperature when calculating RS/RV
The InitialStateComputer::temperature_ array, previously used,
was of cartesian size, but used as if it only contained the
values of the cells of a region.
With this commit InitialStateComputer::temperature_ is a compressed local
array and we explicitly copy out only the region values when computing
RS/RV.

Closes #2423.
2020-03-10 11:54:58 +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
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 5c8cdc8024 Use get_int instead of get_int_global in initstateequil.hh.
With the arrival of compressed field properties there is no need
to extract the global arrays just to compress them manually
afterwards. This change should remove commununication and
synchronization points.
2020-03-09 21:32:41 +01:00
Arne Morten Kvarving 51ee5205cb changed: no need to serialize EclMaterialLawManager any longer 2020-03-09 11:23:12 +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
Markus Blatt 9ccd4be5e3 Shrink EclEquilInitializer::initialFluidStates_.
There is not reason to it as a vector of cartesian size as we access
its entries by the compressed element index. This should save space
and speedup the lookup.
2020-03-08 16:25:35 +01:00
Markus Blatt 8bab43ffbd Removed now unused variables. 2020-03-08 15:18:55 +01:00
Arne Morten Kvarving 09a7c00ed5 changed: no need to serialize PolymerModule any longer 2020-03-06 20:45:53 +01:00
Arne Morten Kvarving 9413425a78 changed: no need to serialize BrineModule any longer 2020-03-06 20:28:34 +01:00
Markus Blatt 6aeac6cb3a Merge pull request #2407 from akva2/no_serialization_foam
changed: no need to serialize FoamModule any longer
2020-03-06 20:11:27 +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
Arne Morten Kvarving 3162ed067e get rid of unused serialization template 2020-03-06 11:55:41 +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
Joakim Hove 42f96ca039 Add commandline switch --sched-restart to control restart init 2020-03-04 15:44:32 +01:00
Arne Morten Kvarving 3a559fb9fb changed: no need to serialize FoamModule any longer 2020-03-04 15:05:37 +01:00
Arne Morten Kvarving 30892a006e changed: no need to serialize SolventModule any longer 2020-03-04 10:01:03 +01:00
Bård Skaflestad 6688c19a77 Merge pull request #2397 from akva2/no_serialization_fluidsystem
changed: no need to serialize the FluidSystem any more
2020-03-03 21:51:10 -06: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 03a2129df3 changed: no need to serialize the FluidSystem any more
setup is now done all from state, which means it can be done
independently on all processes
2020-03-03 14:24:18 +01:00
Bård Skaflestad 8c17e05c7d Merge pull request #2386 from akva2/use_compressed_trans
use compressed indices setting up transmissibilities
2020-03-03 06:00:29 -06:00
Arne Morten Kvarving 89cb162c1f Merge pull request #2383 from akva2/use_compressed_fipnum
use compressed field property for fipnum
2020-03-03 10:04:25 +01:00
Joakim Hove 9268bcb2ac InjectorType enum is moved out from Well class 2020-03-03 09:08:02 +01:00
Arne Morten Kvarving f1e0dc0acb use compressed indices setting up transmissibilities 2020-03-03 08:43:50 +01:00
Arne Morten Kvarving 5a9340b5b1 use compressed field property for fipnum 2020-03-03 08:40:48 +01:00
Bård Skaflestad 8ed3b82c8a Merge pull request #2385 from akva2/use_compressed_rock
use compressed field properties setting up rock parameters
2020-03-02 13:06:29 -06:00
Bård Skaflestad c3f127afa0 Merge pull request #2384 from akva2/use_compressed_perm
use compressed properties setting up permeabilities
2020-03-02 11:56:13 -06:00
Arne Morten Kvarving 888f0190b7 use compressed field properties setting up rock parameters 2020-03-02 15:34:12 +01:00
Arne Morten Kvarving ca91b61bc7 use compressed properties setting up permeabilities 2020-03-02 15:12:26 +01:00
Arne Morten Kvarving b031f6d4cf Merge pull request #2382 from akva2/use_compressed_thpressure
use compressed indices setting up ThresholdPressures
2020-03-02 15:02:18 +01:00
Arne Morten Kvarving 9f00c3dfe1 Merge pull request #2381 from akva2/use_compressed_ntg
use compressed field properties applying NTG
2020-03-02 14:49:59 +01:00
Arne Morten Kvarving ff559fd1c9 use compressed indices setting up ThresholdPressures 2020-03-02 13:42:27 +01:00
Arne Morten Kvarving 373588dd04 use compressed field properties applying NTG 2020-03-02 13:02:10 +01:00
Arne Morten Kvarving da901a1d11 Merge pull request #2379 from akva2/use_compressed_expl_init
use compressed field properties setting up explicit initial conditions
2020-03-02 13:01:25 +01:00
Arne Morten Kvarving 766410ff7c Merge pull request #2378 from akva2/use_compressed_blackoil_ext
changed: use compressed field properties for blackoil extension init conds
2020-03-02 11:39:07 +01:00
Markus Blatt 9faf2979b9 Merge pull request #2377 from akva2/use_compressed_numbers
changed: use compressed field properties setting up numbers
2020-03-02 11:32:22 +01:00
Arne Morten Kvarving d5d32e235c use compressed field properties setting up explicit initial conditions 2020-03-02 11:21:20 +01:00
Arne Morten Kvarving f0062d5913 changed: use compressed field properties setting up numbers 2020-03-02 11:20:26 +01:00
Arne Morten Kvarving 8d528daaa5 changed: use compressed field properties for blackoil extension intial conditions 2020-03-02 10:32:40 +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 ef27c1d110 use compressed field properties setting up ThermalLawManager 2020-02-28 12:31:14 +01:00
Arne Morten Kvarving 3c050f4dda use compressed field properties setting up MaterialLawManager 2020-02-28 12:31:14 +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 68a9d17de1 changed: pass/store deck as a pointer
and remove asserts for null-ptr. preparatory step for only
having deck on root mpi process
2020-02-28 10:26:55 +01:00
Arne Morten Kvarving 4904f09d4d changed: avoid use of EclipseGrid outputting RFT data 2020-02-28 10:24:00 +01:00
Arne Morten Kvarving ac28bbfd15 changed: avoid usage of eclipseGrid on non-root processes setting up transmissibilities
obtain data from root process
2020-02-28 10:24:00 +01:00
Arne Morten Kvarving ef89d656fb communicate global size setting up blackoil extension boundary conditions 2020-02-28 10:24:00 +01:00
Atgeirr Flø Rasmussen 8cd9da0d83 Merge pull request #2361 from akva2/removeNTGfill
remove minpvFillNtg a temporary solution while not supporting standard minpv
2020-02-24 13:34:43 +01:00
Tor Harald Sandve 06df233055 remove minpvFillNtg a temporary solution while not supporting standard minpv 2020-02-24 11:43:07 +01:00