Commit Graph

645 Commits

Author SHA1 Message Date
Joakim Hove
b766260db7 Add --opm-rst-file parameter 2018-09-13 17:03:11 +02:00
Andreas Lauser
49442af4cc Merge pull request #382 from totto82/ppcw
Output PPCW when SWATINIT is enabled
2018-09-12 12:38:53 +02:00
Tor Harald Sandve
dcb1e96606 Output and read PPCW when SWATINIT is enabled 2018-09-11 14:57:32 +02:00
Joakim Hove
67d4439cce Merge pull request #361 from joakim-hove/wellconnection-updates
Wellconnection updates
2018-09-11 13:18:52 +02:00
Andreas Lauser
403ad6ee56 Merge pull request #381 from totto82/fix_nofill_minpv
Return modified ntg's only when minpv mode is OPMFIL
2018-09-10 16:21:07 +02:00
Tor Harald Sandve
dbcfb7af24 Return modified ntg's only when minpv mode is OPMFIL 2018-09-07 09:09:03 +02:00
Joakim Hove
f2992099d5 Merge pull request #380 from joakim-hove/thpres-fixup
Fixup THPRESPR -> THPRESPR
2018-09-05 21:11:07 +02:00
Joakim Hove
400f505a2c Fixup THPRESPR -> THPESHPR 2018-09-05 14:59:02 +02:00
Joakim Hove
621028f6e6 Store capillary pressure in SOLUTION section 2018-09-04 14:14:48 +02:00
Joakim Hove
bdbf417887 Change string used for THPRES in restartfile 2018-09-03 16:59:23 +02:00
Joakim Hove
59238803bb Get connection CF and Kh directly from parser Connecton object 2018-08-31 08:47:15 +02:00
Andreas Lauser
e5ab52b773 ebos: avoid sign-comparison warning
seems like I didn't compile #364 with pedantic warning flags enabled.
2018-08-20 13:13:57 +02:00
Andreas Lauser
fe5ccc2194 ebos: complain about old-style parameter specification explicitly
i.e., complain when detecting foo=bar positional parameters. this is
not a bullet-proof solution because it will not work if the deck file
name contains an equals character. Anyway, it's better than before
IMO.
2018-08-17 13:51:11 +02:00
Andreas Lauser
095a529f28 add some quotes to the user output
this makes it clearer that no deck has been specified.
2018-08-17 13:08:23 +02:00
Andreas Lauser
ed7d4d47c1 implement line breaks in the usage message
i.e. for `--help`. this is surprisingly complicated...
2018-08-16 15:55:51 +02:00
Andreas Lauser
6e7be50610 make the "OutputDir" parameter apply universally
all disc output, i.e. VTK, restart files, ECL and -- in the future --
logfiles, goes to that directory. before this, only the ECL output
could be directed to a different than the current working directory
and the parameter for this was called "EclOutputDir".

note that the Dune VTK writing infrastructure makes it harder than it
needs to be: suddenly Dune::VTKWriter::write() does not work in
parallel anymore, but Dune::VTKWriter::pwrite() must be called with
the right arguments.
2018-08-14 12:04:51 +02:00
Andreas Lauser
0d864f8e71 ebos: handle positional parameters more robustly
previously, the exact behaviour was dependent on wheter the
--ecl-deck-file-name parameter was defined or not. now the positional
parameter is hopefully an exact alias for the value of --ecl-deck-file-name.
2018-08-10 18:21:16 +02:00
Andreas Lauser
e7606d2afd ebos: complain more explicitly about the input deck being unspecified
the previous error message was a bit confusing.
2018-08-07 11:37:12 +02:00
Andreas Lauser
2f1f14483b ebos: change the brief description slightly
the purpose is to make it exceedingly clear that ebos is not developed
by the ECL group who started ECLIPSE which is an backcronym for
"ECL's Implicit Program for Simulation Engineering" and ECL stands for
"Exploration Consultants Limited" which is now a division of
Schlumberger Limited.

thanks to [at]atgeirr for pushing this.
2018-08-07 10:48:43 +02:00
Andreas Lauser
0a8a791c49 ebos: make the brief description settable from the exterior
this allows `flow` to print something else than plain-`ebos`.
2018-08-06 10:46:28 +02:00
Atgeirr Flø Rasmussen
118e3f6dac Restore const-ness accidentally lost. 2018-07-31 15:35:15 +02:00
Atgeirr Flø Rasmussen
a63aac0491 Merge pull request #352 from andlaus/ebos_allow_no_fip
ebos: add possibility to disable the FIP output even if requested in the deck
2018-07-31 11:32:15 +02:00
Andreas Lauser
935b5a5a9d adapt to the fluid system naming convention change in opm-material 2018-07-27 12:56:19 +02:00
Andreas Lauser
ef845bb4f4 ebos: add possibility to disable the FIP output even if requested in the deck
this significantly reduces the noise level of debug files if the FIP
values are not of interest.
2018-07-26 12:31:32 +02:00
Andreas Lauser
29e113f1fd ebos: get rid of HAVE_ECL_{IN,OUT}PUT
there are about a trillion places within ebos where the availability
of the ECL I/O routines is hardcoded, so it does not make sense to
pretent that the EclWriter can be useful without them.

(in fact, ebos is deactivated at build system level if the ECL I/O
routines have not been detected.)
2018-07-12 13:47:01 +02:00
Andreas Lauser
b5ac85b5d0 ebos: simplify the output writing code if the default timeloop is used
`flow` doesn't, so it is unaffected.
2018-07-12 13:47:01 +02:00
Andreas Lauser
24fc04a102 collecttoiorank.hh: use camelCase consistently 2018-07-12 11:15:37 +02:00
Andreas Lauser
b92aee90b5 CollectToIORank: remove unnecessary whitespace, braces 2018-07-12 11:15:24 +02:00
Andreas Lauser
4342210b5e CollectToIORank: fix formatting of function declarations reduce unnecessary usage of whitespace 2018-07-12 11:00:56 +02:00
Andreas Lauser
88135e9f7c CollectToIORank: minor fixes to the boiler plate 2018-07-12 11:00:31 +02:00
Andreas Lauser
d9b3b5c2e5 CollectToIORank: reindent code 2018-07-12 11:00:26 +02:00
Andreas Lauser
4b2d114f90 properly handle exceptions in auxiliary modules and the problems pre- and postprocessing routines
so far, exceptions thrown there caused MPI to desynchronize.
2018-07-11 13:59:29 +02:00
Andreas Lauser
ed0542b53b ebos: make it work in parallel 2018-07-11 13:59:29 +02:00
Andreas Lauser
2c97fa302f auxiliary modules: add a callback that is called after the linear solver but before the solution update
amongst others, this allows to properly implement Schur complements.
2018-07-09 12:13:58 +02:00
Andreas Lauser
a395a6d6ce switch auxiliary modules from std::shared_ptr to raw pointers
lifetime management of these objects by shared pointers is not always
feasible; at least it is not always doable without awful hacks.
2018-07-09 12:13:58 +02:00
Andreas Lauser
cd725aeb8a ebos ECL output: move the parameter extraction code for the well data to the well model
this is supposed to be an implementation detail of the well model.
2018-07-09 12:13:58 +02:00
Andreas Lauser
8319a67862 ebos: make the well model user definable
this introduces a new property `EclWellModel` and uses the class which
it specifies instead of `EclWellManager` directly.
2018-07-09 12:13:57 +02:00
Atgeirr Flø Rasmussen
ad6645b8d3 Merge pull request #336 from andlaus/fix_extra_warnings
fix extra compiler warnings
2018-07-05 14:29:59 +02:00
Andreas Lauser
be881c6b00 Merge pull request #335 from totto82/fix_thpress_init
WIP Fix thpress restart
2018-07-05 09:08:12 +02:00
Andreas Lauser
864fc12469 fix extra compiler warnings
this is only relevant people who are masochistic enough to go beyond
`-Wall`. (note that at this warning level, there is plenty of noise from
Dune and other upstream dependencies.)
2018-07-02 09:17:56 +02:00
Tor Harald Sandve
95578a5d79 Fix thpress restart
THPRES is read from the restart file
We no longer need to compute it from the initial conditions if
defaulted.
2018-06-29 15:26:08 +02:00
Tor Harald Sandve
22d144c3cd rename completion to connection 2018-06-28 15:49:45 +02:00
Joakim Hove
edbeb4538e Merge pull request #328 from joakim-hove/rename-connection-set
Rename ConnectionSet -> WellConnections
2018-06-21 08:15:19 +02:00
Andreas Lauser
57f98d1612 ebos: allow to specify the ECL case name
... instead of just the full file name of the deck. this mirrors
flow's behavior.
2018-06-20 09:24:29 +02:00
Joakim Hove
7d972ab223 Rename ConnectionSet -> WellConnections 2018-06-17 14:39:23 +02:00
Andreas Lauser
c402ae4854 implement an "ECL output interval"
i.e., the ECL restart files are not necessarily updated after each
report step, but only each N-th (where N is the number specified by
the EclOutputInterval parameter). if this value is set to something
smaller than zero, the value which is computed by the EclipseState
object is used.
2018-06-15 20:27:42 +02:00
Andreas Lauser
26e6d56930 do explicit put properties into the the Ewoms::Properties namespace anymore
instead, do it implicitly by using the BEGIN_PROPERTIES and
END_PROPERTIES macros.
2018-06-15 20:22:07 +02:00
Andreas Lauser
739a0ef0d0 parameter system: add support for positional parameters
further, this cleans up the code of the parameter system and the
startup routines a bit and finally, it adds positional parameters
support to ebos as well as brief descriptions to ebos and the lens
problem.
2018-06-14 11:13:30 +02:00
Andreas Lauser
91c209eb09 some stylistic cleanups of the ECL writer 2018-06-14 11:13:30 +02:00
Joakim Hove
2bd9c0ea78 Rename Completions -> Connections 2018-06-11 14:11:32 +02:00