Joakim Hove
e6aecbd7ac
ParserItem: differentiate between input type and internal data type
...
Differentiate between the input type, as specified in the json configuration
file, and the internal native type used to store data. This is a many-to-one
mapping, where e.g. both the input types STRING and RAW_STRING map to the
internal datatype std::string.
Additional changes:
- Have removed several ParserItem() constructors.
- The size_type::SINGLE is default for a ParserItem, and not set explicitly in
the generated ParserKeywords.cpp file.
- Have removed a call to boost::lexical_cast<> - just use std::to_string()
2019-04-01 18:32:06 +02:00
Joakim Hove
c3e992f996
Use constructor for WellProductionProperties
2019-03-25 10:23:13 +01:00
Joakim Hove
94fae0da30
Remove Schedule::getWells(pattern)
2019-03-24 07:54:39 +01:00
Joakim Hove
19dde5e6d3
Add Schedule::wellNames() overloads
2019-03-24 07:54:33 +01:00
Joakim Hove
5b1065df45
For a connection set with 0 connections is "OPEN"
2019-03-23 16:13:11 +01:00
Joakim Hove
858e06044e
Move well specific event logging from Well to Schedule
2019-03-21 13:08:25 +01:00
Joakim Hove
1d402bdca3
Add PERM values to testdata
2019-03-20 15:10:08 +01:00
Joakim Hove
b741a73957
Merge pull request #679 from joakim-hove/remove-totno-conn
...
Removed well property total number of connections
2019-03-19 16:52:50 +01:00
Joakim Hove
a73e82110c
Merge pull request #681 from joakim-hove/well-static-util
...
Well static util
2019-03-18 17:11:34 +01:00
Tor Harald Sandve
daa67dc8d6
Add parser support for water induced rock compaction ( #676 )
...
Add support for water induced rock compaction
2019-03-18 17:08:38 +01:00
Joakim Hove
eb15695ed0
Removed well property total number of connections
...
For the output code the total number of connections entered in the input deck is
required, we therefor keep track of the number of connections filtered out due
to inactive cells - and return the total in WellConnection::inputSize()
2019-03-18 15:44:18 +01:00
Joakim Hove
75e196cdd8
Add PERM values to testdata
2019-03-18 14:46:03 +01:00
Joakim Hove
00cc2b9075
Remove unused keywords from test input
2019-03-18 11:24:02 +01:00
Joakim Hove
53c29e56d4
Wellname pattern '*' should not be interpreted as WLIST
2019-03-18 10:44:11 +01:00
Joakim Hove
205c4a94db
Add method DynamicState::find_not()
2019-03-18 10:34:18 +01:00
Joakim Hove
25522dc424
Add to_bool(string) function
2019-03-18 10:34:18 +01:00
Joakim Hove
c5935c97f6
Implement Schedule::wellNames()
2019-03-17 07:26:40 +01:00
Joakim Hove
c9821faddc
Changed UDQDefine to take UDQParams argument
2019-03-14 12:40:57 +01:00
Joakim Hove
066dca43ba
UDQ Parsing - rest
2019-03-14 12:40:57 +01:00
Joakim Hove
16c9d7d04d
UDQFunctionTable: const arg + default constructor
2019-03-14 09:28:26 +01:00
Joakim Hove
118f4dd3de
Update eval_udq() in Summary
2019-03-14 09:28:26 +01:00
Joakim Hove
7a2c1157a0
Merge pull request #673 from joakim-hove/udq-parsecontext
...
Udq parsecontext
2019-03-14 09:27:30 +01:00
Joakim Hove
f80b220b44
Change OrderMap to more closely resemble std::map
...
- Removed the hasKey() and get() methods.
- Key type is a template parameter
- insert takes a pair
- implement count()
- implement find()
- implement operator[]
- implement erase
2019-03-11 10:34:04 +01:00
Joakim Hove
f4196ff25e
Add ParseContext for undefined UDQ
2019-03-09 10:19:11 +01:00
Joakim Hove
25d7e99413
Add UDQInput methods has_keyword() and has_unit()
2019-03-09 10:19:03 +01:00
Joakim Hove
1ecd62d98d
Merge pull request #667 from joakim-hove/move-wells
...
Move all well related files to subfolder Well/
2019-03-08 12:42:08 +01:00
Joakim Hove
04d42c2f4e
Move well and well related files to Well/ subfolder
2019-03-08 07:15:49 +01:00
Joakim Hove
ccba767b24
Add utility constructors and testing to UDQWellSet
2019-03-07 11:35:55 +01:00
Joakim Hove
585447fd22
Move UDQ action enum to UDQEnums
2019-03-07 11:35:55 +01:00
Joakim Hove
15a7d7597d
Update ASTNode::eval() to handle Well selectors like 'P*'
2019-03-07 11:35:55 +01:00
Joakim Hove
03a2bbdf80
Add UDQ / parsing test with '/' in data item
2019-03-05 07:15:29 +01:00
Joakim Hove
a91d47f191
Add name property to UDQSet
2019-02-25 11:15:12 +01:00
Joakim Hove
7425f8b988
Implement UDQ functions
2019-02-25 08:37:04 +01:00
Joakim Hove
945438b210
Add rng to UDQParams
2019-02-25 08:36:33 +01:00
Joakim Hove
b5542c4e56
Add UDQEnum type for the different variable types
2019-02-21 13:36:08 +01:00
Joakim Hove
40bd7b86b0
Renamed UDQ -> UDQInput
2019-02-21 13:36:08 +01:00
Joakim Hove
732c5ae4d2
Add class UDQAssign
2019-02-20 18:21:23 +01:00
Joakim Hove
999b06b0eb
Add dervied class UDQWellSet : UDQSet
2019-02-20 18:21:23 +01:00
Joakim Hove
e27933270a
Change UDQExpression() constructor to take enum
2019-02-20 18:21:23 +01:00
Joakim Hove
785d80b677
Use slash termination to determine size of keywords SKPRPOLY SKPRWAT
2019-02-20 16:57:10 +01:00
Joakim Hove
10a225785e
Merge pull request #644 from joakim-hove/vfp-parse-error
...
Vfp parse error
2019-02-19 16:22:55 +01:00
Joakim Hove
946d1cb877
Add subdirectory Schedule/UDQ/
2019-02-18 08:58:20 +01:00
Joakim Hove
a1b8303ac3
Add class UDQSet() to hold UDQ values
2019-02-18 08:58:20 +01:00
Joakim Hove
5b86ef115c
Clear trailing part of string when looking for possible valid keyword
2019-02-17 15:55:55 +01:00
Joakim Hove
3d4b467a2f
Add UDQContext class to be used while evaluating UDQ keywords
2019-02-08 06:34:05 +01:00
Joakim Hove
65b629e423
Add ParseContext::PARSE_LONG_KEYWORD
...
The ParserContext error mode PARSE_LONG_KEYWORD is used to handle keywords
longer than 8 characters. The lenient option is to only consider the first 8
characters.
2019-02-04 17:17:00 +01:00
Bård Skaflestad
e9756c3ee5
Merge pull request #622 from joakim-hove/udq-units
...
UDQ - hook the configuration up in the Schedule object
2019-02-03 22:24:02 +01:00
Bård Skaflestad
ecca175ccd
Merge pull request #615 from joakim-hove/msim-actionx
...
Msim actionx
2019-02-03 22:19:54 +01:00
Joakim Hove
d82be29745
ACTIONX: Works with WELOPEN and msim
2019-02-02 17:35:56 +01:00
Joakim Hove
42d08db25b
Add UDQ configuration as DynamicState<> to schedule
2019-02-02 17:09:44 +01:00