5133 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joakim Hove	9e93dc5af2	Add method wells() to ActionContext class	2019-01-02 11:30:56 +01:00
Joakim Hove	481123ed25	Add method wells() to the SummaryState class	2019-01-02 11:22:07 +01:00
Joakim Hove	f6136e69fe	Merge pull request #599 from joakim-hove/parsecontext-RPT ... Fix mismerge of broken formatting	2018-12-20 18:19:55 +01:00
Joakim Hove	6832788eef	Fix mismerge of broken formatting	2018-12-20 16:40:03 +01:00
Joakim Hove	4c0776e3d2	Merge pull request #598 from joakim-hove/parsecontext-RPT ... Parsecontext rpt	2018-12-20 15:21:09 +01:00
Joakim Hove	00d1607347	Add error modes RPT_MIXED_STYLE and RPT_UNKNOWN_MNEONIC	2018-12-20 13:47:31 +01:00
Atgeirr Flø Rasmussen	142c0a12c3	Merge pull request #597 from atgeirr/workaround-liq ... Workaround: LIQ preferred phase treated as OIL. testing/2018.12/rc4	2018-12-20 13:25:59 +01:00
Joakim Hove	25fbff2632	Add ParseContext argument to the RPTxxx parsing	2018-12-20 12:27:49 +01:00
Atgeirr Flø Rasmussen	1833ee2c43	Workaround: LIQ preferred phase treated as OIL.	2018-12-20 12:10:14 +01:00
Atgeirr Flø Rasmussen	f5851bcb92	Merge pull request #596 from blattms/fix-pr-578 ... [bugfix] Fix influence of logging on return of getWriteRestartFile	2018-12-20 00:21:39 +01:00
Markus Blatt	5632fc6662	[bugfix] Fix influence of logging on return of getWriteRestartFile ... In PR #578 a bool was introduced that should determine whether we log warnings during RestartConfig::getWriteRestartFile. Unfortunately, it introduced a bug that made a false value of log return false from the function. This is fixed by this commit.	2018-12-19 23:05:17 +01:00
Joakim Hove	8375516c82	Merge pull request #595 from joakim-hove/region2region ... Region2region	2018-12-19 15:40:52 +01:00
Joakim Hove	bf6732559f	Add ParseContext error mode SUMMARY_UNHANDLED_KEWORD	2018-12-19 10:09:02 +01:00
Joakim Hove	3b951985ec	Initial support for region 2 region keywords	2018-12-19 10:01:38 +01:00
Joakim Hove	9c98b5ceb4	Merge pull request #590 from joakim-hove/rptrst-bug ... Handle space in the 'BASIC = ?' RPT mnemonics	2018-12-18 14:00:28 +01:00
Joakim Hove	161f555bc0	Handle space in the 'BASIC = ?' RPT mnemonics	2018-12-18 08:48:59 +01:00
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