Commit Graph

5396 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
c24f4140c1 Merge pull request #799 from blattms/parallel-wells
Adds possibility of having a well not stored on a grid partitioning.
2015-05-12 20:24:39 +02:00
Markus Blatt
4c768eb177 Get rid of unclear continue; statement in favor of if-else 2015-05-12 15:30:20 +02:00
Andreas Lauser
e8f0f6a48f fix the opm-cmake duncontrol support 2015-05-11 13:34:32 +02:00
Atgeirr Flø Rasmussen
d2540bbbce Do not recommend building release branch from source. 2015-05-11 11:32:51 +02:00
Atgeirr Flø Rasmussen
059c3b20c6 Update to notify user of known problem. 2015-05-11 09:08:07 +02:00
Markus Blatt
cc386ef3eb Switched from default constructing to explicit construction with false. 2015-05-08 19:44:50 +02:00
Markus Blatt
44f5ddd2c8 Adds possibility of having a well not stored on a grid partitioning.
In a parallel run each process only knows a part of the grid. Nevertheless
it does hold the complete well information. To resolve this the WellsManager
must be able to handle this case.

With this commit its constructor gets a flag indicating whether this is
a parallel run. If it is, then it does not throw if a well has cells that
are not present on the local part of the grid. Nevertheless it will check
that either all or none of the cells of a well are stored in the local part
of the grid.

Wells with no perforated cells on the local will still be present but set to SHUT.
2015-05-08 16:35:00 +02:00
Markus Blatt
52b40c9477 Allow to prevent ParameterGroup from printing to std::cout.
This commit adds a verbose flag to the constructor of
ParameterGroup to allow for deactivating any
output to std:cout. This is handy for parallel runs where we only
want to print statistics on one process.
2015-05-08 11:13:30 +02:00
Markus Blatt
973df44ea1 Allow to prevent SimulatorReport for printing to std::cout.
This commit adds a verbose flag to the constructor of
SimulatorReport to allow for deactivating any
output to std:cout. This is handy for parallel runs where we only
want to print statistics on one process.
2015-05-08 11:12:23 +02:00
Joakim Hove
e42124afd4 Removed common build files from cmake directory 2015-05-08 10:51:17 +02:00
Joakim Hove
9cb13141ba Changed logic for finding cmake modules.
The loading of opm related cmake modules now follows the following
logic:

 1. Try include( OpmInit )
 2. Update the cmake load path with OPM_CMAKE_ROOT and try again.
 3. Bail out.
2015-05-08 10:49:54 +02:00
Joakim Hove
f9dbdb000e Merge pull request #797 from andlaus/istl_depend_on_umfpack
Finddune-istl.cmake: Add UMFPACK as an optional dependency
2015-04-29 05:56:50 +02:00
Andreas Lauser
b18d609396 Merge pull request #798 from andlaus/remove_unused_code
Remove some unused code
2015-04-28 17:45:09 +02:00
Andreas Lauser
144887e302 remove opm-core from the required prerequisites of opm-material
instead, specify opm-parser as an optional dependency.
2015-04-28 13:35:04 +02:00
Andreas Lauser
7c4362f558 remove opm-core from the required prerequisites of eWoms 2015-04-28 12:50:19 +02:00
Andreas Lauser
fdd4d3464d Finddune-istl.cmake: Add UMFPACK as an optional dependency
this makes the cmake module useable in downstream modules which do not
explicitly specify an UMFPACK dependency...
2015-04-28 12:47:53 +02:00
Andreas Lauser
f66a43288f remove some unused classes
This is mostly infrastructural code (Opm::Spline,
Opm::TriDiagonalMatrix, property system and the cubic polynomial
inversion code) that is only used by opm-material and eWoms. The
original intention of bringing this code into opm-core was to allow
other modules to start to use this easily. Since nothing in this
direction happened during the last one and a half years, the code only
represents baggage in the opm-core context and should thus be moved to
their consumer modules to make the life of everyone involved simpler.
2015-04-28 12:46:59 +02:00
Atgeirr Flø Rasmussen
e9c14bdc88 Merge pull request #793 from akva2/fix_tests
fix tests
2015-04-27 09:45:38 +02:00
Bård Skaflestad
bcb3e8b8e5 Merge pull request #794 from akva2/update_redhat_packaging
update redhat packaging
2015-04-24 19:04:18 +02:00
Arne Morten Kvarving
4873a58c1f update redhat packaging 2015-04-24 14:45:10 +02:00
Arne Morten Kvarving
0c6213b7c8 fix tests
- cannot use BOOST_CHECK_CLOSE around 0 due to a relative test
- slacken a tolerance significantly
2015-04-24 10:49:13 +02:00
dr-robertk
ce88915466 Merge pull request #790 from atgeirr/new-default-parameters
Modify default parameters to be suitable for the Norne case. Please rerun Norne.
2015-04-22 14:37:47 +02:00
Atgeirr Flø Rasmussen
1845aa65f6 Adjust parameters after testing. 2015-04-22 13:03:19 +02:00
Joakim Hove
e1ab9d1d74 Merge pull request #791 from joakim-hove/summary-time-fixup
Ert function ecl_sum_add_tstep() expects seconds.
2015-04-22 09:35:06 +02:00
Joakim Hove
e2c5dba11e Ert function ecl_sum_add_tstep() expects seconds. 2015-04-22 09:30:32 +02:00
Atgeirr Flø Rasmussen
e70712f2d2 Modify default parameters to be suitable for the Norne case. 2015-04-21 11:41:45 +02:00
Bård Skaflestad
25a0857fd5 Merge pull request #789 from atgeirr/minor-output-fixes
Minor output fixes
2015-04-21 11:37:18 +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
640647c9ba Merge pull request #788 from joakim-hove/master
Added bool time_in_days to ecl_sum constructor.
2015-04-16 18:37:00 +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
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