Commit Graph

3381 Commits

Author SHA1 Message Date
Joakim Hove
d078a96eae Use RestartValue container for Eclipse output 2018-05-14 16:12:52 +02:00
Joakim Hove
fea57c5031 Merge pull request #387 from lars-petter-hauge/invalid_wells_context
Invalid wells context
2018-05-14 15:22:00 +02:00
Atgeirr Flø Rasmussen
b28527c0ec Update after review.
In particular:
 - correct path for test deck,
 - use unit system to convert output correctly,
 - handle and warn for the case where we do not have an explicit
   connection transmissibility factor from the deck.
2018-05-14 11:30:51 +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
Odd
8cfd477d3e Added implementation of serialize_SCON
The value 'Kh' (effective for connection) is not directly available from
the Connection interface.  For the time being, a dummy value is used.

Computing the correct value for 'Kh' involves using the connection
transmissibility factor (avaliable), the well diameter (available), as
well as information about grid geometry (not immediately available), well
angle through connection cell (not immediately available, as far as I
can tell), and possibly a conversion factor.
2018-05-14 09:26:03 +02:00
Atgeirr Flø Rasmussen
49edd1e54d Minor fixes from review.
In particular:
 - replace tabs -> spaces,
 - use the term "lookup_step",
 - document interface better,
 - use correct path (no path...) for test deck.
2018-05-13 22:48:14 +02:00
Odd Andersen
6b78115229 Added new implementation of serialize_ICON
The new function has been added to the file WriteRestartHelpers, and
intended to take over for the local function 'serialize_ICON' in
`restartIO.cpp` when `restartIO::save()` is to be updated.  The purpose
of the new implementation is to be compatible with Eclipse.
2018-05-13 21:43:35 +02:00
Atgeirr Flø Rasmussen
9303771a73 Fix typo: calender -> calendar. 2018-05-10 07:09:47 +02:00
Joakim Hove
1d02191178 Use lookup_step and report_step consistently 2018-05-03 08:57:05 +02:00
Bård Skaflestad
d0542ba9fe Restart Headers: Add Support for DOUBHEAD Keyword
In particular, implement logic for "datenum" of start point in
addition to elapsed time (in days) and "datenum" of current time
point (start + elapsed).
2018-05-02 17:10:58 +02:00
Bård Skaflestad
a2f27bd62d InteHEAD: Expose Time-Point Handling as Utility
This commit allows clients to derive an InteHEAD::TimePoint (renamed
from InteHEAD::Date) from a calendrical start point (std::time_t)
and an elapsed time in seconds.  This is generally useful for
restart purposes which needs to fill in Y-m-d H:M:S information in
INTEHEAD and has other uses as well.  Demonstrate utility in a new
unit test that also shows leap year handling.

While here, also add fractional second resolution to the time-point
handling.  INTEHEAD(411) already has microsecond precision and we
should leverage that support.
2018-05-02 17:10:58 +02:00
Jostein Alvestad
17767fab3a Completed INTEHEAD vector-data, added LOGIHEAD vector data. 2018-05-02 17:10:58 +02:00
Jostein Alvestad
ce1f66b4e5 Skeleton for INTEHEAD Writing
Based on reverse-engineering of several ECL runs.
2018-05-02 17:10:58 +02:00
Joakim Hove
36c166cdc9 Merge pull request #386 from GitPaean/fixing_vfp_running
return std::map of std::shared_ptr for getVFPxTables()
2018-04-23 16:30:26 +02:00
Kai Bao
a1e587ef09 return std::map of std::shared_ptr for getVFPxTables()
in Schedule.
2018-04-20 11:27:26 +02:00
Joakim Hove
a4228efc66 Utility to compare keywords: check if grid parameter 2018-04-20 10:40:00 +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
Atgeirr Flø Rasmussen
49c0d3fa83 Merge pull request #358 from tskille/master
Added routine for calculating cell volumes based on corner point input.
2018-03-23 09:22:27 +01: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
Torbjørn skille
25fd3fcc14 updated name of function, and fix space around assignments 2018-03-20 14:40:21 +01:00
Torbjrn Skille
bee5699d79 Files renamed, forgot to add new files. Here they are 2018-03-19 19:56:16 +01:00
Torbjrn Skille
5374faa9b8 includes additional updates based on feedback from maintainer 2018-03-19 19:40:16 +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