Commit Graph

2275 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
839bd724cb Merge pull request #772 from andlaus/use_deck_units_for_summary_output
Use deck units for summary output
2015-03-27 12:30:13 +01:00
Andreas Lauser
126827d166 summary writer: fix up the absolute times 2015-03-26 17:33:07 +01: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
Andreas Lauser
59c8fb83d4 write out the cell temperature field
I used "TEMP" as the name of the field of the UNRST files, but that is
just a guess. (I don't have access to any results of a thermal run of
the "It Defines The Truth (TM)" simulator.)
2015-03-26 17:33:00 +01:00
Atgeirr Flø Rasmussen
ca9c198368 Merge pull request #765 from andlaus/implement_temperature_dependent_density
Implement temperature dependent density
2015-03-26 15:10:13 +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
Andreas Lauser
a386621495 add a wrapper for thermal gas PVT objects 2015-03-17 12:40:14 +01:00
Andreas Lauser
0b85af1bb6 add a wrapper for thermal oil PVT objects 2015-03-17 12:40:09 +01:00
Andreas Lauser
2a52c2926d add a wrapper for thermal water PVT objects 2015-03-17 12:40:07 +01:00
Andreas Lauser
0aa7620a0e PVT classes: do not implement temperature dependence directly anymore
instead, we will be going with wrapper classes around the PvtInterface
in the next commits. this considerably reduces the amount of
copy-and-paste required for temperature support.
2015-03-17 12:40:05 +01:00
Robert Kloefkorn
50a0ca8d5d [revision] restructure convertUnitTypeErtEclUnitEnum to comply with core standards. 2015-03-10 12:05:41 +01:00
Robert Kloefkorn
c952075556 [cleanup] use std::invalid_argument instread of OPM_THROW. 2015-03-10 11:07:56 +01:00
Robert Kloefkorn
75639d2824 [cleanup] remove warnings and avoid return of uninitialized values. 2015-03-09 10:41:00 +01:00
Robert Kloefkorn
a854bdc5b8 EclipseWriter: only write summary in sub steps that are not report steps. 2015-03-09 10:39:22 +01:00
chflo
17afda792b OPM-157: Write RFT data: Added comment on cleanup of memory 2015-03-05 16:04:43 +01:00
chflo
0abf53a0ae OPM-157: Write RFT data using the EclipseWriteRFTHandler class 2015-03-05 15:34:30 +01:00
chflo
4c932207a9 OPM-157: Added writehandler for RFT data, and corresponding test 2015-03-05 15:34:29 +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
Markus Blatt
71056f45d6 Renames ADCellVolumesTraits to CellVolumeIteratorTraits. 2015-03-02 11:15:08 +01:00
Markus Blatt
adc499b036 Moves all functions that do not depend on Eigen to Opm::UgGridHelpers. 2015-03-02 11:15:08 +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
Atgeirr Flø Rasmussen
e1f6e396a8 Merge pull request #762 from atgeirr/fix-minor-doc-issue
Doc fix: face -> cell.
2015-02-20 14:52:21 +01:00
Atgeirr Flø Rasmussen
60ae384ba8 Doc fix: face -> cell. 2015-02-20 14:51:03 +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
Markus Blatt
7cebb3905b Adds funcionality to access the vertices of the faces and their coordinates.
This is needed for a grid agnostic implementation of EQUIL.
2015-02-20 09:35:29 +01:00
Markus Blatt
d5180c793a Prevents unsigned-signed-comparison warnings for container with signed size.
Well, you never know. There are containers that use a signed integer
for storing its size. This results in a warning about comparing signed with
unsigned integers. This commit prevents this by explicitly casting the size
to std::size_t.
2015-02-19 09:13:39 +01:00
Atgeirr Flø Rasmussen
1fef49c2e1 Merge pull request #758 from atgeirr/fix-warnings
Fix warnings (and small API change)
2015-02-18 13:16:01 +01:00
Tor Harald Sandve
09a15c6e58 BUG: use the scaled water saturation 2015-02-18 08:13:49 +01:00
Atgeirr Flø Rasmussen
1ff48cb87a Complete function argument cleanup. 2015-02-17 13:56:02 +01:00
Atgeirr Flø Rasmussen
eb82269900 Remove unused argument from several functions. 2015-02-17 10:28:11 +01:00
Atgeirr Flø Rasmussen
4a1a14d1da Suppress unused argument warning. 2015-02-17 10:27:44 +01:00
Atgeirr Flø Rasmussen
13df6b91b7 Suppress unused argument warning. 2015-02-17 10:27:19 +01:00
Atgeirr Flø Rasmussen
dcc9fe5f41 Use C++ explicit default initialization.
Avoids warning from -Wmissing-field-initializers.
2015-02-17 10:24:03 +01:00
Atgeirr Flø Rasmussen
0895eb37e6 Merge pull request #756 from chflo/opm-166
OPM-166: Use SimulationConfig instead of Deck to get threshold pressure
2015-02-16 12:49:53 +01:00
Atgeirr Flø Rasmussen
8e4a5dfb3f Merge pull request #755 from blattms/istl-consistent-rhs
Makes right hand side passed to linear solver consistent.
2015-02-16 12:48:28 +01:00
chflo
c7cbb4ea12 opm-166: Changes after review 2015-02-16 11:59:16 +01:00
chflo
0e2f786480 OPM-166: Use SimulationConfig instead of Deck to get threshold pressure 2015-02-16 08:43:47 +01:00
Atgeirr Flø Rasmussen
1315be7be6 Merge pull request #752 from atgeirr/compute-well-pairs
Improvements for flow diagnostic tools
2015-02-15 12:49:29 +01:00
Markus Blatt
a1e5b55c3b [fixup] Use the correct function.
This should have been in the las commit and should be added there before
merging.
2015-02-13 11:00:28 +01:00
Markus Blatt
a31fae4507 Makes right hand side passed to linear solver consistent.
Due to the size of the overlap layer and the discretization scheme
the rhs might not contain correct values for overlap cells. This
commit makes sure they are correct by an additional communication step.
2015-02-12 21:00:32 +01:00
Joakim Hove
d6bf9d3a36 Merge pull request #750 from qilicun/support_minpvf
Support minpvf.
2015-02-12 09:34:28 +01:00
Liu Ming
ea98e431bc adapt to api changes of opm-parser. 2015-02-12 16:04:41 +08:00
Atgeirr Flø Rasmussen
37fa48cfbe Added computeWellPairs() function. 2015-02-11 14:03:47 +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
Liu Ming
4d7309b1bf Support minpvf. 2015-02-09 11:25:09 +08: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