Commit Graph

583 Commits

Author SHA1 Message Date
Tor Harald Sandve
06df233055 remove minpvFillNtg a temporary solution while not supporting standard minpv 2020-02-24 11:43:07 +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
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
Markus Blatt
bc98b20118 Only filter in filterConnections_ on root process.
When filterConnections_ is called the grid is not load
balanced, yet. Currently that means that grid() will also return the
unbalanced grid and all processes will see the whole global grid.

We will change semantics of the unbalanced grid soon: Only the root
process will see the whole grid and the others will see an empty
partition of it. Hence filtering on this partition will remove all
connections on all wells in the schedule for non-root processes and
produce wrong results.

For non-root process the filtering needs to be done on the load
balanced grid. This is accomplished by this commit.
2019-11-14 23:41:17 +01:00
Joakim Hove
fce5d2f369 Rename Well2 -> Well and Group2 -> Group 2019-11-13 23:18:01 +01:00
Atgeirr Flø Rasmussen
415f4adcef
Merge pull request #2151 from joakim-hove/skip-processing
Skip processing of filename if external deck already exists.
2019-11-08 09:08:54 +01:00