Commit Graph

6400 Commits

Author SHA1 Message Date
Steinar Foss
440049ab6c added keywords DIFFX, DIFFY, DIFFZ. 2019-09-03 23:06:12 +02:00
Steinar Foss
6cdae955d2 added keywords DIFFR, DIFFTHT, DIFFUSE. 2019-09-03 23:06:12 +02:00
Joakim Hove
af2a09bde5 Make sure actionx keywords can be redefined 2019-09-03 13:47:30 +02:00
Joakim Hove
2aa10a0435 Internalize ActionX conditions to enable restart 2019-09-03 13:47:30 +02:00
Joakim Hove
208c1a7143 Convert Schedule::Actions to a DynamicState<Actions> 2019-09-03 13:47:30 +02:00
Joakim Hove
12a8656647 Changed Actions::at() to const 2019-09-03 13:46:02 +02:00
Joakim Hove
de5246c701 Add DeckKeyword::location() 2019-09-03 13:46:02 +02:00
Arne Morten Kvarving
c0c6f35099 fixed: use of iterator after erase 2019-09-03 12:33:11 +02:00
Arne Morten Kvarving
8d858903f1 changed: reduce scope of variable 2019-09-03 12:28:29 +02:00
Joakim Hove
fa964b5820
Merge pull request #983 from joakim-hove/welldims-exception
Default error handler for WELLDIMS errors is exception
2019-09-02 10:15:58 +02:00
Joakim Hove
dad13d2633 Default error handler for WELLDIMS errors is exception 2019-08-31 15:23:02 +02:00
Joakim Hove
6b2aadaef7
Merge pull request #981 from totto82/nupcol
support nupcol
2019-08-31 07:27:51 +02:00
Joakim Hove
ec36c227d7
Merge pull request #982 from akva2/fix_negative_index_deref
fixed: dereferencing string at index -1 is not adviced.
2019-08-30 19:09:13 +02:00
Arne Morten Kvarving
d097660fcc fixed: dereferencing string at index -1 is not adviced.
if there is no dot, p is -1 which leads to an exception thrown
2019-08-30 14:59:58 +02:00
Tor Harald Sandve
09b445f69d support nupcol 2019-08-30 13:07:13 +02:00
Arne Morten Kvarving
8ef902bee5
Merge pull request #980 from bska/fix-nightly
RFT Unit Test: Use Actual 'BOOST_FAIL' Macro
2019-08-30 11:36:38 +02:00
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