Commit Graph

4696 Commits

Author SHA1 Message Date
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
Joakim Hove
8058bab5ea
Merge pull request #350 from joakim-hove/restart-embed-step
Embed restart_step in restarted summary writer.
2018-03-26 15:28:58 +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
Joakim Hove
8706c5630f
Merge pull request #366 from lars-petter-hauge/Eff_fac_historic_volumes
Add eff_fac for historic volumes
2018-03-23 08:56:12 +01:00
Joakim Hove
9eab56858c
Merge pull request #364 from GitPaean/adding_keywords_SPOLYMW
adding keyword SPOLYMW
2018-03-22 17:13:01 +01:00
Lars Petter Øren Hauge
8040f32db9 Add eff_fac for historic volumes 2018-03-22 16:04:28 +01:00
Kai Bao
e02610c94a adding keyword SPOLYMW
to initialize the polymer molecular weight.
2018-03-22 15:28:08 +01:00
Joakim Hove
be6748d93f
Merge pull request #365 from bska/expose-additional-dimension-values
Expose Additional Maximum Dimension Values to EclipseState Clients
2018-03-22 15:17:51 +01:00
Torbjørn skille
43d24d179e fixed typo in file CMakeLists_files.cmake 2018-03-22 14:58:01 +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