Commit Graph

5065 Commits

Author SHA1 Message Date
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
cebfb51e71 Merge pull request #785 from blattms/const-mutable-char-comment
Correct documentation of why we use operator[] to initialize map. (Completes #784)
2015-04-14 16:04:02 +02:00
Atgeirr Flø Rasmussen
d4e7ad3ea1 Make test argc/argv data mimic POSIX correct data. 2015-04-14 15:58:37 +02:00
Atgeirr Flø Rasmussen
37904a3e74 Make some programs stricter about parameter parsing.
This applies to programs which always require at least one parameter.
2015-04-14 15:32:19 +02:00
Atgeirr Flø Rasmussen
4381a8a9b3 Update test to work correctly with new behaviour.
Also add a test to verify that we throw when we are supposed to.
2015-04-14 15:31:22 +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
d4c0631c1d Add test for ParameterGroup::unhandledArgument(). 2015-04-14 13:46:30 +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
Atgeirr Flø Rasmussen
68d901fce1 Merge pull request #784 from blattms/fix-issue-276
Fixex compile issues with PETSc on Debian wheezy
2015-04-13 11:13:18 +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
Atgeirr Flø Rasmussen
b47b91a460 Merge pull request #781 from totto82/fix_istl_2.2
Fix to make current master compile with dune-istl 2.2
2015-04-10 15:21:36 +02:00
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
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
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