Atgeirr Flø Rasmussen
979637967d
Merge pull request #774 from dr-robertk/PR/catch-istl-error
...
AdaptiveTimeStepping: also catch ISTLError caused in AMG.
2015-03-30 13:03: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
Atgeirr Flø Rasmussen
81f7aaca68
Remove unused function argument.
2015-03-27 15:42:40 +01:00
Atgeirr Flø Rasmussen
488e2161dc
Suppress sign-comparison warnings.
2015-03-27 15:38:21 +01:00
Atgeirr Flø Rasmussen
f0e6b324b8
Merge pull request #773 from andlaus/check_for_final_keyword
...
FindCXX11Features.cmake: check for the c++-2011 "final" specifier
2015-03-27 12:36:20 +01:00
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
fb17a46064
FindCXX11Features.cmake: check for the c++-2011 "final" specifier
2015-03-26 23:52:32 +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
b199d2b61b
Merge pull request #708 from andlaus/do_not_strip_by_default
...
build system: do not separate the debugging symbols by default
2015-03-26 12:39:42 +01:00
Atgeirr Flø Rasmussen
a722748af0
Merge pull request #705 from andlaus/alugrid_dune_2.4
...
FindAlugrid.cmake: do not try to include the whole grid
2015-03-26 12:35:28 +01:00
Bård Skaflestad
1b540ff962
Merge pull request #771 from atgeirr/fix-init-celldeps
...
Fix property method calls.
2015-03-24 09:45:10 +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
Bård Skaflestad
91dc1ccc47
Merge pull request #769 from dr-robertk/PR/eclipsewriter-only-summary-in-substeps
...
Eclipsewriter: only write summary in substeps
2015-03-10 12:32:00 +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
Joakim Hove
89b6770cf4
Merge pull request #724 from joakim-hove/use-OpmLog
...
Not creating Logger instance explicitly.
2015-03-09 08:08:10 +01:00
Joakim Hove
ac79ee0dbf
Not creating Logger instance explicitly.
2015-03-09 08:01:20 +01:00
Bård Skaflestad
7a5f188dd3
Merge pull request #768 from chflo/OPM_157_RFT_write
...
OPM 157 write RFT data
2015-03-07 14:58:04 +01:00
chflo
6ce177e63f
OPM-157: Added anonymous namespace for test helper methods
2015-03-06 14:16:48 +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
Atgeirr Flø Rasmussen
05b2adb28d
Merge pull request #766 from dr-robertk/PR/add-iterationcount-to-simreport
...
SimulatorReport: add total number of newton and linear iterations to report struct.
2015-03-05 09:26:16 +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
Bård Skaflestad
9755eb4887
Merge pull request #764 from blattms/uggridhelpers-completion
...
Moves all functions that do not depend on Eigen to Opm::UgGridHelpers. [1/3]
2015-03-02 18:49:49 +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
0b2cd4efa9
Merge pull request #763 from atgeirr/fix-warning
...
Fix unneeded-internal-declaration warning.
2015-03-02 10:34:33 +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
Atgeirr Flø Rasmussen
bac806d5a3
Merge pull request #761 from blattms/generic_eqil
...
Ported initStateEquil to using the GridHelpers.
2015-02-20 14:44:59 +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
Atgeirr Flø Rasmussen
735c4a7819
Merge pull request #760 from blattms/unsigned-signed-comp-parallel-istl
...
Prevents unsigned-signed-comparison warnings for container with signed size
2015-02-19 09:26:24 +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
Atgeirr Flø Rasmussen
37bba7e3ae
Merge pull request #759 from totto82/fix_horizontalscaling
...
BUG: use the scaled water saturation
2015-02-18 13:15:17 +01:00
