Commit Graph
324 Commits
Author SHA1 Message Date
chflo a949d5a736 OPM-218: Write restart files at same interval as eclipse 2015-08-05 13:38:52 +02:00
chflo 338777f514 OPM-218: Fix Flow vs Eclipse restart interval write differences: Override method from SimulatorTimerInterface 2015-07-27 13:26:28 +02:00
chflo 0f064bea3e OPM-218: Fix Flow vs Eclipse restart interval write differences: Added new method to SimulatorTimerInterface 2015-07-27 13:25:33 +02:00
Robert Kloefkorn ae740adaf3 SimulatorState: use register{Cell/Face}Data also in SimulatorState. 2015-07-08 16:30:51 +02:00
Robert Kloefkorn 0ad5146b1f make ids protected. 2015-07-08 13:24:19 +02:00
Robert Kloefkorn 034f163d88 SimulatorState: clear memory on init. 2015-07-08 13:23:36 +02:00
Robert Kloefkorn 5ca0a0f788 SimulatorState: added copyright
BlackoilState: added copyright

Also, small docu fix.
2015-07-08 13:23:36 +02:00
Robert Kloefkorn 3bc520eeb7 SimulatorState: store all data in a vector to allow for flexibility when used with
derived states.
BlackoilState: adjusted to SimulatorState changes.
2015-07-08 13:23:36 +02:00
Atgeirr Flø Rasmussen 7df516896d Fix unused argument warnings. 2015-07-08 12:37:11 +02:00
Andreas Lauser 3c484e4c6f add some fluid state classes
namely BlackoilStateToFluidState which takes a BlackoilState object
and exposes it as a opm-material like fluid state object. Similar for
ExplicitArraysFluidState, which takes raw arrays.

since fluid states are a local API, the index of the cell to be used
for these two classes must be set externally. The advantage of this
concept is that it is possible to make "saturation functions" which
not only depend on saturations but also on arbitrary other quanties
(like temperature or phase composition) without having to change the
API of the "saturation" functions.
2015-06-29 14:49:20 +02:00
Atgeirr Flø Rasmussen 590a4898b8 Add missing include statement. 2015-06-22 13:04:14 +02:00
Edvin Brudevoll 9ec438f0d1 OPM-188: Fixup after review 2015-06-17 09:41:00 +02:00
Atgeirr Flø Rasmussen a645c82a00 Silence multiple warnings.
Also add more warnings to the disabling list of disable_warnings.h.
2015-05-28 14:05:09 +02:00
Atgeirr Flø Rasmussen 06e7286443 Suppress a warning in serial mode. 2015-05-27 11:41:52 +02:00
Markus Blatt 494ab71924 Update copyright 2015-05-27 11:07:16 +02:00
Markus Blatt 347d1a8e23 Makes the time step control parallel.
The only stage where parallelism changes the adaptive time
stepping is when some inner products on the saturation and
pressure are computed.
This commit makes this part parallel by added an additonal boost::any
parameter to the time stepping and the controller. Per default this
is empty. In a parallel run it contains a ParallelIstlInformation object
encapsulating the information about the parallelisation. This then used
to compute the parallel inner product.
2015-05-27 11:07:16 +02:00
Markus Blatt 973df44ea1 Allow to prevent SimulatorReport for printing to std::cout.
This commit adds a verbose flag to the constructor of
SimulatorReport to allow for deactivating any
output to std:cout. This is handy for parallel runs where we only
want to print statistics on one process.
2015-05-08 11:12:23 +02:00
Atgeirr Flø Rasmussen 1845aa65f6 Adjust parameters after testing. 2015-04-22 13:03:19 +02:00
Atgeirr Flø Rasmussen e70712f2d2 Modify default parameters to be suitable for the Norne case. 2015-04-21 11:41:45 +02:00
Atgeirr Flø Rasmussen 272b63e25d New method SimulatorReport::reportFullyImplicit().
It does not make sense to report transport and pressure separately
for fully implicit solvers. It still makes sense to separate solver
from init and output though.
2015-04-21 10:48:02 +02:00
Tor Harald Sandve 9b2ca4d1d3 Add dune/istl/istlexception.hh to header
Fix to make it compile with dune-istl 2.2
2015-04-10 14:03:27 +02:00
Andreas Lauser 28bde4290f do not pass the deck to the output writers anymore
I'd prefer to pass it for consistency reasons (because basically every
other class which takes an EclipseState object also requires a deck
object), but some people seem to have a very strong option about
this...
2015-03-31 12:12:02 +02:00
Robert Kloefkorn 79f6bedf38 AdaptiveTimeStepping: also catch ISTLError casued in AMG when time step is to large. 2015-03-30 11:07:08 +02:00
Andreas Lauser e03334a2f5 use deck units for the summary output
or more accurately: "use FIELD or METRIC units", LAB and PVT-M units
are still unsupported, but they seem to be pretty exotic and are also
not supported by opm-parser either...

note that this patch requires an API change (with the usual
consequences for all downstream modules which use this class) because
the deck needs to be passed to EclipseWriter. If somebody knows a
canonical way to get the names of the written units from EclipseState,
this is API change is not required.
2015-03-26 17:33:02 +01:00
Atgeirr Flø Rasmussen 194a9bfd39 Fix property method calls.
Cell argument can not be null for BlackoilPropertiesFromDeck class.
2015-03-23 16:19:40 +01:00
Robert Kloefkorn 148fc8b431 iostream --> ostream. 2015-03-04 14:48:50 +01:00
Robert Kloefkorn 03a50f7ce2 SimulatorReport: add total number of newton and linear iterations to report struct. 2015-03-04 14:01:13 +01:00
Atgeirr Flø Rasmussen 18fc452ef0 Fix unneeded-internal-declaration warning.
Again related to anonymous namespace function only being used
in template functions.
2015-03-02 10:28:55 +01:00
Markus Blatt 3cc072b320 Put spaces around operators. 2015-02-20 14:30:06 +01:00
Markus Blatt 55d26b358c Rely on auto instead of querying the explicit type
via e.g. typename UgGridHelpers::Face2VerticesTraits<Grid>::Type
2015-02-20 14:29:05 +01:00
Markus Blatt ec2b0e180e Ported initStateEquil to using the GridHelpers.
Currently the keyword EQUIL is not supported by the fully
implicit blackoil simulator when using CpGrid. This
commit is a first step towards this as it makes the
implementation of initStateEquil generic.
2015-02-20 09:39:50 +01:00
Atgeirr Flø Rasmussen 4a1a14d1da Suppress unused argument warning. 2015-02-17 10:27:44 +01:00
Robert K c52f2cc621 AdaptiveTimeStepping: remove initial_fraction (use restart factor instead) and use
average of previously used time steps to suggest next time step.
2015-02-10 13:10:39 +01:00
Atgeirr Flø Rasmussen b1ab170219 Merge pull request #746 from dr-robertk/PR/adaptive-timestepping-bugfixes
Adaptive timestepping improvements.
2015-02-06 14:27:44 +01:00
Robert K fbaa790e70 AdaptiveSimulatorTimer: -improvement in time step adjustment near end of time interval
-max time step parameter

PIDTimeStepControl --> TimeStepControl:
- added simple iteration count time step control
- bug fix in PIDAndIterationCountTimeStepControl

AdaptiveTimeStepping: apply the above changes.
2015-02-06 13:59:50 +01:00
Markus Blatt cb4bb025f7 Improve the documentation a bit. 2015-02-05 15:43:48 +01:00
Markus Blatt 37f9d5d14e Use correct name for the method parameter. 2015-02-05 15:43:22 +01:00
Robert K e4ddabd9ad BlackoilState: added forgotten rv to equal method. 2015-01-29 11:07:24 +01:00
Robert K ef80032743 make documentation equal for all three classes. 2015-01-28 15:46:11 +01:00
Robert K 99e291d0ca SimulatorTimer...: added method advance which is the new interface for previously used
operator++.
2015-01-28 15:25:11 +01:00
Robert K e6f7b2762d AdaptiveTimeStepping: make output more easy to read. 2015-01-16 16:08:59 +01:00
Robert K a6f00b90ac AdaptiveTimeStepping: Switch suggested time step to max of the previous taken substeps. 2015-01-16 16:08:59 +01:00
Robert K f38b76abe9 AdaptiveSimulatorTimer: initialization of first time step size follows the same rule as
for later steps.
PIDTimeStepControl: added maxgrowth factor which indicates the maximum allow groth of
                    the time step from one to the next value.
2015-01-16 16:08:59 +01:00
Robert K d97f622f91 EclipseWriter: remove leftovers of WriterTimer.
AdaptiveSimulatorTimer: use back instead of rbegin.
2015-01-15 11:34:59 +01:00
Robert K 65a314db92 cleanup: reportStepIdx --> writeStepIdx.
startDate     --> startDateTime
         removal of debug output.
2015-01-09 16:22:03 +01:00
Robert K 6eeecbb02b - adjust OutputWriter to SimulatorTimerInterface
- remove WriterTimer from EclipseWriter and use SimulatorTimerInterface
- adjust to the above in AdaptiveTimeStepping.
2015-01-09 16:22:03 +01:00
Robert K 4d1a2ad918 Introduce an interface for SimulatorTimer and AdaptiveSimulatorTimer.
currentDateTime and currentPosixTime are default implementations.
2015-01-09 16:21:20 +01:00
Robert K 10cffa770b EclipseWriter: allow for writing of substeps in addition to report steps. 2015-01-09 16:21:03 +01:00
Tor Harald Sandve ed0854bc88 Fix comments. 2015-01-09 09:10:10 +01:00
Tor Harald Sandve cf142969c8 Renaming well is shut to well is stopped.
Rename the the meaning for shut as whats used in Eclipse.
STOP: Well stopped off above the formation. I.e. allow for flow in the
well.
SHUT: Well completely isolated from the formation. The well is removed
from the well list.
2015-01-09 09:10:10 +01:00