Commit Graph

566 Commits

Author SHA1 Message Date
Tor Harald Sandve
6a1f7c8006 BUGfix enableEclOutput false 2018-03-05 14:56:48 +01:00
Andreas Lauser
21cce7514e fix a few "unused variable" warnings that occur on more uncommon compilers
i.e. on ICC. the compiler is right in producing warnings here, though.
2018-03-03 13:27:48 +01:00
Atgeirr Flø Rasmussen
aaf885098d Merge pull request #288 from totto82/fix_restart_norne
Fix restart norne
2018-02-21 11:32:55 +01:00
Tor Harald Sandve
d15a86b039 clean up 2018-02-21 10:41:27 +01:00
Tor Harald Sandve
9372f9d2ca Make sure the updateMaxOilSaturation_ is called
The order of operation is left-to-right.
2018-02-21 10:38:52 +01:00
Tor Harald Sandve
44ab370fae Make the restart code more robust.
Don't assume all needed data is given in the restart file.
i.e. make it possible to run a solvent restart run from a standard
blackoil run.
2018-02-21 10:38:52 +01:00
Tor Harald Sandve
f90e074947 Demand the hystereris values if enalbed. 2018-02-21 10:38:52 +01:00
Tor Harald Sandve
b89a960a50 Fix bug in setting the max oil saturation after restart 2018-02-21 10:38:52 +01:00
Joakim Hove
b6e8e9c6fb Rename test-deck to get consistent case 2018-02-20 14:34:31 +01:00
Atgeirr Flø Rasmussen
875aafe0f9 Merge pull request #289 from totto82/fix_default_output_dir
Fix default output directory
2018-02-19 17:04:41 +01:00
Tor Harald Sandve
afe26e8f12 Split the PackUnPack class
into PackUnPackBlockData, PackUnPackCellData and PackUnPackWellData
2018-02-19 13:18:56 +01:00
Tor Harald Sandve
998a6339cb Rename test_ecl_output.cpp -> test_ecl_output.cc 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
3ede6ecc69 Rename ThreadHandle.hpp -> threadHandle.hh
Also adding some comments.
2018-02-19 13:18:56 +01:00
Tor Harald Sandve
76edfa7789 clean up after rebase 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
932527d772 Pass RFT output via data::well
With this no cell data is used by the output code in opm-output
2018-02-19 13:18:56 +01:00
Tor Harald Sandve
bbe2ae4a7b fix rebase failure 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
56bcb419fb Add async output 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
27beb2faec Fix default output directory
Get default ecl output directory from IOConfig.
2018-02-19 13:16:49 +01:00
Atgeirr Flø Rasmussen
39793ec932 Adapt to moved opm-grid headers. 2018-02-12 10:20:09 +01:00
Andreas Lauser
436c9f8791 rename the "grid manager" to "vanguard"
IMO the term "vanguard" expresses better what these classes are
supposed to do: level the ground for the cavalry. Normally this simply
means to create and distribute a grid object, but it can become quite
a bit more complicated, as exemplified by the vanguard classes of
ebos..
2018-02-08 16:26:58 +01:00
Andreas Lauser
61461dd61c Merge pull request #282 from andlaus/separate_opm-common_concerns
adapt to the move of code from opm-common to opm-material
2018-02-08 16:25:10 +01:00
Kai Bao
2c298b2b99 removing the completions after createGrid in eclbasegridmanager 2018-02-08 14:28:20 +01:00
Andreas Lauser
260d62c2b8 adapt to the move of code from opm-common to opm-material 2018-02-08 12:11:20 +01:00
Tor Harald Sandve
d3cb81a7ba Minor clean-up based on review 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
154e4fd97a Obey the input given by the deck.
Don't try to make the initial condition consistent for explicitly given
initial values.
2018-02-05 14:24:11 +01:00
Tor Harald Sandve
fb27ebd4eb Add output of temperature 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
d771810562 Some more minor clean-up 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
7ed66f0cf2 pass the mcmg element layout as a parameter for dune 2.6 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
af7d031875 Minor clean-up after review 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
51c1201fa6 Fix bug in pv output
Output current not orignal pore volumes
2018-02-05 14:24:11 +01:00
Tor Harald Sandve
eca5d8aff5 Fix slow code
Avoid checking summaryConfig at every cell
Add temporary fix around issue with RPTSCHED in restartConfig
2018-02-05 14:24:11 +01:00
Tor Harald Sandve
5fa7b130dc Output double precision restart output if asked for 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
b021ee54ca Some clean-up
Dont' output rs, rv, somax and hysteresis if they are not enabled.
We no longer output the same as legacy.
2018-02-05 14:24:11 +01:00
Tor Harald Sandve
85ed4bffbf Pass block values to OPM-output 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
2264b44f38 Pass region and field FIP to opm-output 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
5d5c6bad75 Fix parallel restart and pav in water zone 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
de3df0d81d Clean up PR review 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
f62498440d Add FIP, INIT and EGRID output
Writes INIT and EGRID files initially
Adds Fip to summary output if required.
Output Fip to log (.PRT) if Opm-logger is set
2018-02-05 14:24:11 +01:00
Andreas Lauser
9e7857ec1c allow to specify the ECL output directory
by default, it is the current directory.
2018-02-05 14:24:11 +01:00
Andreas Lauser
8b7c14c4db adapt to the reordering template arguments of get*_(fluidState) in opm-material 2018-01-19 11:49:06 +01:00
Andreas Lauser
49289c272d use a named constant for the value of saturation that determines the presence of free gas 2018-01-10 15:06:24 +01:00
Andreas Lauser
7c2c0052b2 use infinity as the value for the last Rs
hopefully this does not screw anything up.
2018-01-10 15:06:24 +01:00
Andreas Lauser
3b30134a29 adress [at]atgeirr's review comments 2018-01-10 15:06:24 +01:00
Andreas Lauser
5a1413476a implement support for the 'FREE' option of DRSDT
funnily enough, DRVDT does not exhibit such a flag...
2018-01-10 15:06:23 +01:00
Andreas Lauser
9a5a8c53dc move the maximum oil saturation stuff into the problem
this also simplifies creating a more proper selection logic for the
DR[SV]DT keywords or VAPPARS.
2018-01-10 15:06:23 +01:00
Andreas Lauser
853d64c12c deactivate DR[SV]DT if VAPPARS is present
actually, it depends on the ordering of these keywords, but this
requires some probably rather extensive changes in opm-parser.
2018-01-10 15:01:43 +01:00
Andreas Lauser
404b8d38b9 implement the ebos part of DRSDT 2018-01-10 15:01:43 +01:00
Andreas Lauser
ab11d2cf27 Merge pull request #262 from totto82/useOPM-output
Add ecl output from opm-output
2018-01-10 15:01:02 +01:00
Tor Harald Sandve
f0ee6df136 Only compute auxiliary values if asked for
Ask the restartConfig if restart files are written. Solution variables are
always written since they may be needed by the summary files

Remove output of saturated data to align with legacy code.
2018-01-09 14:01:30 +01:00
Tor Harald Sandve
abd3271f1c Only collect to globalData for mpi 2018-01-09 13:08:05 +01:00