OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-25 04:16:26 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,976 Commits 24 Branches 102 Tags 90 MiB
7775a665d0
Commit Graph

686 Commits

Author SHA1 Message Date
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
Markus Blatt
22d4e784d3
Merge pull request #2356 from akva2/boost_prune 
Lessen boost usage
 2020-02-21 13:15:03 +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
e262cf8d51 changed: use internal function to uppercase string 2020-02-19 11:20:16 +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
Tor Harald Sandve
7ed2bbed3f
Merge pull request #2313 from totto82/lab_bc 
Lab bc
 2020-02-14 09:24:02 +01:00
Arne Morten Kvarving
04812f32fb remove boost::filesystem as dependency 2020-02-12 15:03:18 +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
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
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
Arne Morten Kvarving
403a78e1cf fixed: call initFromDeck for Brine module 2020-02-05 09:14:47 +01:00
Arne Morten Kvarving
df62305673 update for simplified Tuning data structure in opm-common 2020-01-31 13:45:05 +01:00
Tor Harald Sandve
1d061c681f fix index issue for boundary conditions 2020-01-30 10:03:22 +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
39492fdaf4 only calculate ACTNUM on root-process 2020-01-29 15:30:55 +01:00
Arne Morten Kvarving
d91155738f avoid dereferencing eclGrid and FieldProps on non-root processes setting up grids 
these only used on root process in any case
 2020-01-29 15:30:55 +01:00
Joakim Hove
fcdd5874a3 Use RockConfig in eclproblem 2020-01-29 15:06:53 +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
35a085fe0d changed: adjust to ThermalLawManager initialization changes 2020-01-29 08:54:50 +01:00
Arne Morten Kvarving
e2862a3a4d avoid deck usage on non-root processes checking for TRACERS 2020-01-28 15:55:58 +01:00
Arne Morten Kvarving
b5cd80c232
Merge pull request #2304 from akva2/hide_fprops_ifaces 
don't use templated get and has interface from fieldpropsmanager
 2020-01-28 15:34:12 +01:00
Arne Morten Kvarving
6cb300c0f9 initialize variable to avoid warning spew 2020-01-28 14:09:53 +01:00
Joakim Hove
bc718bafc8 Use BCConfig when setting up boundary conditions 2020-01-27 15:55:04 +01:00
Arne Morten Kvarving
7dfb45067b don't use templated get and has interface from fieldpropsmanager 
it is now private
 2020-01-27 15:33:18 +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
b7a2612ecf avoid deck usage on non-root processes checking for EQUIL 
this is achieved by using the InitConfig member from EclipseState
instead
 2020-01-22 12:57:25 +01:00
Arne Morten Kvarving
7f9f65811f changed: avoid deck usage on non-root processes setting up gravity 
this is achieved by using the InitConfig member from EclipseState
instead
 2020-01-22 12:57:25 +01:00
Arne Morten Kvarving
db2ad1587d fixed: mark constructor explicit 2020-01-22 11:36:02 +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
3396b31852 changed: add helper template to serialize and broadcast static types 2020-01-22 00:32:46 +01:00
Arne Morten Kvarving
02ce13c800
Merge pull request #2291 from akva2/reorganize_matlaw 
changed: adjust to split of initFromDeck in EclMaterialManager
 2020-01-21 12:59:29 +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
f57a2bf089 changed: adjust to split of initFromDeck in EclMaterialManager 2020-01-20 15:33:45 +01:00
Arne Morten Kvarving
c3ecedadb1 avoid deck usage on non-root processes setting up FluidSystem 2020-01-20 11:17:31 +01:00
Joakim Hove
d1085466e0 Remove #include GridProperty 2020-01-20 09:00:48 +01:00
Bård Skaflestad
d42bbbe15a
Merge pull request #2286 from akva2/avoid_deck_unitsystem 
changed: avoid deck usage
 2020-01-17 15:52:09 +01:00
Arne Morten Kvarving
3f0fe3bcbd changed: avoid deck usage 
in particular, this is preparing for the case where only the
root-process has a deck instance
 2020-01-17 14:56:40 +01:00
Arne Morten Kvarving
cfc9cb3513 changed: avoid near-duplicate code 2020-01-17 14:55:36 +01:00
Joakim Hove
0e9535319b
Simulate with only active cells (#2213) 
Use FieldProps implementation for 3D properties
 2020-01-13 15:46:50 +01:00
Atgeirr Flø Rasmussen
9d8d4921b8 Pass EnableBrine flag to BlackOilFluidState used for equilibration. 
Gave compile error on clang due to narrowing (the int 3 -> bool).
Bug did not cause trouble because default number of phases in
the fluid state (3) was sufficient.
 2020-01-13 11:00:33 +01:00
Tor Harald Sandve
ada7c9d90b fix various extentions 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
646e7d4eb1
Merge pull request #2265 from akva2/fix_serial_build 
fix build without mpi
 2020-01-06 17:02:08 +01:00
Arne Morten Kvarving
bd9ca91df2 fix build without mpi 2020-01-06 15:43:16 +01:00
Bård Skaflestad
dfb4946f13 Restart: Don't Access Solvent Saturation Unless Active 
This commit ensures that the previous solvent restart fix (commit
afba6c8e8, PR #2023) does not attempt to index into the data member
solventSaturation_ unless solvent is activated.
 2020-01-06 14:11:11 +01:00
Arne Morten Kvarving
e5c44ce1f2 avoid usage of deck on all processes setting up EclFoamModule 2020-01-06 11:20:46 +01:00
Arne Morten Kvarving
777d38e550 avoid usage of deck on all processes setting up EclPolymerModule 2020-01-06 11:20:02 +01:00
Arne Morten Kvarving
3b27df91b4 avoid usage of deck on all processes setting up EclSolventModule 2020-01-06 11:19:12 +01:00
Markus Blatt
68272d5861
Merge pull request #2243 from blattms/construct-cpgrid-from-eclgrid-pointer 
Pass a pointer to the EclipseGrid to CpGrid::processEclipseGrid.
 2019-12-19 11:40:23 +01:00
Markus Blatt
ecfbb0e491 Pass a pointer to the EclipseGrid to CpGrid::processEclipseGrid. 
... instead of a reference This is needed as we only want to read the
full deck and construct the EclipseGrid only on the master process
with rank 0. Hence all other ranks will pass a nullptr to this
function. This will be possible with this move from a reference to a
pointer.
 2019-12-18 21:39:08 +01:00
Robert Kloefkorn
2fa90d24f6 [bugfix][ebos] Make compile with PolyhedralGrid again. 2019-12-18 11:03:42 +01:00
Markus Blatt
d255e1cad6
Merge pull request #2215 from dr-robertk/PR/fix-compile-dune27 
Fix compilation with DUNE 2.7
 2019-12-18 08:56:51 +01:00
Joakim Hove
d4890f81f5 Use Dune communicator instead of raw MPI call 2019-12-14 13:54:06 +01:00
Joakim Hove
f4aa118cc4 Update the internal ACTNUM in the FieldPropsManager 2019-12-12 12:00:51 +01:00
Robert Kloefkorn
8b09030139 [bugfix] Make compatibility code compile with DUNE 2.7 2019-12-11 11:22:28 +01:00
Markus Blatt
e7f7ad2ddc Use ActiveGridCells instead of EclipseGrid when filtering connections. 
The function signature has changed upstream.
 2019-12-10 11:50:07 +01:00
Robert Kloefkorn
44e4ea3cdf [feature][ebos] Adding oil-water-polymer option of ebos. 2019-12-09 18:16:23 +01:00
Joakim Hove
dc5340046a Call applyActions at the end of every timestep 2019-12-06 13:18:49 +01:00
Bård Skaflestad
ce1e0691a8 Aquifer Restart: Address Review Comments 
Mostly 'throw'ing in the case of unsupported operations.  While
here, also remove an unused header.
 2019-12-05 13:41:05 +01:00
Bård Skaflestad
143b45ed52 EclWriter: Initialize Aquifers From Restart Data 
This commit calls the aquifer model's 'initFromRestart' function if
the loadParallelRestart() function happens to return any aquifer
data from the restart file.  Such data is currently limited to two
items of information for analytic aquifers (from XAAQ vector), but
future extensions are likely.
 2019-12-05 09:41:21 +01:00
Bård Skaflestad
8a764568e1 EclProblem: Provide Mutable Access to Aquifer Model Object 
This commit adds a new public member function,

    EclProblem::mutableAquiferModel()

that returns a read/write reference to the contained EclAquiferModel
object.  The immediate use-case is initializing analytic aquifers
from restart data.
 2019-12-05 09:41:21 +01:00
Bård Skaflestad
4c4a893781 Aquifer Model: Add Initialization from Restart Data 
This commit adds a new member function,

    initFromRestart()

to the EclBaseAquiferModel and the BlackoilAquiferModel.  The former
does nothing, the latter calls AquiferInterface::initFromRestart()
on the contained analytic aquifer objects.
 2019-12-05 09:41:21 +01:00
Joakim Hove
ad00a3a891 SummaryState is updated at the end of simulator timestep 2019-12-03 15:52:47 +01:00
Joakim Hove
deb397cf0e Update output from applyActions() to show date 2019-12-03 00:44:08 +01:00
Joakim Hove
f97b76a9b5 List the matching wells for Action eval 2019-11-29 19:18:38 +01:00
Arne Morten Kvarving
79dc067eb1 changed: nncdata() has been renamed to data() 2019-11-26 13:29:40 +01:00