Commit Graph

228 Commits

Author SHA1 Message Date
Joakim Hove
161f555bc0 Handle space in the 'BASIC = ?' RPT mnemonics 2018-12-18 08:48:59 +01:00
Atgeirr Flø Rasmussen
e341bd1c08 Merge pull request #577 from GitPaean/updating_liquid_rate_for_wconhist
updating liquid rate for WCONHIST
2018-12-07 09:58:18 +01:00
Atgeirr Flø Rasmussen
f9ce82547c Merge pull request #559 from kel85uk/fix_influx_coeff
Fix for aquifer making connection
2018-12-07 09:56:40 +01:00
Kai Bao
b349b3b217 updating liquid rate for WCONHIST 2018-12-03 16:40:42 +01:00
Joakim Hove
983ed5fcb8 Merge pull request #575 from joakim-hove/smspec-c++
Adapt to C++ changes in libecl
2018-11-30 08:09:31 +01:00
Joakim Hove
f414f5b8ad Adapt to C++ changes in libecl 2018-11-26 17:30:09 +01:00
Joakim Hove
7c52f6f5a8 Merge pull request #560 from blattms/edit-nnc-2nd-try
Represent EDITNNC in the deck representation.
2018-11-26 16:57:18 +01:00
Joakim Hove
188eb23911 Merge pull request #574 from joakim-hove/parsecontext-exit1
Parsecontext exit1
2018-11-26 14:25:34 +01:00
Joakim Hove
72ad2eaa7f Merge pull request #562 from trinemykk/addtracer
Added missing support for tracers in the parser
2018-11-26 13:02:19 +01:00
Trine S Mykkeltvedt
5085fb35c0 removed WTRACER from RPTRST_DECK.DATA to make tests pass 2018-11-26 09:44:31 +01:00
Joakim Hove
8d33ec55bd Add ParseContext error handler EXIT1 for user error 2018-11-25 11:53:34 +01:00
Joakim Hove
d70b86484d White space 2018-11-25 08:56:20 +01:00
Joakim Hove
f4a9298cf4 Merge pull request #569 from joakim-hove/OPERATER
Add support for OPERATER keyword
2018-11-23 13:05:08 +01:00
Atgeirr Flø Rasmussen
7de217b8fb Merge pull request #567 from joakim-hove/normalize-case
Force UPPER_CASE when input deck has MixeDCase basename
2018-11-23 11:08:54 +01:00
Joakim Hove
039fdb70de Merge pull request #520 from GitPaean/adding_injectivity_keywords_june
Adding injectivity keywords
2018-11-23 10:56:18 +01:00
Bård Skaflestad
fda1719eab Correct RSCONST and RSCONSTT Specifications
This commit ensures that we never try to read more than a single
record of data when parsing the RSCONST keyword.  Previously, the
parser would attempt to parse RSCONST as if it were an unbounded
keyword that was terminated by an empty record.  This, in turn,
would produce the diagnostic message

    Inner exception: Malformed floating point number 'INCLUDE'

when trying to read a specification like

    RSCONST
     0.35  932  /

    -- Check for these data in the future this is important
    INCLUDE
      'RP.dat'  /

While here, also implement 'getSIDouble()' for the Rs value (item 1)
in keywords RSCONST and RSCONSTT by adding the correct unit of
measurement ("dimension") to the keyword specification.

Add unit tests to verify new behaviours.
2018-11-22 13:28:39 +01:00
kel85uk
d93bd35b8e Change influx_coeff to double. Remove test of influx_coeff as it is difficult to check for equal collections of pointers. Change from false to nullptr when making AquiferCTTests. 2018-11-22 09:35:01 +01:00
kel85uk
62f39dacce Fixes the data type to shared_ptr for the working_buffer vector 2018-11-22 09:34:57 +01:00
kel85uk
1d7a12442e Fixes the default behaviour for the influx_coeff and default aquifer pressure with AQUCT by providing nullptr instead of values. 2018-11-22 09:34:55 +01:00
Markus Blatt
d69bf47a28 Added test for parsing EDITNNC 2018-11-21 22:14:27 +01:00
Joakim Hove
e0d5711f8e Add support for OPERATER keyword 2018-11-21 16:56:28 +01:00
Joakim Hove
3677f470fb Force UPPER_CASE when input deck has MixeDCase basename 2018-11-21 13:07:33 +01:00
Markus Blatt
0768c5a8b3 Revert "Merge pull request #535 from blattms/support-editnnc"
This reverts commit 7ebadbb055, reversing
changes made to 0f485c7801.
2018-11-20 13:58:08 +01:00
Trine Solberg Mykkeltvedt
ea7cb8d2c6 adding support for WTRACER keyword in EclipseState 2018-11-19 13:10:02 +01:00
Kai Bao
6858bd4578 adding the ScheduleTests for the following keywords
WPMITAB and WSKPTAB
2018-11-19 12:27:52 +01:00
Kai Bao
316324a78e renaming Simple2DTable to PolyInjTable
make it more clear that it is a talbe introduced for the polymer
injectivity study, not intended for general usage.
2018-11-19 12:08:04 +01:00
Kai Bao
862b3450d3 adding test for the following three keywords
SKPRWAT, SKPRPOLY and PLYMWINJ .
2018-11-19 12:08:04 +01:00
Joakim Hove
6921801eec Add method Schedule::evalActions() to evaluate ACTIONX 2018-11-19 09:57:06 +01:00
Joakim Hove
c1ffeeef53 Merge pull request #557 from joakim-hove/actioncontext-summary-state
Actioncontext summary state
2018-11-16 11:31:20 +01:00
Joakim Hove
ad55655a08 Add method update_equal() to DynamicState 2018-11-14 09:34:13 +01:00
Bård Skaflestad
baae4a3faf Recognise Requests for Stone's Second Model of 3-Phase Oil Relperm
This commit makes the parser aware of the keywords STONE and STONE2
which both request that the simulation run use Stone's second model
for three-phase relative permeability for oil.
2018-11-12 11:50:45 +01:00
Joakim Hove
36c3080f85 ActionContext internalizes a SummaryState object 2018-11-09 21:58:36 +01:00
Joakim Hove
212a1fde5f Parse condition part in ACTIONX 2018-11-09 20:19:34 +01:00
Arne Morten Kvarving
3cbc40bd4d remove unused variable 2018-11-07 09:46:10 +01:00
Joakim Hove
089b58f101 Merge pull request #547 from totto82/productivity_index
Add support for output of well productivity index
2018-11-06 09:38:55 +01:00
Tor Harald Sandve
e2d748906e Fix failure in actionx test after rebase 2018-11-05 13:48:36 +01:00
Tor Harald Sandve
95179f393c Fix vappars and dr[sv]dt logic
The simulator should either use VAPPERS or dr[sv]dt, both the
combination drsdt and drvdt is allowed.
2018-11-05 13:38:42 +01:00
Tor Harald Sandve
2d5d0953ee Add support for output of well productivity index 2018-11-02 15:57:21 +01:00
Bård Skaflestad
9df3bea857 Simulation Config: Add Predicate for Thermal Simulations
This commit introduces a new predicate,

    bool SimulationConfig::isThermal() const

that determines whether or not either of the keywords

    TEMP or THERMAL

are specified in the RUNSPEC section of a simulation run.
2018-11-02 13:45:50 +01:00
Joakim Hove
68e6926355 Add Actions container and ActionContext for eval 2018-11-02 10:55:29 +01:00
Joakim Hove
b8c5d8c129 Add whitelist of keywords allowed in ACTIONX block 2018-10-27 15:59:32 +02:00
Joakim Hove
7ebadbb055 Merge pull request #535 from blattms/support-editnnc
Added support for honoring keyword EDITNNC during deck parsing.
2018-10-25 15:49:06 +02:00
Bård Skaflestad
decd0b10a9 SummaryConfig: Expand Segment Vector Record Processing
This commit extends the processing of segment-related summary
vectors to also support specifications of the form

    SOFR
    /

designating all segments of all multi-segmented wells at all times.

Expand SummaryConfig unit test to exercise this extended record
processing mode.
2018-10-25 09:09:32 +02:00
Bård Skaflestad
f867d7f82c SummaryConfig: Recognise Subset of Segment Vectors
This commit extends the SummaryConfig class to recognise a small
subset of segment-related summary vectors.  In particular, this
brings support for 'SGFR', 'SOFR', 'SPR', and 'SWFR'--at least in a
restricted sense.  We do not yet support cases like

    SOFR
    /

which designates all segments in all wells at all times.

The unit testing is presently minimal and must be expanded before
this is ready for inclusion into master.  In particular, we only
check that cases like

    SOFR
      'PROD01' 1 /
    /

generate the expected summary vector nodes (class SummaryNode).
2018-10-25 09:09:31 +02:00
Joakim Hove
ae0cb3e5ad Merge pull request #528 from totto82/minpvv
Add support for minpvv
2018-10-25 09:04:32 +02:00
Joakim Hove
133f89198f Merge pull request #507 from WesselDeZeeuw/aquifet
Aquifet parser implementation
2018-10-25 09:01:29 +02:00
Joakim Hove
e356a16ab2 Merge pull request #462 from joakim-hove/tranx-modifier
Add deckAssigned() method to GridProperty + default construct TRAN
2018-10-24 10:36:19 +02:00
Markus Blatt
5f620f7451 Added support for honoring keyword EDITNNC during deck parsing.
If the keyword is present then the transimissibilities of the corresponding NNC
entries will be scalled with the factor specified via EDITNNC. Multiple entries
for the same cell pairs are allowed and will result in multiple scalings.
Cell pairs specified in EDITNNC that are not present in NNC are silently ignored.
2018-10-18 15:26:31 +02:00
Joakim Hove
c76ee877aa Update GDFILE handling to account for out-of-cwd
Make sure path to GDFILE is correct
2018-10-18 10:47:38 +02:00
Joakim Hove
fd36bf88fb Add function Deck::makeDeckPath() 2018-10-18 10:47:37 +02:00