Commit Graph

6458 Commits

Author SHA1 Message Date
Joakim Hove
ff69737b99 Add start_time argument to SummaryState 2019-09-19 22:09:15 +02:00
Joakim Hove
ae75aa3255 Merge pull request #1027 from stefoss23/add_keywords_F1
added keywords beginning w/ F and G.
2019-09-19 11:50:48 +02:00
Joakim Hove
4f276b896c Merge pull request #976 from bska/rft-through-eclio
Add New RFT File Writer
2019-09-18 21:59:17 +02:00
Bård Skaflestad
6c47cdb22f Add New RFT File Writer
This commit implements a new file writing function

    void Opm::RftIO::write()

that is intended to replace the current RFT output functionality
defined in terms of private class 'RFT' in EclipseIO.cpp.  We
support the basic RFT output consisting of

    - Timestamp (elapsed and date)
    - WELLETC metadata including all unit conventions
    - Connection cell (I,J,K), connection cell hostgrid (blank for
      main grid only), connection cell centre depth, connection cell
      pressure, and connection cell water and gas saturations

Connections in inactive cells are omitted.  Note that unit of
measure strings aren't implemented in terms of UnitSystem::name()
due to the strings being padded on the left for centering effect.

Add unit tests to exercise the new writer.
2019-09-18 16:48:53 +02:00
Bård Skaflestad
a281a3c6f4 Add RFT Output Stream
This commit introduces a new output stream, 'RFT', that is intended
as a new backend for writing RFT files.  At present this supports
integer, float, and PaddedOutputString<8> element types since those
are the types needed for basic RFT data.  We will extend the element
support if needed for PLT and/or Segment data.

We support formatted and unformatted output streams and distinguish
between opening a new stream and opening an existing output stream
(essentially between open modes ios_base::out and ios_base::app).

Add unit tests to exercise the possible combinations.
2019-09-18 16:48:53 +02:00
Joakim Hove
4388c9d72f Merge pull request #1015 from joakim-hove/actionx-restart
Actionx restart
2019-09-18 16:45:24 +02:00
Steinar Foss
897edca773 added keywords beginning w/ F and G.
added keywords FOAMFSO, FOAMFST, FOAMFSW.

added keywords FOAMMOBP.

added keywords FOAMOBS, FORMFEED.

added keywords GASBEGIN, GASCONC.

added keywords GASEND, GASFCOMP.

added keywords GASFDECR, GASFDELC.

added keywords GASFIELD, GASFTARG.

added keywords GASMONTH, GASPERIO.

added keywords GASSATC, GASYEAR.

added keyword GCALECON.

added keywords GCONCAL, GCONENG.

added keyword GCONCAL.

keywords GASFCOMP, GCALECON: L*L*L -> GasSurfaceVolume.

FOAMFST: Density -> FoamDensity.
2019-09-18 15:49:58 +02:00
Joakim Hove
7d32890d99 Merge pull request #1025 from atgeirr/add-clang-format-spec
Add .clang-format specification.
2019-09-18 15:34:39 +02:00
Joakim Hove
4bed60df0f Merge pull request #1024 from akva2/janitoring
Some janitoring
2019-09-18 15:28:30 +02:00
Atgeirr Flø Rasmussen
93e4c2ffec Add .clang-format specification. 2019-09-18 14:15:21 +02:00
Arne Morten Kvarving
6bbf1fcde2 remove unused UDQParams member in UDQContext 2019-09-18 13:21:00 +02:00
Arne Morten Kvarving
93439cf41e quell shadowing warnings 2019-09-18 13:21:00 +02:00
Arne Morten Kvarving
8c874bf741 fixed: move file into correct directory 2019-09-18 13:21:00 +02:00
Arne Morten Kvarving
0e108311e3 changed: disable unused function
kept around as it is handy for debugging
2019-09-18 13:20:43 +02:00
Arne Morten Kvarving
d2aaff46e0 Merge pull request #1018 from tskille/convertECL
convertECL update, fixed bug with file extensions
2019-09-18 10:33:26 +02:00
Joakim Hove
8a88d64bd1 Merge pull request #1023 from joakim-hove/guiderate-warnings
Fix GuideRate warnings
2019-09-17 19:37:51 +02:00
Joakim Hove
d1fd6359af Merge pull request #1022 from joakim-hove/check-CC-env-variable
Check CC environment variable
2019-09-17 16:56:47 +02:00
Joakim Hove
2b75ff1c19 Fix GuideRate warnings 2019-09-17 16:52:34 +02:00
Joakim Hove
b7459231d2 Check CC environment variable 2019-09-17 14:18:36 +02:00
Joakim Hove
143d0d097a Merge pull request #1012 from joakim-hove/parser-value-semantics
Use ParserKeyword values in Parser instead std::unique_ptr<>
2019-09-17 13:53:46 +02:00
Tor Harald Sandve
efe7a97b1d Merge pull request #994 from joakim-hove/guide-rate
GuideRateConfig object
2019-09-17 13:12:24 +02:00
Joakim Hove
18ead60ccc Merge pull request #1020 from joakim-hove/W
W keywords up to WSEGAICD
2019-09-16 22:49:32 +02:00
Joakim Hove
f9a2c02c5e W keywords up to WSEGAICD 2019-09-16 21:45:29 +02:00
Joakim Hove
f375213d4b Merge pull request #1017 from tskille/EclFile
Ecl file
2019-09-16 18:37:33 +02:00
Joakim Hove
a1f35584a9 Add GuideRate state/cache object 2019-09-16 16:28:45 +02:00
Joakim Hove
dd609e857a Add keywords LINCOM and LCUNIT 2019-09-16 16:28:45 +02:00
Torbjørn Skille
8664ce4af7 convertECL update, fixed bug with file extensions when converting from formatted to binary 2019-09-16 15:02:21 +02:00
Torbjørn Skille
0c526b39f5 EclFile update, fix on reading CHAR type from formatted eclfile 2019-09-16 14:02:42 +02:00
Joakim Hove
de7752b3e5 GuideRateConfig object 2019-09-16 10:52:35 +02:00
Atgeirr Flø Rasmussen
48aba21941 Merge pull request #1016 from joakim-hove/deck-constructor
Deck constructor
2019-09-16 08:59:20 +02:00
Joakim Hove
3070bf4a31 Change DeckKeyword constructor
The DeckKeyword::DeckKeyword(const std::string&) constructor has been removed
and the DeckKeyword now requires a ParserKeyword pointer in the constructor.
2019-09-16 00:47:34 +02:00
Joakim Hove
c8919ba088 Fix typo in NLINEARS keyword 2019-09-16 00:29:31 +02:00
Joakim Hove
4078451840 Action::Condition has lhs and rhs member properties 2019-09-14 08:26:51 +02:00
Joakim Hove
1a23df1e2f Merge pull request #1013 from stefoss23/properties_py_decap
Replace python class EclipseState
2019-09-14 08:23:55 +02:00
Joakim Hove
8efe3cf6a6 Remove unused member Condition::expression 2019-09-13 19:24:53 +02:00
Joakim Hove
546cd46926 Add cmp_string() method to Action::Condition class 2019-09-13 19:22:02 +02:00
Joakim Hove
74291cc57f Merge pull request #1014 from joakim-hove/w
W keywords including WPOTCALC
2019-09-13 19:05:11 +02:00
Joakim Hove
fd0cb01957 Add W keywords - up to WPOTCALC 2019-09-13 18:40:48 +02:00
Joakim Hove
f3bd813f46 Use ParserKeyword values in Parser instead std::unique_ptr<> 2019-09-13 16:21:31 +02:00
Steinar Foss
b957ca6a69 opm.io.ecl_state: unexposes constructor free classes. 2019-09-13 16:17:35 +02:00
Steinar Foss
b68fe2e63a test_state2: added test_config. 2019-09-13 16:17:35 +02:00
Steinar Foss
c826e24607 test_props: uncommented tests. 2019-09-13 16:17:35 +02:00
Steinar Foss
41a05a7a98 test_state.py: uncommented test_summary. 2019-09-13 16:17:35 +02:00
Steinar Foss
4504b8812f test_state2. added function test_jfunc. 2019-09-13 16:17:35 +02:00
Steinar Foss
365fbd355b test_state2: added test_faults. 2019-09-13 16:17:35 +02:00
Steinar Foss
78ab86e2a3 test_state2.py: added test_tables. 2019-09-13 16:17:35 +02:00
Steinar Foss
0ae8c4b235 python grid: properties as small cap. 2019-09-13 16:17:35 +02:00
Steinar Foss
3ecb446c20 test_state2: added test_simulation. 2019-09-13 16:17:35 +02:00
Steinar Foss
97728e9fda test_state2.py: added test_grid. 2019-09-13 16:17:35 +02:00
Steinar Foss
af096fddf9 test_state2: added test_state_nnc. 2019-09-13 16:17:35 +02:00