Commit Graph

103 Commits

Author SHA1 Message Date
Lars Petter Øren Hauge
183fd4eabb Add INVALID_WELL context for WCONPROD
Handle invalid wellpatterns for WCONPROD.

Given a deck with:

----
WELSPECS
  'PROD' 'G1'  10 10 8400 'OIL' /
/
COMPDAT
  'PROD' 10 10 3 3 'OPEN' 1* 1* 0.5 /
/
WCONPROD
  'SOMETHINGELSE' 'OPEN' 'ORAT' 20000 4* 1000 /
 /
----

OPM will now by default abort and inform the user that no well match
"SOMETHINGELSE".
2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
f2cb5fe9de Add INVALID_WELL parse context
Handle invalid wellpatterns for COMPDAT.

Given a deck with:

----
WELSPECS
  'PROD' 'G1'  10 10 8400 'OIL' /
/
COMPDAT
  'SOMETHINGELSE' 10 10 3 3 'OPEN' 1* 1* 0.5 /
/
----

OPM will now by default abort and inform the user that no well match
"SOMETHINGELSE".
2018-05-14 09:26:21 +02:00
Joakim Hove
e5c4c2b504 Handle changes to VFP tables during simulation
With this commit the VFP tables are stored internally in DynamicState<VFPxTable>
container, this facilitates updates to the VFP tables during the simulation. In
addition the default constructor and the ::init( ) method has been removed from
the VFPxTable implementations.
2018-04-12 19:02:15 +02:00
Joakim Hove
b8cdeefaec Add missing <mumeric> header 2018-04-11 06:14:56 +02:00
Joakim Hove
c37e5f9503 Move VFP tables to Schedule. 2018-04-06 12:42:47 +02:00
Atgeirr Flø Rasmussen
936f5e5963 Merge pull request #367 from joakim-hove/udq-start
Internalize UDQ keywords
2018-04-06 10:39:59 +02:00
Joakim Hove
da8424e1e8 Add UDQ container class 2018-04-05 17:45:30 +02:00
Joakim Hove
8176c5a826 Add UDQExpression class - for one UDQ record 2018-04-05 17:45:30 +02:00
Joakim Hove
4a7410d412 Add UDQConfig object. 2018-04-05 17:42:23 +02:00
Joakim Hove
19a4960ff7 Add test for finding include files with symlinked main file. 2018-04-05 13:21:15 +02:00
Joakim Hove
b57a5628c7 Make sure the symlink based tests are run 2018-04-05 13:16:50 +02:00
Joakim Hove
a65d6d7152 Add value type RAW_STRING
When parsing RAW_STRING items the following applies:

 - Quotes are retained - as in 'P20'
 - Asteriks are not replaced with defaults
2018-03-30 13:35:23 +02:00
Joakim Hove
aa06db984c Remove unused enum for ParserItem value type 2018-03-26 17:04:08 +02:00
Joakim Hove
e3758e41ea Merge pull request #368 from stefoss23/RemoveMessageContainer
Removed MessageContainer. OpmLog used instead.
2018-03-26 13:04:23 +02:00
Steinar Foss
d9ffb579e1 Removed MessageContainer. OpmLog used instead.
...

...

...

GenerateKeywords.cmake changed.

ParserContext.handleerror takes only two args.

Schedule: removed all MessageContainer.

...

...

...

GridProperties: removed MessageContiner.

...

Eclipse3DProperties: removed MessageContainer.

...

TabelManager:removed MessageContainer.

...

.nnn.

...

...

...

...

...

...

...

...

...

...

...

...

...
2018-03-26 10:15:18 +02:00
Bård Skaflestad
da2b6aec77 Runspec: Add Support for Parsing Limited Subset of WSEGDIMS
Capture the maximum number of segmented wells, the maximum number of
segments per well, and the maximum number of lateral branches per
(segmented) well.

These maximum sizes are needed to correctly define portions of the
contents of the INTEHEAD vector in a restart step.
2018-03-22 11:14:51 +01:00
Bård Skaflestad
15eb84d3e9 Expose "REGDIMS" Keyword from TableManager
Some of these values are needed for restart purposes (go into the
INTEHEAD) vector.
2018-03-22 00:00:48 +01:00
Joakim Hove
f5a80f807f Using OrderedMap as container for groups 2018-03-18 19:33:58 +01:00
Joakim Hove
0dbabc19ca Added at() method to orderedmap. 2018-03-18 19:24:48 +01:00
Kai Bao
bb4936c6c1 adding POLYMW to phase class in Runspec 2018-03-09 08:38:10 +01:00
Bård Skaflestad
af07812167 Runspec: Add Support for Parsing Limited Subset of WELLDIMS
Capture the maximum number of connections/perforations per well, the
maximum number of wells (or sub-groups) per well/node group, and the
maximum number of well/node groups in the field.

These maximum sizes are needed to correctly define the portions of
the contents of the INTEHEAD vector in a restart step.
2018-03-08 10:50:47 +01:00
Kai Bao
dbf2a4c425 small fixes of the pvtables.
some rules are from testing output.
2018-03-07 08:31:00 +01:00
Lars Petter Øren Hauge
800cc2af62 Support default construction uppon ADD/MULTIPLY
Allow keywords that can be default constructed to do so when acted uppon
by MULTIPLY and ADD.

Setting the "MULTIPLY" keyword to act on "PORV" would throw an
exception:

"Program threw an exception: Fatal error processing MULTIPLY keyword.
Tried to scale not defined keyword PORV"

Now the initPORV is called if the MULTIPLY keyword is parsed with PORV.
Note that MULTIPLY for PORV will also work in the GRID section (which it
does not in eclipse), but will fail if it is placed prior to setting a
variable PORV depends on.

Commit authored by Sveinung Styve Rundhovde and Lars Petter Hauge
2018-02-26 13:51:37 +01:00
Joakim Hove
7a2bf8a0b5 SummaryConfig: changed implementation for empty well/group keywords.
Will never raise SUMMARY_UNKNOWN_WELL for empty well related summary keywords.
2018-02-20 16:51:38 +01:00
Joakim Hove
c904c6bf98 Added action argument to ParseContext::addKey() 2018-02-19 14:52:21 +01:00
Joakim Hove
da650aa7ff Merge pull request #1177 from nairr/aquifer_obj
Carter-Tracy aquifer object
2018-02-15 17:47:17 +01:00
Joakim Hove
ce7654765c Merge pull request #1209 from GitPaean/not_turing_off_injector
not turning off injector because of defaulted rates.
2018-02-15 16:38:02 +01:00
Rohith Nair
57792f1316 Carter-Tracy aquifer object to collect items from keywords AQUCT and AQUTAB
clean up

removed aquancon collection from Aquifer CT

clean up and unit test

clean up

Conflicts:
	lib/eclipse/CMakeLists.txt

Add reference to Van Everdingen and Hurst

remove cmakelists

added test in Cmake

Added aquiferct to cmake
2018-02-15 12:01:19 +01:00
Atgeirr Flø Rasmussen
007007184a Merge pull request #1199 from akva2/old_is_the_new_new
changed: switch to the shared opm build system
2018-02-14 09:16:42 +01:00
Kai Bao
e76df698c6 changing the counting of the schecule in SCHEDULE_WELLS2
basically, all the control keywords should be combined with the
TSTEP/DATES afterwards as a complete report step.
2018-02-14 09:09:27 +01:00
Arne Morten Kvarving
f7c288a3f4 changed: switch to the shared opm build system 2018-02-12 13:36:49 +01:00
Kai Bao
3c8c65b65c not turning of injector because of defaulted rates.
it must be a limit to turn it off. The old implementation make it
impossible to have a injector with only bhp control.
2018-02-12 12:27:44 +01:00
Joakim Hove
cc4e56cc18 Merge pull request #1206 from joakim-hove/filter-completions
Added ability to filter out completions from inactive cells.
2018-02-07 15:06:19 +01:00
Joakim Hove
3a590a0cab Added ability to filter out completions in inactive cells. 2018-02-07 11:22:35 +01:00
Joakim Hove
40fd922b6e Added iterator access to DynamicState<T> 2018-02-07 11:22:35 +01:00
Andreas Lauser
ce93d98b80 respect the fact that non-SI temperature may be offset from zero
also, the UnitTests test was buggy.

V2: improve the accuracy of the °F->K offset, unit test all temperature measures
2018-02-02 17:13:50 +01:00
Joakim Hove
494dda28a8 Revert "respect the fact that non-SI temperature may be offset from zero" 2018-02-01 15:08:12 +01:00
Joakim Hove
a496158ed6 Merge pull request #1203 from andlaus/fix_measures
respect the fact that non-SI temperature may be offset from zero
2018-01-31 17:53:15 +01:00
Andreas Lauser
d6f4cb016e respect the fact that non-SI temperature may be offset from zero
also, the UnitTests test was buggy.
2018-01-31 13:17:06 +01:00
Atgeirr Flø Rasmussen
36afd2c99e Silence sign comparison warnings. 2018-01-30 15:02:58 +01:00
Joakim Hove
53d8d65c7b Merge pull request #1190 from nairr/aquancon_object
Aquancon object
2018-01-25 14:38:37 +01:00
Rohith Nair
9552d24f77 clean up test 2018-01-25 10:46:14 +01:00
Ove Sævareid
ec83e0fc18 Support for kw MAXVALUE/MINVALUE. 2018-01-24 16:01:09 +01:00
Rohith Nair
4c0514a5f4 edit 2018-01-19 17:03:06 +01:00
Rohith Nair
c8e1734efd add test for aquancon object 2018-01-19 17:00:34 +01:00
Joakim Hove
3a03c2226c Added support for defaults in the in-keyword boxes. 2018-01-18 12:58:32 +01:00
Joakim Hove
972979c931 Added nine argument(!) constructor for Box class 2018-01-18 10:50:04 +01:00
Steinar Foss
5d9f529637 PARSE_EXtRA_RECORDS: added more info to error msg. 2018-01-17 10:27:37 +01:00
Steinar Foss
ab716c6036 added extra test function Handle_extra_records_2. 2018-01-16 17:15:37 +01:00
Steinar Foss
5ef8d22a48 IGNORE_EXTRA_RECORDS changed to PARSE_EXTRA_RECORDS.
...
2018-01-16 16:58:29 +01:00