Commit Graph

6606 Commits

Author SHA1 Message Date
Steinar Foss
c0bd19c59e python: added class UnitSystem. 2019-10-11 22:02:54 +02:00
Joakim Hove
32ac0034a7 Merge pull request #1091 from stefoss23/deck_keyword_vector
deckkeyword: new constructors takes (ParserKeyword, std::vector).
testing/2019.10/rc7
2019-10-11 20:04:50 +02:00
Steinar Foss
17f246c1a7 deckkeyword: new constructors takes (ParserKeyword, std::vector).
DeckKeyword: test for vector<int> data constructor.

DeckKeyword takes std::vector<int> and std::vector<double>.

...

...

...

...
2019-10-11 13:47:14 +02:00
Joakim Hove
d66f0a664c Merge pull request #1067 from joakim-hove/box-grid
Consider active cells in BOX implementation
2019-10-11 10:57:39 +02:00
Joakim Hove
9af248f889 Merge pull request #1072 from stefoss23/python_deck_values
python: new DeckKeyword constructor takes DeckRecords
2019-10-11 10:57:14 +02:00
Joakim Hove
3c26314475 Merge pull request #1087 from bska/bypass-filleps-for-2p
INIT File: Bypass FILLEPS for Two-Phase Systems
2019-10-11 10:56:25 +02:00
Joakim Hove
12e2c9c545 Merge pull request #1081 from bska/prepare-new-summary-writer
Prepare New Summary Writer
2019-10-11 10:39:59 +02:00
Joakim Hove
79d3f236c2 Merge pull request #1086 from stefoss23/python_conn
Python: removed properties.py, shedule.py, parser_module.py and sunbeam.py
2019-10-11 08:42:07 +02:00
Joakim Hove
5c280ed72a Merge pull request #1083 from joakim-hove/T
Keywords on starting with T
2019-10-11 08:39:19 +02:00
Joakim Hove
73cc9cff3a Merge pull request #1085 from stefoss23/add_keywords_H
Adding keywords beginning w/ H and I.
2019-10-11 08:39:07 +02:00
Bård Skaflestad
c736e71e46 INIT File: Bypass FILLEPS for Two-Phase Systems
Flow's saturation function finalizers don't currently handle models
with fewer than three active phases.  Don't attempt to fill in
scaled endpoint vectors in this case, but issue a warning that we're
ignoring FILLEPS here.
2019-10-10 22:28:41 -05:00
Steinar Foss
92f69d7648 removed sunbeam.py. 2019-10-10 12:57:49 +02:00
Steinar Foss
bad1b1d3fb removed parser_module.py. 2019-10-10 12:56:51 +02:00
Steinar Foss
0e1339e648 removed all test suppoert for parser_module.py. 2019-10-10 12:54:22 +02:00
Steinar Foss
3cc205ee93 ELIMINATED 'properties.py'. 2019-10-10 12:54:22 +02:00
Steinar Foss
ad564ad651 python connection: exposed directly via pybind11.
python connection. added property pos.

removed shedule.py.

test_connection.py passed.

test_wells.py: test_completion passes.

removed opm.io.config.

renamed test_state2.py -> test_state.py.
2019-10-10 12:54:40 +02:00
Steinar Foss
39c1056c87 added keywords beginning w/ H and I.
added keywords HMWELCON, HMWPIMPLT.

added keyword HMxxxxxx.

added keywords HRFIN, HWKRO, HWKRORH.

added keywords HWKRORW, HWKRWM HWKRWR.

added keyword HWPCW.

added keywords HWSNUM, HWSOGCR, HWSOWCR.

added keyword HWSWCR.

added keywords HWSWL, HWSWLPC, HWSWU.

added keywords HXFIN, HYDRHEAD, HYFIN.

added keywords HYMOBGDR, HYST, HYSTCHCK.

added keyword HZFIN.

added keywords IHOST, IMBNUMMF, IMPCVD.

IMPLICIT, IMPORT, IMSPCVD.

added keywords INSPEC, INTPC, IONROCK.

added keywords IONXROCK, IONXSURF.

...
2019-10-09 15:29:48 +02:00
Joakim Hove
9f1858265a Create ParserKeywords in try catch block 2019-10-09 11:53:25 +02:00
Joakim Hove
5a9f5c0999 Keywords on starting with T 2019-10-09 08:10:50 +02:00
Bård Skaflestad
a5d943fd8f Unit System: Use Plural for TIME Names
The summary file must have DAYS (&c) for its TIME vector unit.  This
is a step towards enabling new summary writer functionality.

Update the RFT writer accordingly.
2019-10-08 23:25:48 -05:00
Bård Skaflestad
e598aa8cae Output Stream: Add File Creation for Summary Files
This commit adds a single function, createSummaryFile, that opens an
EclOutput object on a file named as an ECLIPSE summary file
(formatted vs. unformatted, unified vs. separate) and returns a
unique_ptr to this.

This is a step towards enabling new summary writer functionality.
2019-10-08 23:20:39 -05:00
Bård Skaflestad
359558536e Output: Support More Than 10,000 Report Steps
This commit extends Flow's support for separate restart files to
more than 10,000 report steps (not necessarily restart steps).  In
particular, add support for generating separate restart files named

    CASE.X000n, CASE.Y000n, CASE.Z000n (unformatted)
    CASE.F000n, CASE.G000n, CASE.H000n (formatted)

This is mostly for completeness.  We do not really expect to run
simulation models with more than 10,000 (or 20,000) report steps.
2019-10-08 23:12:37 -05:00
Bård Skaflestad
e6e8b070d7 Merge pull request #1077 from joakim-hove/compile-fixup
Compile fixup
2019-10-08 17:36:51 -05:00
Joakim Hove
278f4ff3c9 Merge pull request #1079 from stefoss23/python_context_recovery
python: rewrite of tests using ParseContext.
2019-10-08 23:42:44 +02:00
Joakim Hove
2f6160ec17 Minor change to fix compile error 2019-10-08 18:47:26 +02:00
Joakim Hove
a319d7be4f Add missing GPL / Copyright header 2019-10-08 18:42:58 +02:00
Joakim Hove
8101591277 White space 2019-10-08 18:42:58 +02:00
Steinar Foss
223fe5e7df python: rewrite of tests using ParseContext.
test_state: recalled slash test and made it work.

...

test_parse_deck ok.
2019-10-08 17:30:56 +02:00
Joakim Hove
b6824af640 Merge pull request #967 from jalvestad/udq_dynamic
Code to write dynamic UDQ data to Eclipse compatible restart file
2019-10-08 12:47:11 +02:00
Steinar Foss
3bce48586a Python: DeckKeyword: can accept DeckValues( parserkw, [["5*$VALUE"]])
python : deckkeyword accepts 5*.

...
2019-10-08 11:04:15 +02:00
Jostein Alvestad
d1d651a70d commented out change of Doubhead to avoid test-problems 2019-10-08 08:27:51 +02:00
Bård Skaflestad
4de3391fda Merge pull request #1076 from bska/private-smryfcn-table
Make Summary.cpp's Function Table Fully Private
2019-10-07 15:49:54 -05:00
Jostein Alvestad
90d0deeafb further changes to remove changes to data in the pull request 2019-10-07 16:34:35 +02:00
Bård Skaflestad
2fa017b29b Summary Evaluation: Make Efficiency Factor Function Private
This commit pulls the 'well_efficiency_factor' function into
Summary.cpp's private/anonymous namespace.  In addition to being a
step towards enabling new writer code for Flow's summary file, this
also fixes a "no previous declaration" warning on GCC.
2019-10-07 13:44:51 +02:00
Bård Skaflestad
e495207e9f Summary Evaluation: Make Function Table Private
This commit pulls the table of evaluation functions out of the Opm
namespace and into the existing anonymous namespace of Summary.cpp.

This is an intermediate step towards enabling new writer code for
Flow's summary files.
2019-10-07 13:32:31 +02:00
Jostein Alvestad
5d9a9880ec comment unused function getRandSeedPar 2019-10-07 12:52:12 +02:00
Jostein Alvestad
390b6c6f5c changes to ensure no change in data for pull request 2019-10-07 12:35:22 +02:00
Jostein Alvestad
b7543d4bc9 made change to allow for change of Summarystate object 2019-10-07 09:54:44 +02:00
Jostein Alvestad
967954fc4b corrections and changes according to comments from maintainer 2019-10-07 09:54:42 +02:00
Jostein Alvestad
d99791d442 corrections to allocation function plus addition to unit tests 2019-10-07 09:54:40 +02:00
Jostein Alvestad
20523b46cc additions and corrections for restart export DUDF, DUDG andn DUDW 2019-10-07 09:54:38 +02:00
Jostein Alvestad
202651c34d corrections after complex rebase to write DUDW data to ECL-compatible restart file 2019-10-07 09:54:36 +02:00
Joakim Hove
16a8f4040c Renamed UDQInput -> UDQCOnfig
UDQConfig object has merged DEFINE & ASSIGN

Log use of UDA for output purposes

Output UDQ keywords to restart file

Add size() method to UDQConfig

Add UDQVarTYpe member to UDQInput class

Add UDQIndex type to keep track of sequence number of variable types

Add unit to UDQInput class

use maps

Add operator[] to UDQConfig class

Use UDQInput class when creating restart file

UDQInput: use correct input index

Add UDQActive::get() method

Make sure UDQ DEFINE overwrite correctly

WIP

WIP - further code to output IGPH vector

WIP

Fix IUAD input index

Output use_index for IUAD

Fix bug with size of IUAD array

UAD usage hashing based on udqstring and controltype

Add UDQ test and input file

Refactor UDQActive - handles vanishing UDA

minor correction for iuad[1] and for test_UDQ_x.cpp

Further work for making unit tests for UDQ restart data

WIP Further work unit tests

WIP some minor corrections

WIP changes to add first version of BOOST test for IUDQ

WIP Added code to write InteHead and DoubHead data as well as IGPH to restart file,

Further added unit tests to the writing of UDQ data

add code to output IUAP array

Fixed group-group2 transition, disable Restart output

WIP Initial changes to add DUDW array to restart output

WIP further work on DUDW data

WIP - further work to output and test DUDW vector data to restart file

Further changes to write DUDW array to Restartfile
2019-10-07 09:54:34 +02:00
Joakim Hove
f2bc961bd4 Merge pull request #1074 from bska/prepare-new-summary-writer
Prepare New Summary Writer
2019-10-07 08:56:07 +02:00
Steinar Foss
7555c00ac3 python DeckKeyword constr. resolved nested try blocks.
...
2019-10-06 19:17:14 +02:00
Bård Skaflestad
68ff2f08a7 Test Summary: Ensure Uppercase Case Names in Result Sets
Simplifies introduction of a new writer for the summary file.
2019-10-05 14:33:55 +02:00
Bård Skaflestad
7bac89429e Summary Test: Include ert_unique_ptr.hpp
Intermediate step towards enabling a new summary writer that is
independent of libecl.
2019-10-05 14:32:13 +02:00
Bård Skaflestad
032de6c289 SummaryConfig: Capture Keyword Type for Connection Keywords
Overlooked when making the 'SummaryNode' class independent of LibECL.
2019-10-05 14:29:22 +02:00
Bård Skaflestad
aa9471dff1 Forward Declare 'out::Summary' Class in EclipseIO
Mostly to reduce build coupling.  Include Summary.hpp where needed.
2019-10-05 14:27:51 +02:00
Bård Skaflestad
5a5a87d602 EclOutput: Add Stream Flushing Operation
Calls '.flush()' on the contained 'ofstream' object.  Needed as a
means of ensuring that bits in the internal buffers of the I/O
system are promptly output to permanent storage.  This, in turn, is
needed in upcoming work on the summary writing feature.
2019-10-05 14:23:21 +02:00