Commit Graph
2295 Commits
Author SHA1 Message Date
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
Atgeirr Flø Rasmussen 1719e9f948 Silence PLT complaint spam.
While the warning is correct, it is not a good idea to spam
it for all wells and timesteps.
2015-04-21 10:47:55 +02:00
Joakim Hove ea3fbcf317 Added bool time_in_days to ecl_sum constructor.
The ert ecl_sum class is avare of time units; for FIELD and METRIC units
the time in the summary files is stord in days, for LAB units it is
stored in hours. From EclipseWriter this is managed by a bool flag
'time_in_days'.
2015-04-16 18:33:12 +02:00
Bård Skaflestad aea968877f Merge pull request #786 from atgeirr/unhandled-arguments
Store unhandled command-line arguments
2015-04-14 16:59:45 +02:00
Atgeirr Flø Rasmussen f902b7e265 Modified behaviour for unhandled arguments.
Use constructor argument verify_syntax to decide course of action: if false,
store unhandled arguments, if true, write a message and throw.
2015-04-14 15:29:55 +02:00
Atgeirr Flø Rasmussen dfe6e730eb Return const reference from unhandledArguments(). 2015-04-14 13:55:29 +02:00
Atgeirr Flø Rasmussen 1fb2bc651c Store unhandled command-line arguments.
A new method ParameterGroup::unhandledArguments() is available to
access the list of unhandled arguments. Before, when such arguments
were encountered they were ignored and a warning was printed to
standard out.

Apart from the lack of a (potentially misleading) warning, this
should not change the behaviour of existing clients of the class.
2015-04-14 13:39:43 +02:00
Markus Blatt 8ced45959f Correct documentation of why we use operator[] to initialize map.
This commit updates the source code comment about using operator[] to
initialize the unordered map. Thanks to Bard's persistence we found
out that the cause is not the construction of the key value of type
std::string from const char* but the mapped type being a (mutable)
char* (due to C?).

This completes the PR #784.
2015-04-14 09:36:47 +02:00
Markus Blatt 5347ac5aa3 Deactivate PETSc's KSPCHEBYSHEV (not available in 3.2!) 2015-04-13 11:01:24 +02:00
Markus Blatt 760cea8b44 Use operator[] to populize unordered_map with string as the key
g++-4.4 has problems converting const char* to char*
which it thinks is needed for constructing std::string.
Using operator[] circumvents this problem.

The compiler error fixed here was:
/usr/include/c++/4.4/bits/stl_pair.h: In constructor ‘std::pair<_T1, _T2>::pair(std::pair<_U1, _U2>&&) [with _U1 = const char*, _U2 = const char*, _T1 = const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, _T2 = char*]’:
/home/mblatt/src/dune/opm/opm-core/opm/core/linalg/LinearSolverPetsc.cpp:40:   instantiated from here
/usr/include/c++/4.4/bits/stl_pair.h:107: error: invalid conversion from ‘const char*’ to ‘char*’
make[2]: *** [CMakeFiles/opmcore.dir/opm/core/linalg/LinearSolverPetsc.cpp.o] Fehler 1
2015-04-13 10:58:31 +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 8eed770265 fix screw-up in the unit handling for the summary output
basically, the unit system was reversed for rates and a
UnitSystem::UnitType object was implicitly casted to bool for the
bottom hole pressure monitor. (if the BHP monitor worked, it was only
by accident...)
2015-04-08 13:36:43 +02:00
Atgeirr Flø Rasmussen 1d2849691f Merge pull request #775 from atgeirr/suppress-warnings
Suppress warnings
2015-04-07 09:13:14 +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
Andreas Lauser db35b75975 summary output: use the EclipseState to determine the deck unit system
seems like the guy who added EclipseState::getDeckUnitSystem() suffers
from dementia...
2015-03-31 12:11:57 +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 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