Commit Graph

293 Commits

Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
98cf664b3f Silence unused argument warning. 2014-12-02 09:17:11 +01:00
Andreas Lauser
e530ce03d8 PVT properties: allow them to be temperature dependent
Note that this patch does not introduce any real temperature
dependence but only changes the APIs for the viscosity and for the
density related methods. Note that I also don't like the fact that
this requires so many changes to so many files, but with the current
design of the property classes I cannot see a way to avoid this...
2014-12-01 20:06:31 +01:00
Atgeirr Flø Rasmussen
e2fdf14ee3 Suppress unused argument warning. 2014-11-05 07:51:21 +01:00
Atgeirr Flø Rasmussen
b7a6680ef4 Merge pull request #672 from dr-robertk/PR/remove-unused-typedef-warning
remove unused typedef to avoid compiler warning and keep code clean.
2014-10-24 14:28:55 +02:00
Robert K
81d3281999 remove unused typedef to avoid compiler warning and keep code clean. 2014-10-24 12:51:57 +02:00
Robert K
12891f668b fix problem with solver reastart, variable was not reset.
Also, the time step does only grow moderately after a solver restart.
2014-10-24 12:32:00 +02:00
Robert Kloefkorn
42bcb5f0c8 address Atgeirs comments. 2014-10-20 12:32:11 +02:00
Robert Kloefkorn
f8e61c0267 also catch std::runtime_error, i.e. convergence of linear solver failed. 2014-10-14 15:18:36 +02:00
Robert Kloefkorn
164b892c17 added initial fraction to initialize last_timestep. 2014-10-13 11:17:37 +02:00
Robert Kloefkorn
44f90f974e Two small adjustments that came up when running in debug mode. 2014-10-10 13:55:28 +02:00
Robert Kloefkorn
80431e273f ok, now we got it. euclidianNormSquared. 2014-10-07 14:14:31 +02:00
Robert Kloefkorn
ba316dd651 more convenient name. 2014-10-07 10:45:09 +02:00
Robert Kloefkorn
b111fbbb15 innerProduct --> euclideanNorm2. 2014-10-07 10:40:44 +02:00
Robert Kloefkorn
ef813c94cc inner_product --> innerProduct. Avoid confusion with std version. 2014-10-07 09:52:22 +02:00
Robert Kloefkorn
b250383ae0 use unit::convert::to instead of hard coded 86400 factor. 2014-10-07 09:48:57 +02:00
Robert K
355e68c63b move implementation to .cpp files. 2014-10-06 14:26:23 +02:00
Robert K
5af49ed90b the adaptive time stepping utility classes. 2014-10-06 14:06:07 +02:00
Robert K
879dddc9b6 move protected area to the bottom and remove unused lines as well as halfTimeStep method. 2014-10-03 15:53:18 +02:00
Robert K
e1d1063e0d remove white spaces. 2014-10-03 14:14:01 +02:00
Robert K
0ed28121a1 reset to old state. 2014-10-03 14:10:56 +02:00
Robert K
e69c37167c renamed and split advance method. 2014-10-03 13:44:05 +02:00
Robert K
c371d4fa22 class for handling adaptive time steps. 2014-10-03 13:33:13 +02:00
Robert K
f6c9bc9090 improvement of the time step adjustment. 2014-10-02 14:04:32 +02:00
Robert K
92d5f43d82 sub step simulator timer. 2014-10-01 13:56:27 +02:00
Robert K
9517359d3f reset master. 2014-10-01 13:55:42 +02:00
Robert K
d42d0a6cbe SubStepSimulationTimer for time step control. Needs documentation and cleanup. 2014-09-30 15:55:26 +02:00
Andreas Lauser
bd0bfc172b adapt the the table related API changes of opm-parser 2014-09-19 14:40:35 +02:00
Tor Harald Sandve
a7ecde25ce Include goc and woc in the span for the phase pressure calculation 2014-09-02 14:49:09 +02:00
Tor Harald Sandve
e44b045260 Remove fix for GOC and WOC above/below reservoir 2014-09-02 14:49:09 +02:00
Tor Harald Sandve
37e526a046 Fix sign error in the specified oil pressures at at WOC and GOC
The oil pressure at the contact for the special cases:

contact	location	po(contact)
GOC 	above 	-inf
GOC 	below 	+inf
WOC 	above 	-inf
WOC 	below 	+inf
2014-08-27 14:35:01 +02:00
Tor Harald Sandve
704e7dbb58 Currectly handling GOC below and WOC above the reservoir The phase pressure of water and gas is set to inf when WOC and GOC is above and below the reservoir. This make sure the minimum saturation values are picked for these cases. 2014-08-27 10:10:55 +02:00