Bård Skaflestad
a5a18fea9e
Add Convenience Predicate WellConnections::empty
...
Replace expressions comparing size() to 0 with calls to empty().
2020-10-07 22:29:18 +02:00
Joakim Hove
f02ecb472f
Store Value::Shut == -1000 for shut wells in IWEL
2020-10-07 18:38:46 +02:00
Joakim Hove
a33fd2483f
Updates to well control mode reported in IWEL
...
With this commit the IWEL[ActWCtrl] is assigned a value independently of the
wells OPEN / SHUT status.
With this PR the index enum value Status is used instead of the previously used
item11. Also numerical constants are introduced for eclipse status values for
Shut, Stop, Open and Auto.
2020-10-07 18:28:11 +02:00
Joakim Hove
23faea7b81
Merge pull request #1996 from wito/required-keywords
...
Required and Prohibited Keywords
2020-10-07 09:06:42 +02:00
Bård Skaflestad
7823045b02
Merge pull request #1995 from bska/prepare-dynamic-ctf
...
Summary/Restart: Get CTF From Simulator
2020-10-06 14:32:07 +02:00
Williham Williham Totland
90d980a4f6
Adds manipulation of the ParseContext to tests.
2020-10-06 09:58:46 +02:00
Arne Morten Kvarving
62c067f462
fixed: anonymize globals to avoid shadowing warnings
2020-10-06 08:23:11 +02:00
Bård Skaflestad
4956e880a4
Summary/Restart: Get CTF From Simulator
...
This commit switches to getting the output files' connection
transmissibility factor from Opm::data::Connection instead of
Opm::Connection. This is in preparation for implementing the WELPI
feature, in which the CTFs are occasionally adjusted based on the
dynamic simulation state.
2020-10-05 23:34:01 +02:00
Bård Skaflestad
33d09936c3
Merge pull request #1719 from GitPaean/aquifer_keywords
...
adding aquifer summary keywords
2020-10-05 22:49:32 +02:00
Joakim Hove
be898b5534
Merge pull request #1989 from wito/tablemanager-exceptions
...
Implements OpmInputError in TableManager
2020-10-05 17:02:42 +02:00
Williham Williham Totland
7aba0cd976
Implements required and prohibited keywords.
2020-10-05 13:34:35 +02:00
Bård Skaflestad
fcdc57d92b
Merge pull request #1994 from joakim-hove/rst-alq
...
Small Changes in restart <-> Schedule interaction
2020-10-05 13:07:15 +02:00
Williham Williham Totland
c43600337b
Throws exception with nesting, and generalises tests to account for same.
2020-10-05 11:06:19 +02:00
Williham Williham Totland
d0c5fa042c
Adjusts the defaultMessage format string.
2020-10-05 09:26:25 +02:00
Williham Williham Totland
7a8347f1ab
Unifies interface of OpmInputError::OpmInputError()
2020-10-05 08:26:51 +02:00
Kai Bao
aa639869be
adding the development to test ANALYTICAL_AQUIFERS
2020-10-05 07:37:13 +02:00
Joakim Hove
0f21752a7e
Add test for unsupported keyword in FieldProps operations
2020-10-05 07:28:07 +02:00
Williham Williham Totland
3af6fac35d
Adds a standard-format exception message to OpmInputError.
2020-10-05 07:28:07 +02:00
Kai Bao
31e5c494a8
adding aquifer keywords to the summary_ALL test in SummaryConfigTests
2020-10-05 00:28:11 +02:00
Joakim Hove
aa54bc67de
Load group->parent_group when loading from restart file
2020-10-04 16:00:50 +02:00
Kai Bao
e86e8796ec
adding a small test for aquifer keywords
2020-10-02 22:32:23 +02:00
Tor Harald Sandve
8210bcde34
Merge pull request #1968 from hakonhagland/wglir
...
Add support for WGLIR.
2020-10-02 14:48:18 +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
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
8c351440e8
Mkae sure fmtlib is not a dependency in the public api
2020-09-30 18:17:57 +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
Håkon Hægland
7db5d2fd5c
Added WGLIR to SummaryConfigTests.cpp
2020-09-29 15:52:28 +02:00
Joakim Hove
2a812ab7ce
Use OpmInputError
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
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
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
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
Williham Williham Totland
805300dd49
Adds some documentation to OpmInputError.hpp.
2020-09-28 13:16:45 +02:00
Williham Williham Totland
9a66acbb5d
Extends OpmInputError to be initialisable from an existing exception.
2020-09-28 13:16:45 +02:00
Williham Williham Totland
742c90cabc
Extends Opm::OpmInputError::OpmInputError() to accept additional format arguments.
2020-09-28 13:16:45 +02:00
Williham Williham Totland
7cb15bd64d
Adds missing test_OpmInputError_format.cpp
2020-09-28 13:16:44 +02:00
Joakim Hove
8e55f3138b
Add multi record test
2020-09-27 10:16:32 +02:00
Joakim Hove
b95fbc4919
Rewrite test to iterate over cartesian coordinates
2020-09-27 10:16:32 +02:00
Arne Morten Kvarving
617440485f
remove unused variable
2020-09-25 09:21:09 +02:00
Arne Morten Kvarving
99a6fc30a1
throw to avoid no return value warning
2020-09-25 09:20:57 +02:00
Arne Morten Kvarving
50de318947
add missing initializer to quell warning
2020-09-25 09:18:46 +02:00
Bård Skaflestad
3db68b0731
Merge pull request #1955 from jalvestad/rstfile-imp-v3t
...
Handle WSEGITER keyword data and WELSEGS keyword item 6 for Eclipse compatible restart file
2020-09-24 14:49:34 +02:00
Joakim Hove
b9f95089b9
Merge pull request #1949 from joakim-hove/error-prepare
...
Error prepare
2020-09-24 07:33:22 +02:00
Joakim Hove
2e20dc5d43
Merge pull request #1923 from totto82/co2storage
...
Add CO2STOR keyword in Runspec section
2020-09-23 14:36:18 +02:00