Commit Graph

5050 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
04edb4d0e4 Merge pull request #782 from atgeirr/cmake-fixes
Update Eigen requirements.
2015-04-10 15:19:01 +02:00
Atgeirr Flø Rasmussen
ad92779c4d Update Eigen requirements.
Manually imported from opm-autodiff.
2015-04-10 15:17:25 +02:00
Bård Skaflestad
5830194474 Merge pull request #779 from andlaus/reduce_default_optimization_level
reduce the default optimization level from -O3 to -O2
2015-04-09 19:48:50 +02:00
Andreas Lauser
470906ea6f reduce the default optimization level from -O3 to -O2
-O3 is sometimes declared "unsafe"
(cf. https://wiki.gentoo.org/wiki/GCC_optimization ) and it seems like
it bit us in https://github.com/OPM/opm-material/issues/23 if GCC 4.8
was used. so let's play safe and use -O2 for now...
2015-04-09 15:35:29 +02:00
Atgeirr Flø Rasmussen
f236d19b70 Merge pull request #777 from jorgekva/petsc-support-build
Cleans up PETSc detection
2015-04-08 14:03:56 +02:00
Jørgen Kvalsvik
c9741ef16a Cleans up PETSc detection
Now building will no longer fail if PETSc isn't available, and it correctly
degrades if it cannot find an available MPI. It should now behave similarly as
other optionals, such as SuperLU.
2015-04-08 13:59:56 +02:00
Atgeirr Flø Rasmussen
8b27660c02 Merge pull request #778 from andlaus/fix_summary_units
fix screw-up in the unit handling for the summary output
2015-04-08 13:44:39 +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
Atgeirr Flø Rasmussen
78682c7139 Merge pull request #776 from andlaus/use_EclipseState_for_summary_units
summary output: use the EclipseState to determine the deck unit system
2015-03-31 17:45:04 +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
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