Commit Graph

4709 Commits

Author SHA1 Message Date
Arne Morten Kvarving
b338e56730 changed: manually merge pr's to work around slow updating merge refs on github 2018-05-23 09:00:00 +02:00
Joakim Hove
28b7781017
Merge pull request #404 from akva2/rh6_update
fix redhat 6 packaging
2018-05-23 08:31:06 +02:00
Arne Morten Kvarving
56da8cd8f9 fix redhat 6 packaging
cmake28 -> cmake3
2018-05-23 08:26:37 +02:00
Joakim Hove
6168a35512 Add SummaryState class to hold on to summary state. 2018-05-23 06:49:23 +02:00
Rohith Nair
9a17457e6f comment on C2 2018-05-22 16:02:38 +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
23ca927249
Merge pull request #391 from joakim-hove/use-restart-value
Save and load THPRES
2018-05-18 08:57:15 +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
3c18add696 Verify that the extra container has THPRES 2018-05-15 23:08:30 +02:00
Joakim Hove
b9d2a08930 Add WellTestConfig implementation to support WTEST keyword 2018-05-15 19:23:56 +02:00
Joakim Hove
eb001a1e67 Add runtime check that THPRES is saved 2018-05-14 16:12:52 +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
Arne Morten Kvarving
fadab53590
Merge pull request #402 from akva2/master
update redhat packaging
2018-05-14 13:33:39 +02:00
Joakim Hove
b4ef14dfc0
Merge pull request #400 from atgeirr/serialize_SCON
Added implementation of serialize_SCON
2018-05-14 13:26:21 +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
429c4e475c Remove deprecated comment
The handling of `time step - 1` was changed in
62b9548167
2018-05-14 09:26:22 +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
e6b57fa422 Handle well template for COMPDAT
Allow well template (e.g 'W*') when defining completion records in the
.DATA file under COMPDAT
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
Lars Petter Øren Hauge
5dd34b1308 Removed dead code in from::COMPDAT
The "prev_compls" was initialized with preadded completions, such that
new records in COMPDAT would append in the correct order.

However the order is maintained without the need of including the check
in Completion::fromCOMPDAT.

Tests exist in ScheduleTests.cpp to verify completion order for both
TRACK and INPUT mode.

Completion order will affect the print in RFT data. A simple case which
will have changes for completion order was simulated and the output was
verified (with both INPUT and TRACK order).
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
bfb6553828
Merge pull request #399 from atgeirr/Oddan-odd-devel
Added new implementation of serialize_ICON
2018-05-14 07:39:39 +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
901a44e92b
Merge pull request #397 from atgeirr/restart-xHEAD-keywords
Add Initial Implementation of Correctly Sized Header Vectors for Restart
2018-05-11 20:54:20 +02:00
Atgeirr Flø Rasmussen
01f87ea750 Use 2001 instead of 1901 in toDateNum().
This is because the toDateNum() calls makeUTCTime(), which calls
mktime(), which can fail for dates before epoch.
2018-05-10 08:51:02 +02:00
Atgeirr Flø Rasmussen
9303771a73 Fix typo: calender -> calendar. 2018-05-10 07:09:47 +02:00
Atgeirr Flø Rasmussen
be9744ef68 Add extra consistency test, that is independent of dates used. 2018-05-10 07:01:40 +02:00
Atgeirr Flø Rasmussen
6ec82f8947 Update test to match intended change in behaviour. 2018-05-10 07:01:04 +02:00
Atgeirr Flø Rasmussen
ef29518fab Documented some literals used in INTEHEAD implementation. 2018-05-09 16:48:52 +02:00
Atgeirr Flø Rasmussen
cd9afa6aec Merge branch 'restart-xHEAD-keywords' of https://github.com/joakim-hove/opm-common into joakim-hove-restart-xHEAD-keywords 2018-05-09 14:06:22 +02:00
Arne Morten Kvarving
bdef0ddfb0 update redhat packaging 2018-05-08 14:06:43 +02:00
Joakim Hove
e79b5bbc8c
Merge pull request #395 from totto82/fix_fnpt
fix fnpt rates
2018-05-08 13:39:54 +02:00
Tor Harald Sandve
d0979638bc fix fnpt rates 2018-05-08 11:25:47 +02:00
Joakim Hove
38640bffd6
Merge pull request #394 from akva2/data_to_tests
opm-data -> opm-tests
2018-05-08 10:51:05 +02:00
Arne Morten Kvarving
464d557c80 fixed: opm-data -> opm-tests 2018-05-08 10:40:49 +02:00
Joakim Hove
1d02191178 Use lookup_step and report_step consistently 2018-05-03 08:57:05 +02:00
Bård Skaflestad
51933168eb Build System: Sort List of Public Headers for ECL_OUTPUT 2018-05-02 17:10:58 +02:00