Commit Graph

3403 Commits

Author SHA1 Message Date
Joakim Hove
d39db2f0db Rename Completion -> Connection 2018-06-11 10:40:59 +02:00
Joakim Hove
088ba8a19a Merge pull request #413 from joakim-hove/restart-icon-skip-inactive
Restart icon skip inactive
2018-06-08 12:49:37 +02:00
Joakim Hove
d168e9ff67 Merge pull request #414 from joakim-hove/welltest-state
Add WellTestState object to keep track of automatically closed wells
2018-06-07 12:41:05 +02:00
Joakim Hove
66de108c68 Revert "Add method for getting all the wells in the WellTestConfig" 2018-06-07 07:48:44 +02:00
Joakim Hove
58e4e5263e Add WellTestState object to keep track of automatically closed wells 2018-06-07 07:42:03 +02:00
Joakim Hove
8fda1e036a Merge pull request #415 from totto82/welltest
Add method for getting all the wells in the WellTestConfig
2018-06-06 15:45:06 +02:00
Tor Harald Sandve
3327d17c3f Add method for getting all the wells in the WellTestConfig 2018-06-06 15:22:14 +02:00
Joakim Hove
d299e003b7 Merge pull request #411 from GitPaean/adding_vfp_numbers
VFP related needs to be processed even without THP target/limit
2018-06-05 17:34:29 +02:00
Joakim Hove
ccb7e5df3e Use active completions when writng restart files. 2018-06-05 12:31:00 +02:00
Joakim Hove
1ee597206c Add CompletionsSet constructor including only active connections. 2018-06-05 12:25:20 +02:00
Atgeirr Flø Rasmussen
3ad0b1c5ca Fix forgotten <string> include. 2018-06-04 15:05:09 +02:00
Joakim Hove
24f28e8a5d Ignore THPRES input for restart runs 2018-05-31 17:15:34 +02:00
Kai Bao
f945032405 VFP table number related to history macthing mode
tests are failed.
2018-05-30 13:26:51 +02:00
Joakim Hove
0b4f830d28 Merge pull request #377 from nairr/aquctconversions
Handle conversion of constants in parser
2018-05-24 16:34:02 +02:00
Joakim Hove
6168a35512 Add SummaryState class to hold on to summary state. 2018-05-23 06:49:23 +02:00
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
3b84678db5 Merge pull request #398 from joakim-hove/welltest-config
Add WTEST configuration
2018-05-18 09:10:00 +02:00
Joakim Hove
7163807296 Change method names 2018-05-16 12:31:14 +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
Joakim Hove
593af1c678 Pass dimension information for extra fields in restart 2018-05-14 16:12:52 +02:00
Joakim Hove
e6f318aa28 Add key string to RestartKey 2018-05-14 16:12:52 +02:00
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