Commit Graph

4072 Commits

Author SHA1 Message Date
Arne Morten Kvarving
73e084f9ad Added ctest for restart files 2016-11-04 14:47:59 +01:00
Atgeirr Flø Rasmussen
70f67d1698 Merge pull request #891 from andlaus/fix_catch22
FlowMain: use std::cout to print exceptions to the terminal
2016-11-03 21:20:28 +01:00
Andreas Lauser
edbfdb5ef3 FlowMain: make sure to always print exception messages to the terminal
this patch only uses OpmLog if it is set up properly, else it uses
std::cout. the reason why this is needed is that there's a
chicken-and-egg problem: exceptions which are thrown before the
logging system has been initialized -- most prominently while parsing
the deck -- cause the simulator to silently abort without any user
notification which can be very confusing. On the other hand,
initializing the logging system requires a fully initialized
EclipseState object, i.e. currently to initialze the logging system
the deck must be parsed and in order to print the exceptions thrown
while parsing the deck one needs the logging system.

v2: only prevent using the logging system if has not been set
up. thanks to [at]blattms for the suggestion!
2016-11-03 17:22:51 +01:00
Arne Morten Kvarving
09d4b89c60 Merge pull request #889 from akva2/use_compareECL
Use compareECL in integration tests
2016-11-03 11:18:07 +01:00
Arne Morten Kvarving
3607ba9127 changed: drop usage of python based comparison script in spe integration tests
use compareECL from opm-output instead
2016-11-03 09:10:26 +01:00
Arne Morten Kvarving
5c308614b6 changed: drop usage of python based comparison script in polymer integration test
replace with compareECL from opm-output
2016-11-03 09:10:08 +01:00
Atgeirr Flø Rasmussen
59b7d8c8fc Merge pull request #883 from jokva/relax-opm-phase-enum-constexpr
Remove weak enum Opm::Phase; replace with constexpr
2016-11-01 14:52:22 +01:00
Andreas Lauser
da344222d9 Merge pull request #879 from andlaus/Evaluation_accessors
use accessor methods to access the value and derivatives of Evaluation objects
2016-11-01 13:16:37 +01:00
Jørgen Kvalsvik
6488cfcfe5 Remove weak enum Opm::Phase
This weak enum is really just an alias for four other constants which in
turn alias another enum. Since they're mostly used for indexing they're
relaxed to constexpr ints.
2016-11-01 12:59:26 +01:00
Andreas Lauser
73d7a3ca10 use accessor methods to access the value and derivatives of Evaluation objects 2016-10-27 17:29:29 +02:00
Atgeirr Flø Rasmussen
732786f014 Merge pull request #878 from atgeirr/fix-twophase
Bugfix: properly handle two-phase cases.
2016-10-27 14:07:19 +02:00
Atgeirr Flø Rasmussen
e762844cdf Bugfix: use correct object in sequential model.
Discovered as a side effect of two-phase fix.
2016-10-27 13:20:10 +02:00
Atgeirr Flø Rasmussen
1fe610ef5a Bugfix: properly handle two-phase cases.
Errors were found in FIP handling and output.
2016-10-27 11:02:04 +02:00
Atgeirr Flø Rasmussen
dbf902e704 Merge pull request #876 from atgeirr/fix-extra-RPTRST-data
Bugfix: pass both normal and extra data to output.
2016-10-25 18:39:14 +02:00
Atgeirr Flø Rasmussen
7da420869b Bugfix: pass both normal and extra data to output.
Normal meaning SWAT, PRESSURE, RS etc.
Extra meaning KR, VISC etc. as asked for in RPTRST.
2016-10-25 15:27:59 +02:00
Atgeirr Flø Rasmussen
b2a64c2ddd Merge pull request #875 from atgeirr/completion-data-changes
Update well data output integration.
2016-10-25 13:58:33 +02:00
Atgeirr Flø Rasmussen
17a9f28fb8 Update well data output integration.
Includes the following changes:
 - update to match API change in opm-output (vector not map for data::Wells::completions),
 - restore WellStateFullyImplicitBlackoil::perfPhaseRates() from output,
 - restore WellStateFullyImplicitBlackoil::currentControls() from output.

Remaining non-restored well-related data are:
 - well potentials,
 - the dynamic list of econ-limited completions.
2016-10-25 10:53:40 +02:00
Atgeirr Flø Rasmussen
77abb6de1c Merge pull request #840 from jokva/output-data-wells-sans-vectors
WIP: Output data wells sans vectors
2016-10-21 15:00:39 +02:00
Atgeirr Flø Rasmussen
1edbc9f238 Merge pull request #866 from atgeirr/convergence-failure-not-error
Convergence failure classification, fix for parallel logging
2016-10-21 12:49:07 +02:00
Atgeirr Flø Rasmussen
10e7875734 Merge pull request #873 from atgeirr/fix-compile-error
Compile fix
2016-10-21 11:23:33 +02:00
Atgeirr Flø Rasmussen
2d15c1ffec Adapt to API change in opm-parser. 2016-10-21 11:21:02 +02:00
Atgeirr Flø Rasmussen
3a6353a455 Merge pull request #820 from qilicun/support-MESSAGES
support MESSAGES keyword.
2016-10-21 11:04:39 +02:00
Atgeirr Flø Rasmussen
d527b6862a Ensure logging only on first rank. 2016-10-20 22:47:30 +02:00
Atgeirr Flø Rasmussen
a2c9e64291 Add isIORank_ member to avoid repeated calls. 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen
e4731fc14d Rename isRankZero() -> isIORank() for consistency. 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen
8ed3418245 Ensure only first-rank logging.
Also classify convergence troubles or out-of-bounds residuals as
"problem" not "error".
2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen
5559fbd233 Add isRankZero() utility. 2016-10-20 22:40:24 +02:00
Atgeirr Flø Rasmussen
9e1ba49554 Bugfix: missing return. 2016-10-20 22:40:24 +02:00
jokva
1697212b98 Merge pull request #863 from jokva/remove-shared-ptr
The great shared_ptr purge
2016-10-20 19:18:50 +02:00
Liu Ming
7c51158ec4 do not set limits for prt log and set correct value for Note. 2016-10-20 21:00:51 +08:00
Jørgen Kvalsvik
1c6a4b34da Update to shared_ptr-less parser interface. 2016-10-20 14:08:04 +02:00
Liu Ming
0695555a77 correct function call order and add whitespace. 2016-10-20 16:27:46 +08:00
Liu Ming
164f74c93c supprot MESSAGES default vaule. 2016-10-20 15:54:02 +08:00
Jørgen Kvalsvik
26f1a69903 wellToState reads new opm-output data exchange 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik
545f55bd3b Write control to data::Wells. Missing ability to restore. 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik
df4e163796 Avoid using buggy wellstate api 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik
dfb7f8ff63 Stop report early if there are no wells 2016-10-19 12:06:46 +02:00
Jørgen Kvalsvik
6ba21fd4c0 Update to interface change in opm-output 2016-10-19 12:06:43 +02:00
Atgeirr Flø Rasmussen
93ffb318cd Merge pull request #855 from andlaus/opm-parser_units
adapt to the removal of the unit system of opm-core
2016-10-18 15:25:42 +02:00
Joakim Hove
f90e608bfc Merge pull request #851 from joakim-hove/use-celldata-container
data::Solution for opm-output communication.
2016-10-17 11:46:45 +02:00
Atgeirr Flø Rasmussen
79de15e21d Merge pull request #861 from blattms/fix-parallel-step_timings.txt-writing
Let only one rank write to step_timing.txt
2016-10-14 13:42:33 +02:00
Atgeirr Flø Rasmussen
d007cd8e6e Merge pull request #859 from atgeirr/compile-fixes
Compile fixes
2016-10-14 13:31:12 +02:00
Atgeirr Flø Rasmussen
262d2e1172 Merge pull request #860 from blattms/skip-hint-to-issue-tracker
Do not refer users to issue tracker if multiple procs log.
2016-10-14 13:30:00 +02:00
Markus Blatt
a7cc4962e2 Let only one rank write to step_timing.txt
All ranks were still writing to step_timing.txt at the same time.
This made it unusable for parallel runs. With this commit only
one processes writes to this file.
2016-10-14 11:14:54 +02:00
Markus Blatt
a424516639 Do not refer users to issue tracker if multiple procs log.
This is currently still happening due to the implementation of
OPM_THROW whenever the linear solver does not converge. This
happens quite often and we might not want to get overwhelmed by
the issue tracker.
2016-10-14 10:47:16 +02:00
Atgeirr Flø Rasmussen
580e76cf05 Remove unused variable. 2016-10-13 17:09:43 +02:00
Atgeirr Flø Rasmussen
654a24b625 Use vector instead of VLA, also add missing includes. 2016-10-13 17:08:52 +02:00
Arne Morten Kvarving
cdf7f3cc0d Merge pull request #857 from akva2/update_packaging_devtoolset
update redhat6 packaging
2016-10-12 15:53:03 +02:00
Arne Morten Kvarving
e9a3f59492 Merge pull request #856 from akva2/update_packaging_eigen
changed: bundle eigen3 in the original tarball for debian
2016-10-12 15:52:44 +02:00
Arne Morten Kvarving
44879c94c4 changed: bundle eigen3 in the original tarball for debian
brings back packages on ubuntu xenial
2016-10-12 15:48:13 +02:00