Commit Graph

2685 Commits

Author SHA1 Message Date
Rohith Nair
aecf3f6470 Handle conversion of constants in parser
Adds conversion factors for constants to SI units

edit

use p0_defaulted within aquiferCT

conversion based on unitsystem

edit
2018-05-22 14:28:34 +02:00
Joakim Hove
5008501318 Add WellTestConfiguration to Schedule 2018-05-16 00:57:54 +02:00
Joakim Hove
b9d2a08930 Add WellTestConfig implementation to support WTEST keyword 2018-05-15 19:23:56 +02:00
Lars Petter Øren Hauge
fcbcc9cda4 Add INVALID_NAME to GCONPROD, GCONINJE & GEFAC 2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
675858f1e0 Handle wildcard in group keywords
Added function getGroups(pattern) to allow records with wildcard.

Included the functionality for GCONPROD, GCONINJE and GEFAC - currently
the only group keywords that should accept wildcards.
2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
427833b089 Add INVALID_WELLS to WECON & WEFAC 2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
ba573b5834 Add INVALID_WELLS to WELOPEN & WELTARG 2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
6a8e7a9a05 Add INVALID_WELL context to WPOLYMER & WSOLVENT 2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
580a64563f Add INVALID_WELL context to W(INJ)TEMP
Handle well template (e.g. W*) in the .DATA file for WTEMP and WINJTEMP
and add INVALID_WELL_CONTEXT
2018-05-14 09:26:22 +02:00
Lars Petter Øren Hauge
ba107498a1 Add INVALID_WELL context for WCONINJ(E/H) 2018-05-14 09:26:22 +02:00
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
Kai Bao
a1e587ef09 return std::map of std::shared_ptr for getVFPxTables()
in Schedule.
2018-04-20 11:27:26 +02:00
Atgeirr Flø Rasmussen
fb4fbc318b Merge pull request #381 from akva2/mark_explicit
mark constructor explicit
2018-04-13 11:35:38 +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
033362bed7 White space change 2018-04-12 19:00:22 +02:00
Joakim Hove
5d9c6f9fc4 Remove comments 2018-04-12 18:57:08 +02:00
Atgeirr Flø Rasmussen
438ccdebd0 Merge pull request #379 from joakim-hove/move-vfp-tables-api
Move vfp tables api
2018-04-12 11:20:27 +02:00
Arne Morten Kvarving
1bd6e9ca66 mark constructor explicit 2018-04-12 10:52:33 +02:00
Joakim Hove
a119dadb45 Add (unused) new constroctors 2018-04-11 08:10:53 +02:00
Joakim Hove
8d7e890967 Add argument timeStep to VFP access methods. 2018-04-11 06:23:28 +02:00
Joakim Hove
4d835fc759 Add events VFPINJ_UPDATE and VFPPROD_UPDATE 2018-04-11 06:19:24 +02:00
Andreas Lauser
10258f247b internalize the WINJTEMP keyword
currently the only quantity that us used is the well temperature,
i.e., specifying the fluid enthalpy does not have any effect.
2018-04-10 14:56:11 +02:00
Joakim Hove
c37e5f9503 Move VFP tables to Schedule. 2018-04-06 12:42:47 +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
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
aa97b76fbb Runspec: Retrieve WSEGDIMS Default Values from Keyword Impl
Suggested by: [at]joakim-hove
2018-03-22 14:23:02 +01: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
Atgeirr Flø Rasmussen
b4d69b929d Merge pull request #360 from joakim-hove/ordered-groups
Ordered groups
2018-03-19 14:08:35 +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
Joakim Hove
2d8457e3a9 Added pseoudo unit system for untransformed input values. 2018-03-15 10:43:53 +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
4d1333e2ff Merge pull request #1218 from joakim-hove/summary-missing-wells
Summary missing wells
2018-02-20 22:16:08 +01:00
Atgeirr Flø Rasmussen
ac56621759 Silence warning.
Unlike returning const references, returning const values is no different
from returning a non-const value.
2018-02-20 14:11:18 +01:00
Joakim Hove
c904c6bf98 Added action argument to ParseContext::addKey() 2018-02-19 14:52:21 +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
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
c9291f165c address review comments 2018-02-05 10:38:57 +01:00