Commit Graph

6334 Commits

Author SHA1 Message Date
Bård Skaflestad
38b6451c73 RFT Unit Test: Use Actual 'BOOST_FAIL' Macro
BOOST_TEST_FAIL was a figment of my imagination.
2019-08-30 09:39:15 +02:00
Joakim Hove
ec250f19f8
Merge pull request #974 from bska/rft-utest-through-erft
Reimplement RFT Unit Test in Terms of 'ERft' Class
2019-08-29 17:10:37 +02:00
Bård Skaflestad
f0adb01941 Reimplement RFT Unit Test in Terms of 'ERft' Class
This commit switches the `test_RFT` unit test to using the `ERft`
class introduced in commit 24a8efb2 (PR #699).  This is the first
step towards reimplementing the RFT file output in terms of class
EclOutput.  The downside to doing this is that we can no longer use
the node-based queries of libecl and have to implement a wrapper on
top of the raw vectors to be able to ask for the pressure in a given
connection's cell.
2019-08-29 09:24:31 +02:00
Joakim Hove
a69b0bd06f
Merge pull request #978 from joakim-hove/ACTDIMS
Add micro class to contain information from ACTDIMS keyword
2019-08-29 07:14:52 +02:00
Joakim Hove
07b2f47c7d Add micro class to contain information from ACTDIMS keyword 2019-08-28 23:22:02 +02:00
Bård Skaflestad
a7956bcf31
Merge pull request #975 from joakim-hove/icon-bug
Correct ICON and SCON when flow has deacivated connection cell
2019-08-28 12:10:28 +02:00
Joakim Hove
aa9ed7a995 Correct ICON and SCON when flow as deacivated connection cell 2019-08-27 22:00:10 +02:00
Joakim Hove
d06c0bfebb
Merge pull request #971 from joakim-hove/python-reorg
Python reorg
2019-08-24 05:30:56 +02:00
Joakim Hove
c516f868e4 Slight reorganizing of Python tree 2019-08-23 19:15:51 +02:00
Atgeirr Flø Rasmussen
a9cff8f7a1
Merge pull request #970 from akva2/rename_ewoms
changed: rename ewoms to opm-models
2019-08-23 16:21:12 +02:00
Joakim Hove
8e8abee556 Renamed opm.parser -> opm.io 2019-08-23 11:24:15 +02:00
Joakim Hove
c0d95e01db
Merge pull request #963 from tskille/EclFile
EclFile - improved ascii read efficiency
2019-08-23 11:16:03 +02:00
Joakim Hove
b00615d21f
Merge pull request #968 from joakim-hove/guiderate-model
Adds GuideRateModel
2019-08-23 10:05:40 +02:00
Joakim Hove
16daa52fbc
Merge pull request #969 from joakim-hove/w-kw
W keywords up to and including WELOPENL
2019-08-23 09:32:41 +02:00
Arne Morten Kvarving
41f18d718c changed: rename ewoms to opm-models 2019-08-23 08:29:28 +02:00
Joakim Hove
00661d6767 W keywords up to and including WELOPENL 2019-08-23 08:28:18 +02:00
Joakim Hove
44bedf0f23 Adds GuideRateModel 2019-08-23 08:21:14 +02:00
Joakim Hove
65f9fdec5c
Merge pull request #966 from stefoss23/add_keywords_D
Add keywords D
2019-08-22 16:51:25 +02:00
Steinar Foss
611dc0b565 added keywords DIFFMX, DIFFMY, DIFFMZ. 2019-08-22 15:26:12 +02:00
Steinar Foss
eb30af2b11 added keywords DIFFMMF, DIFFMR, DIFFMTHT. 2019-08-22 15:26:12 +02:00
Steinar Foss
31357cf40d added keywords DIAGDISP, DIFFC, DIFFDP. 2019-08-22 15:26:12 +02:00
Steinar Foss
3a15a16848 added keywords DELAYACT. 2019-08-22 15:26:12 +02:00
Steinar Foss
19ca93f227 added keywords DATUMR, DATUMRX, DCQDEFN. 2019-08-22 15:26:12 +02:00
Joakim Hove
ba34a9fed0
Merge pull request #961 from stefoss23/GUIDE_RATE
WIP: kw GCONPROD: reads GUIDE_RATE.
2019-08-22 13:28:19 +02:00
Steinar Foss
7f484b736d ScheduleTests: removed whitespace. 2019-08-22 12:15:42 +02:00
Steinar Foss
30b44ef233 SheduleEnums: GuideRateDef as enum class.
...
2019-08-22 12:00:50 +02:00
Joakim Hove
c7497497f6
Merge pull request #964 from joakim-hove/add-gpmaint
Add JSON keyword WSEGVALV
2019-08-22 11:08:41 +02:00
Joakim Hove
df4e94e351
Merge pull request #954 from joakim-hove/rawkeyword-partial
Rawkeyword + Parser: simplifications
2019-08-22 11:08:17 +02:00
Joakim Hove
f7b50a97f7 Add JSON keyword WSEGVALV 2019-08-22 10:47:19 +02:00
Torbjørn Skille
6f7d45750f changed from int to size_t for index. Changed loading of all data, reading data from disk array by array 2019-08-22 10:28:13 +02:00
Joakim Hove
e5013125f1 Refactor initial parsing stage
- Reduced the amount of state in the RawKeyword and ParserState classes.
 - RawKeyword class has normal constructor - remove init method.
 - The Rawxxx symbols are module private and the header files are not installed.
 - Removed several unused static methods from Rawxxx and ParserKeyword.
2019-08-22 09:32:11 +02:00
Steinar Foss
9a6065509b kw GCONPROD: GUIDE_RATE_DEF INJ, POTN, FORM handled as warning.
added enum guide_ref_enum.

...

field.

.tt
2019-08-21 12:46:50 +02:00
Joakim Hove
441b065b3d
Merge pull request #962 from joakim-hove/empty__init
Emptied the opm/__init__.py file and create opm.parser package
2019-08-20 16:19:59 +02:00
Torbjørn Skille
6d79ab4715 EclFile - improved ascii read efficiency 2019-08-20 13:37:22 +02:00
Joakim Hove
86b7d4406e
Merge pull request #933 from joakim-hove/parser-print-progress
Add log message with parsing progress
2019-08-19 16:52:58 +02:00
Joakim Hove
7e775ecd17 Emptied the opm/__init__.py file and create opm.parser package 2019-08-19 16:01:19 +02:00
Steinar Foss
6e93c5ee1f kw GCONPROD: reads GUIDE_RATE.
group2: production_properties: added guide_rate.

..

GCONPROD reads meaningless GUIDE_RATE.

guide_rate_def.

..2

...
2019-08-19 15:41:32 +02:00
Arne Morten Kvarving
d6cbf47e38
Merge pull request #940 from akva2/parallel_tests_in_check_target
Execute tests in parallel for the 'check' target
2019-08-19 13:51:23 +02:00
Atgeirr Flø Rasmussen
079cb5fd0b
Merge pull request #960 from joakim-hove/rm-printf
Remove printf debug
2019-08-19 12:34:50 +02:00
Joakim Hove
6f7a6d47f2 Remove printf debug 2019-08-19 11:59:22 +02:00
Joakim Hove
a6eef07c76
Merge pull request #951 from stefoss23/sunbeam_to_opm
Sunbeam to opm
2019-08-19 09:57:42 +02:00
Joakim Hove
a961f38c63
Merge pull request #959 from joakim-hove/move-tests
Move tests
2019-08-18 15:30:04 +02:00
Joakim Hove
bc2e5f7d00 Moved test in filesystem 2019-08-18 13:21:04 +02:00
Joakim Hove
3846c8c7ab Moved ResinsightTest 2019-08-18 13:21:04 +02:00
Joakim Hove
e186761f4a
Merge pull request #958 from joakim-hove/inline-resinsight-data
Inlined deck data for test
2019-08-17 12:57:34 +02:00
Joakim Hove
8efaa4dc66 Inlined deck data for test 2019-08-17 12:00:44 +02:00
Joakim Hove
bb6fb37ea1 Add log message with parsing progress 2019-08-16 19:50:23 +02:00
Joakim Hove
97a73ea5a5
Merge pull request #953 from joakim-hove/w-keywords
Add some W keywords
2019-08-16 17:44:10 +02:00
Joakim Hove
eee75da9ef
Merge pull request #957 from stefoss23/add_keywords_c
Add keywords c
2019-08-16 16:30:42 +02:00
Steinar Foss
cb165fb418 removed keywords file CECONT. 2019-08-16 14:41:07 +02:00