Commit Graph
6710 Commits
Author SHA1 Message Date
Håkon Hægland b25f48971c Refactor runSimulator()
As discussed in the previous commit 224ddd9 runSimulator() needs to be
refactored to avoid code duplication when executeStepInit() is
implemented (see later commit). Here, runSimulator() is refactored into
a runSimulatorInitOrRun() that takes a callback function. When
runSimulatorInit() is implemented it will pass a different callback that
only initializes the simulator. Currently, runSimulator() passes the
callback runSimulatorRunCallback_() which runs the whole simulation.
The final output of the simulation summary in runSimulator() is also
refactored into a runSimulatorAfterSim_() method.
2020-02-27 21:32:53 +01:00
Håkon Hægland 224ddd9b73 Refactor execute()
Currently, execute() calls runSimulator() to run the simulation. When
the Python step_init() is implemented (see a later commit), it will
instead call an executeStepInit() that will need to do the same
initialization as in execute() except that it should call a
runSimulatorInit() instead of runSimulator(). In order to avoid code
duplication for execute() and executeStepInit(), execute() is here
refactored into an execute_() method.
2020-02-26 22:45:52 +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 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 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
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