Commit Graph

5317 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
39a6871b1d
Merge pull request #588 from atgeirr/add-last-test-time
Add function WellTestState::lastTestTime().
2018-12-17 11:47:40 +01:00
Atgeirr Flø Rasmussen
175da3d436 Add function WellTestState::lastTestTime(). 2018-12-14 11:38:28 +01:00
Joakim Hove
cf61068ad1
Merge pull request #587 from bska/compare-ecl-ignoreextra
Make Summary Comparison Able to Ignore Different Number of Keywords
2018-12-13 21:31:28 +01:00
Joakim Hove
bf7b2697ee
Merge pull request #586 from joakim-hove/remove-compare-summary
Removed unused file compareSummary.cpp
2018-12-13 21:10:37 +01:00
Bård Skaflestad
9098316775 Make Summary Comparison Able to Ignore Different Number of Keywords
This commit adds the ability of SummaryRegressionTest to bypass the
check for equal number keywords/summary vectors in the two result
sets being compared.  The primary purpose of this is to continue
comparing contents of existing summary vectors if new summary
keywords are introduced in a GitHub Pull Request.

Extend the 'compareECL' utility to take advantage of this ability.
2018-12-13 20:10:34 +01:00
Joakim Hove
1249ef0dd2 Removed unused file compareSummary.cpp 2018-12-13 19:16:05 +01:00
Bård Skaflestad
2b2d4901d1
Merge pull request #584 from bska/fix-open-conn-logic-for-output
Check Size Inconsistencies Only for Open Connections
2018-12-12 14:00:42 +01:00
Bård Skaflestad
d4740ae249 Check Size Inconsistencies Only for Open Connections
The previous logic was slightly incomplete in that it checked size
inconsistencies for all connections, not just open connections.
This, in turn would in turn generate diagnostics like

    Report step 19/247 at day 252/3312, date = 16-Jul-1998

    Time step 0, stepsize 16 days.
    ERROR: Uncaught std::exception when running tasklet: Inconsistent number of open connections I in vector<Opm::data::Connection*> (3) in Well B-4H. Trying to continue.

With this update we look for size inconsistencies between a well's
open connections and data::Wells::connections only.
2018-12-12 12:40:18 +01:00
Atgeirr Flø Rasmussen
49eda9fc72
Merge pull request #580 from bska/restore-gcc49
Restore Build on GCC 4.9
2018-12-11 19:11:40 +01:00
Bård Skaflestad
3ea522d7ba Restore Build on GCC 4.9
Commit 334dbe4e broke GCC 4.9 (invoking explicit constructor with an
empty initializer_list).  Restore build by using the actual type.
2018-12-11 17:30:43 +01:00
Atgeirr Flø Rasmussen
70172f5771
Merge pull request #579 from atgeirr/silence-warnings
Silence various warnings
2018-12-11 12:52:38 +01:00
Bård Skaflestad
91306c12f4
Merge pull request #549 from jalvestad/segment-summary
Improve eclipse-restart file for multi segment wells
2018-12-10 17:03:03 +01:00
Atgeirr Flø Rasmussen
67f96f4996 Fix: add required include and std:: qualification. 2018-12-10 16:10:25 +01:00
Atgeirr Flø Rasmussen
39bb94c2c8 Silence unused argument warnings. 2018-12-10 16:10:25 +01:00
Atgeirr Flø Rasmussen
7955805dd5 Do not return by const value (no effect). 2018-12-10 16:10:25 +01:00
Atgeirr Flø Rasmussen
74c06ea703 Silence various warnings in libECLRestart.cpp.
There are still systematic warnings that need suppression in this file:
 -Wgnu-zero-variadic-macro-arguments
 -Wformat-nonliteral
 -Wcast-align
These are too hard to fix quickly, and likely not indicating errors.
2018-12-10 16:10:25 +01:00
Atgeirr Flø Rasmussen
71b0c2883f Avoid shadowing of variables. 2018-12-10 16:10:25 +01:00
Atgeirr Flø Rasmussen
334dbe4e1f Initialize all struct elements. 2018-12-10 16:10:25 +01:00
Atgeirr Flø Rasmussen
53252e6694 Use struct for MULTREGTRecord, match order of variables to usage. 2018-12-10 16:10:25 +01:00
Atgeirr Flø Rasmussen
e27df951f6
Merge pull request #578 from blattms/allow-silent-getWriteRestartFile-call
Allow to switch of logging during getWriteRestartFile call.
2018-12-07 18:53:41 +01:00
Markus Blatt
1062fb836b Allow to switch of logging during getWriteRestartFile call.
This needed for parallel runs as otherwise all processes will
do logging.
2018-12-07 15:52:53 +01:00
Jostein Alvestad
343d060118 changed CMakeLists_files.cmake to account for unit tests which are not finished and ready for use yet
The changes and additions in this version have been extensively tested on various input data
sets and proved to work properly and correctly
2018-12-07 12:38:33 +01:00
Jostein Alvestad
b15fab221b Corrected tests to be consistent with changes / corrections made to the various parameters 2018-12-07 12:38:31 +01:00
Jostein Alvestad
88b16f981c Removed test/debug comments 2018-12-07 12:38:30 +01:00
Jostein Alvestad
dc3f1cbf40 Added improvements to handle more general recompletion strategies
to eclipse compatible restart file
2018-12-07 12:38:29 +01:00
Jostein Alvestad
01e3aa377c Corrections to Summary.cpp for sicontinuities in rates/cumulatives
Improved messages from AggregateMSWData
2018-12-07 12:38:27 +01:00
Jostein Alvestad
44102f83a0 one more minor correction to test_AggregateMSWData.cpp 2018-12-07 12:38:26 +01:00
Jostein Alvestad
2c13cdfa18 Added minor correction to test_AggregateMSWData.cpp 2018-12-07 12:38:24 +01:00
Jostein Alvestad
1d22e3b0ed Reset change to complump for output to Restart file 2018-12-07 12:38:23 +01:00
Jostein Alvestad
2add79d122 Added corrections / improvements - generalisations for Eclipse compatible restartfiles 2018-12-07 12:38:22 +01:00
Jostein Alvestad
0cfbfb9957 Added ZGRP data to the eclipse restart file 2018-12-07 12:38:20 +01:00
Jostein Alvestad
92f65b7958 Additional changes to handle --use-multisegment-well=false 2018-12-07 12:38:19 +01:00
Jostein Alvestad
79037f93b2 Initial changes to allow for eclipse restart when using option --enable-opm-rst-file=false 2018-12-07 12:38:17 +01:00
Jostein Alvestad
633a5883f7 Added changes to prepare for unit testing of AggregateMSWdata 2018-12-07 12:38:15 +01:00
Jostein Alvestad
63590f95b0 Added initial changes to enable unit testing for AggregateMSWData 2018-12-07 12:38:14 +01:00
Jostein Alvestad
e783eaafc0 Added unit test for AggregateMSWdata 2018-12-07 12:38:13 +01:00
Atgeirr Flø Rasmussen
e341bd1c08
Merge pull request #577 from GitPaean/updating_liquid_rate_for_wconhist
updating liquid rate for WCONHIST
2018-12-07 09:58:18 +01:00
Atgeirr Flø Rasmussen
f9ce82547c
Merge pull request #559 from kel85uk/fix_influx_coeff
Fix for aquifer making connection
2018-12-07 09:56:40 +01:00
Kai Bao
b349b3b217 updating liquid rate for WCONHIST 2018-12-03 16:40:42 +01:00
Joakim Hove
983ed5fcb8
Merge pull request #575 from joakim-hove/smspec-c++
Adapt to C++ changes in libecl
2018-11-30 08:09:31 +01:00
Joakim Hove
f414f5b8ad Adapt to C++ changes in libecl 2018-11-26 17:30:09 +01:00
Joakim Hove
7c52f6f5a8
Merge pull request #560 from blattms/edit-nnc-2nd-try
Represent EDITNNC in the deck representation.
2018-11-26 16:57:18 +01:00
Joakim Hove
188eb23911
Merge pull request #574 from joakim-hove/parsecontext-exit1
Parsecontext exit1
2018-11-26 14:25:34 +01:00
Joakim Hove
72ad2eaa7f
Merge pull request #562 from trinemykk/addtracer
Added missing support for tracers in the parser
2018-11-26 13:02:19 +01:00
Joakim Hove
92870dc1e9
Merge pull request #576 from akva2/janitoring
Some SCA error janitoring
2018-11-26 11:56:38 +01:00
Arne Morten Kvarving
2d43ccaf8f fixed: initialize members 2018-11-26 10:41:29 +01:00
Arne Morten Kvarving
b2e0eb2507 fixed: remove unnecessary variable initialization 2018-11-26 10:41:29 +01:00
Trine S Mykkeltvedt
5085fb35c0 removed WTRACER from RPTRST_DECK.DATA to make tests pass 2018-11-26 09:44:31 +01:00
Joakim Hove
8d33ec55bd Add ParseContext error handler EXIT1 for user error 2018-11-25 11:53:34 +01:00
Joakim Hove
d70b86484d White space 2018-11-25 08:56:20 +01:00