Commit Graph

9036 Commits

Author SHA1 Message Date
Kai Bao
31e5c494a8 adding aquifer keywords to the summary_ALL test in SummaryConfigTests 2020-10-05 00:28:11 +02:00
Kai Bao
995316e97c handling unknown aquifer in SUMMARY section 2020-10-05 00:27:28 +02:00
Kai Bao
e86e8796ec adding a small test for aquifer keywords 2020-10-02 22:32:23 +02:00
Kai Bao
2c0456da8a fixing the keyword generation for ALL related to Aquifer keywords 2020-10-02 22:27:47 +02:00
Kai Bao
6093a80dff fixing the compilation due to interface change 2020-10-02 14:09:01 +02:00
Kai Bao
fd773423b0 adding the following aquifer summary keywords
AAQR, AAQT, AAQP
2020-10-02 13:18:51 +02:00
Joakim Hove
0ab50fbc95
Merge pull request #1977 from wito/test-warning-noise-fix
Test Compilation Warning Noise Fix
2020-10-02 07:56:14 +02:00
Markus Blatt
2f96b9404f
Merge pull request #1986 from joakim-hove/remove-template-args
Remove leftover template<...>
2020-10-01 21:07:58 +02:00
Joakim Hove
c0336d5eb7 Remove leftover template<...> 2020-10-01 16:59:50 +02:00
Joakim Hove
96ce078dfd
Merge pull request #1983 from joakim-hove/private-fmt
Mkae sure fmtlib is not a dependency in the public api
2020-10-01 15:24:15 +02:00
Joakim Hove
fbf88e8ce1
Merge pull request #1984 from joakim-hove/remove-value
Remove homemade optional - use std::optional
2020-10-01 15:23:55 +02:00
Joakim Hove
6dc84b67df Remove homemade optional - use std::optional 2020-10-01 13:53:58 +02:00
Joakim Hove
0475ccdb77
Merge pull request #1978 from joakim-hove/schedule-skriprest-refactor
Changes in schedule iterate section for restarts
2020-10-01 07:47:50 +02:00
Joakim Hove
5f45f20be6
Merge pull request #1982 from blattms/fix-some-valgrind-warnings
Fix some warnings when running with valgrinds MPI wrapper.
2020-09-30 19:43:30 +02:00
Markus Blatt
d99aa0d497 Fix some warnings when running with valgrinds MPI wrapper.
It warns whenever uninitialized data is sent.
2020-09-30 18:26:48 +02:00
Joakim Hove
8c351440e8 Mkae sure fmtlib is not a dependency in the public api 2020-09-30 18:17:57 +02:00
Joakim Hove
26f91f0ce0
Merge pull request #1981 from akva2/janitoring
Some janitoring
2020-09-30 14:45:11 +02:00
Arne Morten Kvarving
f2d80014ab anonymize unused parameter 2020-09-30 10:09:15 +02:00
Arne Morten Kvarving
27dc014244 remove unused variables 2020-09-30 10:09:08 +02:00
Joakim Hove
42f1278db3 Changes in restart TimeMap and Schedule::iterateSection
This commit changes two aspects of restarts where well and group information is
assembled from the restart file:

 o We require the restart date to be present in the Schedule file as a DATES
   keyword.

 o SKIPREST behavior is implemented unconditionally for restarts with restart
   files, even if the SKIPREST keyword is not present.
2020-09-29 23:00:16 +02:00
Joakim Hove
1ae7026a4b
Merge pull request #1946 from joakim-hove/parsecontext-opm-error
Parsecontext opm error
2020-09-29 22:15:04 +02:00
Joakim Hove
8e247ca6e8 Use new ParseCOntext signature 2020-09-29 15:37:14 +02:00
Joakim Hove
2a812ab7ce Use OpmInputError 2020-09-29 15:37:14 +02:00
Joakim Hove
a44b174b6b Remove info messages from Schedule 2020-09-29 15:37:14 +02:00
Alf Birger Rustad
a86cfd21d8 Shortened reading line to make more space for path 2020-09-29 15:37:14 +02:00
Joakim Hove
0512ab88b4 ParseContext will throw OpmInputError 2020-09-29 15:37:14 +02:00
Williham Williham Totland
6d2f8cca5c Adds type information to integer literals. 2020-09-29 13:54:21 +02:00
Joakim Hove
e01400fa18 Add KeywordLocation argument to ParseContext::handleError() 2020-09-29 09:56:07 +02:00
Joakim Hove
94b4c509b1 Add KeywordLocation argument to UDQ parser 2020-09-29 09:56:07 +02:00
Joakim Hove
e8423d3b25
Merge pull request #1969 from wito/keyword-handler-try-catch
Exception Catch and Release
2020-09-29 09:54:41 +02:00
Joakim Hove
751e25ff97
Merge pull request #1963 from joakim-hove/tran-calc-condense
Tran calc condense
2020-09-29 09:34:28 +02:00
Joakim Hove
a8e3ecef7d
Merge pull request #1974 from totto82/fixRocktab
Set number of columns in ROCKTAB to three
2020-09-29 06:57:48 +02:00
Bård Skaflestad
d55d05e552
Merge pull request #1884 from goncalvesmachadoc/outputProdEnergy
Add WEPT and WEPR to Summary
2020-09-28 21:52:53 +02:00
Joakim Hove
8848fde48e Collapse multi record operations on TRAN in one operation
The main content of this commit is that for keywords with multiple TRAN
modifications like

  MULTIPLY
     TRANX 1.50 1 10 1 10 1 1 /
     TRANX 2.50 1 10 1 10 2 2 /
  /

The different operations are collapes to one entry in tran calculator.

This commit also explicitly throws a std::logic_error() exception if TRAN
manipulations are attempted with the OPERATE keyword or one of the region
keywords ADDREG, MULTIREG, EQUALREG or OPERATER.
2020-09-28 21:44:21 +02:00
Tor Harald Sandve
fc7ccd1603 Set number of columns in ROCKTAB to three
Throw if unsuppored directional and stress option is used
2020-09-28 20:54:19 +02:00
Joakim Hove
de61bdefff
Merge pull request #1972 from asnyv/rtemp
UNTESTED: Added size: 1 to RTEMP and RTEMPA
2020-09-28 18:32:31 +02:00
Joakim Hove
8e8ba14397
Merge pull request #1973 from bska/uconv-static-tables-size-check
Unit Conversion Tables: Add Size Consistency Checking
2020-09-28 18:14:28 +02:00
Joakim Hove
f331add35b
Merge pull request #1966 from joakim-hove/tran-calc-init
Tran calc init
2020-09-28 16:55:07 +02:00
Joakim Hove
5fbf725ea8
Merge pull request #1970 from blattms/make-tran-mod-tests-run
Make transmissibility modifier tests run
2020-09-28 16:54:08 +02:00
Williham Williham Totland
f5a3ab2cee Removes (stated) support for named arguments in OpmInputError::format due to UTR test failure. 2020-09-28 16:04:35 +02:00
Cintia Goncalves Machado
76a04c8e48 rebasing 2020-09-28 15:59:20 +02:00
Bård Skaflestad
b7418b419e Unit Conversion Tables: Add Size Consistency Checking
This commit adds a minimum amount of compile-time size checking for
the various arrays that go into defining the conversion factors and
unit strings.  Using static_assert() we guarantee that the arrays at
least have the expected size lest the translation unit fail to
compile.
2020-09-28 15:37:28 +02:00
Asgeir Nyvoll
74c3bf82fb Added size: 1 to RTEMP and RTEMPA 2020-09-28 14:27:22 +02:00
Bård Skaflestad
8d89d277cd Warn about network nodes without networks. 2020-09-28 14:05:40 +02:00
Joakim Hove
4b8b35e0f0 only warn about unknown summary nodes. 2020-09-28 14:04:39 +02:00
Williham Williham Totland
f76a71cbee Simplifies logging of error using formatException(). 2020-09-28 13:30:15 +02:00
Cintia Goncalves Machado
e23e229fda addCumToSummaryState 2020-09-28 13:21:19 +02:00
Cintia Goncalves Machado
4e3f5cd0ca addWTICHEA 2020-09-28 13:21:19 +02:00
Cintia Goncalves Machado
5032d28a0f addWTPCHEA 2020-09-28 13:21:19 +02:00
Cintia Goncalves Machado
af1043612a addWEIs 2020-09-28 13:21:19 +02:00