Commit Graph

169 Commits

Author SHA1 Message Date
Andreas Lauser
2dacfc8c15 convert the examples and the tests to opm-parser 2014-04-25 14:25:54 +02:00
Kai Bao
5dd0434707 Added the test code and test data.
Added TESTTIMER.DATA and test_timer.cpp
2014-03-26 17:53:06 +01:00
Kai Bao
500053d6aa A new SimulatorTimer Class 2014-03-26 15:53:54 +01:00
Joakim Hove
a845cfdfd7 Removed WellsManager constructor which takes an ole Eclipsegridparser instance. 2014-03-25 18:57:58 +01:00
Kai Bao
54316c19c8 Output correct information for temporary use.
Change the SimulatorTimer class a little bit to output the totaltime and
current time correctly.
2014-03-24 16:41:02 +01:00
Andreas Lauser
f2e9016bd0 SimulatorTimer: allow it to be limited to a sub-range of all report steps 2014-03-19 11:36:39 +01:00
Andreas Lauser
caf10e0e7f SimulatorTimer: rename currentTime() to simulationTimeElapsed()
because the name "currentTime()" can be mistaken for the point in
real-life time at which the simulation is run (e.g. March 11, 2014,
15:07:45.123), the _point_ in time which the simulator timer currently
represents (e.g. Jun 5, 1985, 02:33:12.345) instead of the simulator
time in seconds which elapsed since the START date
(e.g. 52633.345 s).

this rename may lead to some fallout in other modules. I'll
fix them after this PR has been merged...
2014-03-12 19:01:58 +01:00
Andreas Lauser
85a0032247 SimulatorTimer: make it possible to base it on opm-parser's TimeMap
Since SimulatorTimer is a fairly shallow shim if using the TimeMap, it
can also be removed relatively easily. Having said this, that would
trigger _many_ changes in _a lot_ of places and I'm not motivated at
all to fight that battle as long as the old parser needs to be
supported. I thus decided that the best way is to add a "wrapper mode"
to SimulationTimer...
2014-02-27 12:56:23 +01:00
Roland Kaufmann
f30ab55974 Provide routine to return the step length taken
The output routine needs to know which step that has been taken in the
past (to arrive at this result), not which step to take next going
forward.
2013-11-27 00:36:17 +01:00
Roland Kaufmann
73dfe849d6 Replace unclear constant with better documentation
The step number is zero before the first timestep has been taken, and
one after. The step number is one before the second timestep has been
taken, and two after. This was not clear from the text.
2013-11-27 00:23:00 +01:00
Roland Kaufmann
2ba7b3329d Make starting timestep more explicitly known
One-based or zero-based? Better be documented (in a way that doesn't
promote hard-coding in the clients!)
2013-11-26 12:44:37 +01:00
Bård Skaflestad
8159104218 Fix null-pointer dereference during well construction
The three-argument WellsManager constructor needs access to the real
permeability field lest a null-pointer dereference result when the
problem actually contains any wells.
2013-09-25 15:11:14 +02:00
Andreas Lauser
aa62980fbf catch all exceptions in all tutorials and examples 2013-09-05 13:04:38 +02:00
Andreas Lauser
2cfe79f664 convert users of the ASSERT and the ASSERT2 macros to standard assert() 2013-09-05 13:04:37 +02:00
Andreas Lauser
f4a22486ef convert THROW to OPM_THROW 2013-09-05 13:04:37 +02:00
Júlio Hoffimann
43438b2bf8 Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Andreas Lauser
a2065b4101 make config.h the first header to be included in any compile unit
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
2013-04-10 12:56:14 +02:00
Atgeirr Flø Rasmussen
f3ec8e1634 Moved ColumnExtract and initState.
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
2013-03-18 12:47:23 +01:00
Atgeirr Flø Rasmussen
bfa9997dd2 Renamed newwells.h -> wells.h.
Also moved implementation file to subdir.
2013-03-18 10:33:34 +01:00
Atgeirr Flø Rasmussen
5fc63031ed Move GridManager to grid subdir.
Also remove GridAdapter (moved to dune-cornerpoint), and
moved grid.c implementation file to grid subdir.
2013-03-18 10:16:46 +01:00
Atgeirr Flø Rasmussen
e83057e0ea Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
ddd41bfcd7 Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00
Atgeirr Flø Rasmussen
f893adbda6 Document function currentDateTime(). 2012-11-26 10:49:15 +01:00
Joakim Hove
09b3ef785c Added start_date_ property to the SimulatorTimer class 2012-11-07 14:53:26 +01:00
Atgeirr Flø Rasmussen
158c33eb53 Constructors of *FromDeck classes now take an UnstructuredGrid.
This is a change from taking a vector containing the mapping to
deck-consistent logical cartesian indices. The mapping is contained
in the UnstructuredGrid::global_cell member, and may be null. The
change therefore saves the overhead of constructing a vector as a
copy of the data in the grid or (if null) as an identity mapping.
2012-08-10 10:12:45 +02:00
Atgeirr Flø Rasmussen
ffdf7ed4f7 Adapt to possibility for Cartesian grids from deck input.
Now we may have a grid generated from deck input using the
keywords DXV, DYV, DZV, which will have a null pointer for
the global_cell mapping. We check if this pointer is null,
and create an identity mapping in this case. The mapping is
needed by the *PropertiesFromDeck classes (and helpers).
2012-08-09 14:35:00 +02:00
Atgeirr Flø Rasmussen
67c13e794a Moved SimulatorTimer class to opm/core/simulator directory. 2012-06-14 14:02:22 +02:00
Atgeirr Flø Rasmussen
bad5614ced Examples and tutorials follow change to IncompTpfa interface. 2012-06-12 15:28:53 +02:00
Atgeirr Flø Rasmussen
3487ee840d Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
Atgeirr Flø Rasmussen
13334f97d7 Renamed initStateTwophaseFromDeck() -> initStateFromDeck().
- Made initStateFromDeck() into a template taking arbitrary properties.
Implementation detail:
  - initWaterOilContact() was also templatized on props.
  - initHydrostaticPressure() is now overloaded on prop interface types.
2012-05-16 11:37:31 +02:00
Atgeirr Flø Rasmussen
efce958c3b Now computePorevolume() takes a porosity array instead of a property object.
This is to make it compatible with blackoil properties.
An alternative would be to give [Incomp|Blackoil]PropertiesInterface a
common base class (RockInterface?) with the common rock-related methods.
2012-05-14 21:47:10 +02:00
Kjetil Olsen Lye
886457002e Changed some minor bugs in the refactored code in wells_example 2012-05-08 12:23:58 +02:00
Kjetil Olsen Lye
0bd88866f2 Refactored some computations into seperate methods in wells_example.cpp 2012-05-08 11:04:15 +02:00
Kjetil Olsen Lye
72a0db5f73 removed an extra uneeded call to the pressure solver 2012-05-07 15:51:54 +02:00
Kjetil Olsen Lye
562573a078 Inserted rock_comp into wells_example. 2012-05-07 13:29:52 +02:00
Kjetil Olsen Lye
6782067d8d Made a maximum number of iterations in wells_test 2012-05-03 15:35:44 +02:00
Kjetil Olsen Lye
81a9d2a5c1 Added calculation of fractional flows and per phase flows in wells_example 2012-05-03 12:29:18 +02:00
Kjetil Olsen Lye
bebe50afb0 Final fixes for new well structure (to make it compile) 2012-05-02 13:02:59 +02:00
Kjetil Olsen Lye
7c6ac0bf09 Completly revamped the way group control is checked 2012-04-25 16:14:40 +02:00
Atgeirr Flø Rasmussen
6b00381393 Removed unused saturation argument from conditionsMet() methods. 2012-04-25 14:03:57 +02:00
Atgeirr Flø Rasmussen
8acd9d9f63 Fixed bug in computeWDP(), add gravity argument. Make WellReport output in friendly units. 2012-04-25 12:37:30 +02:00
Atgeirr Flø Rasmussen
4e55e8c912 Minor change to computeWDP() interface. 2012-04-24 13:48:00 +02:00
Kjetil Olsen Lye
1d54445546 Added a (small) hack to wellmanager (defaulting injected_phase to water) 2012-04-23 13:24:47 +02:00
Kjetil Olsen Lye
4197f16a14 Passed around a WellControlResult argument to the different wellcontrol functions 2012-04-17 16:36:49 +02:00
Kjetil Olsen Lye
d557b91db0 Made use of the new LinearSolverFactory in wells_example 2012-04-16 12:18:37 +02:00
Kjetil Olsen Lye
fe739986be modified the group control interface slightly 2012-04-13 20:41:09 +02:00
Kjetil Olsen Lye
fb95c6da19 Added computations for total flow for each well 2012-04-13 14:22:44 +02:00
Kjetil Olsen Lye
fcca65748e Added checks for BHP and fluid_volume_rate for group control. Also added error tolerance for group control 2012-04-13 12:57:47 +02:00
Kjetil Olsen Lye
40ac7414ac Made a (possibly wrong) adjustment to well_controls_append. Each control now has its current index set to 0, as there's only supposed to be one control per well. 2012-04-12 18:47:06 +02:00
Kjetil Olsen Lye
23019eb23d Made a computeWDP-function 2012-04-12 17:50:51 +02:00