Commit Graph

4709 Commits

Author SHA1 Message Date
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
Arne Morten Kvarving
e864031bf4
Merge pull request #389 from andlaus/update_version
dune.module: update version to 2018.10-pre
2018-04-27 10:45:03 +02:00
Andreas Lauser
76f678bf82 dune.module: update version to 2018.10-pre 2018-04-26 17:48:37 +02:00
Joakim Hove
b5a2454d2c
Merge pull request #383 from lars-petter-hauge/restart_timestep
Well info at correct step for save & load RESTART
2018-04-23 16:30:51 +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
Joakim Hove
122158d713
Merge pull request #385 from joakim-hove/compare-header-keywords
Utility to compare keywords: check if grid parameter
2018-04-20 11:48:29 +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
Lars Petter Øren Hauge
62b9548167 Well info at correct step for save & load RESTART
Retrieve number of wells and completions at the beginning of the
simulated step. Otherwise a well introduced at the same time step as the
report will be included - even though there doesn't exist any simulated
data yet.

This issue would trigger a throw if WRFTPLT was added at the same time
step as a well is introduced in the schedule section.

Removed one DATES item in FIRST_SIM.DATA. The
EclipseReadWriteWellStateData in test_Restart compared state at T1,
which did not include any well data as it was. No other tests were
affected.
2018-04-17 14:58: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
Atgeirr Flø Rasmussen
b9f7e89c48
Merge pull request #380 from joakim-hove/vfp-rebase
Make VFP tables dynamic
2018-04-13 11:32:06 +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
Joakim Hove
b8cdeefaec Add missing <mumeric> header 2018-04-11 06:14:56 +02:00
Joakim Hove
e131ca5d75
Merge pull request #378 from andlaus/internalize_WINJTEMP
internalize the WINJTEMP keyword
2018-04-11 06:11:02 +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
d381110119
Merge pull request #374 from andlaus/add_PETOPTS
Add PETOPTS
2018-04-09 16:41:26 +02:00
Arne Morten Kvarving
bfb0cae466
Merge pull request #376 from akva2/missing_data_to_tests
fixed: missing OPM_DATA_ROOT -> OPM_TESTS_ROOT
2018-04-09 14:30:08 +02:00
Arne Morten Kvarving
f4a68c7e64 fixed: missing OPM_DATA_ROOT -> OPM_TESTS_ROOT 2018-04-09 10:56:59 +02:00
Andreas Lauser
ea5b35ac46 fix the definition of RSCONSTT
without setting the "size" item, an additional slash is needed to
terminate the keyword. this is not correct.
2018-04-06 14:23:17 +02:00
Andreas Lauser
0a4a256c78 add the PETOPTS keyword
this makes it more convenient to work with cases developed with PETREL
because it prevents the parser from choking on the unmodified output.
2018-04-06 13:24:06 +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
Atgeirr Flø Rasmussen
cfec35903d
Merge pull request #373 from joakim-hove/parse-symlink
Parse symlink
2018-04-06 09:26:49 +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
5979131127
Merge pull request #371 from akva2/use_init_list
changed: use initializer list for enums
2018-04-04 18:20:02 +02:00
Atgeirr Flø Rasmussen
a846f7ad54
Merge pull request #372 from atgeirr/fix-missing-include
Add missing <cmath> include for std::fabs().
2018-04-04 15:23:28 +02:00
Atgeirr Flø Rasmussen
f250a87298 Add missing <cmath> include for std::fabs(). 2018-04-04 14:22:12 +02:00
Arne Morten Kvarving
0b9615947b changed: use initializer list for enums 2018-04-04 14:16:07 +02:00
Joakim Hove
b6d5995b7c
Merge pull request #369 from joakim-hove/raw-string
Value type: RAW_STRING
2018-04-04 08:21:10 +02:00
Joakim Hove
c58e812421
Merge pull request #370 from joakim-hove/lgr-keywords
Add LGR related keywords
2018-04-03 14:35:19 +02:00
Joakim Hove
5ce9e64ec6 Add LGR related keywords 2018-04-03 10:55:59 +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
Arne Morten Kvarving
92422a6e9a
Merge pull request #352 from akva2/data_to_tests
Use regression test data from opm-tests, not opm-data
2018-03-27 14:56:04 +02:00
Arne Morten Kvarving
21aa4ac1e0 add some temporary backwards compat code
required until jenkins side scripting has been modified.
2018-03-27 12:09:09 +02:00
Arne Morten Kvarving
e823b0a93e changed: replace opm-data with new opm-tests repository 2018-03-27 12:09:09 +02:00
Joakim Hove
aa06db984c Remove unused enum for ParserItem value type 2018-03-26 17:04:08 +02:00