Commit Graph

1894 Commits

Author SHA1 Message Date
Fredrik Gundersen
73621d3f21 OPM-230 Added support for keywords 2015-10-02 10:49:23 +02:00
Fredrik Gundersen
65e2e22321 OPM-230 Created new enum 2015-10-02 10:48:45 +02:00
Fredrik Gundersen
8cc250d9fe OPM-230 Expanded the propertie class 2015-10-02 10:48:15 +02:00
Fredrik Gundersen
0f728302c7 OPM-230 Adde new properties file 2015-09-28 14:32:41 +02:00
Fredrik Gundersen
afcd37f9c8 OPM-230 Added new properties file for Oil Vap. 2015-09-28 14:31:36 +02:00
Joakim Hove
6623b87ee6 Added Polymer integration test. 2015-09-17 22:28:30 +02:00
Joakim Hove
5cc263fe2a Fixed bug in PLYMAX table. 2015-09-17 22:28:12 +02:00
Joakim Hove
a44733405d Fixed special initialisation of PLYROCK tables. 2015-09-17 18:47:21 +02:00
Kjell W. Kongsvik
d15b472704 Support for CPR keyword in SimulationConfig 2015-09-15 16:43:01 +02:00
Kjell W. Kongsvik
dc0cc45e89 Allowed parser keywords without items 2015-09-15 16:43:01 +02:00
Joakim Hove
3dd8aad70b Changed MultiRecordTable implementation:
- Will not use any getFlatXxx() methods.

  - Will fetch item0 and items1 for reference Rs value and table data
    respectively.
2015-09-14 16:35:10 +02:00
Joakim Hove
8e649ec7e6 Changed PLYSHLOG implementation:
- Using the ParserKeywords::PLHSYLOG::ITEM templated access for items.
2015-09-14 16:35:09 +02:00
Joakim Hove
edad0b3795 Removed unneccessary typedef. 2015-09-14 16:35:06 +02:00
Joakim Hove
2681d1cc8f Refactor SimpleTable:
The SimpleTable class is initialized with a DeckItem instance containing
all the date for the table, instead of a DeckRecord (or DeckKeyword). As
a consequence the getFlatXxxx() methods have been removed.
2015-09-14 16:35:05 +02:00
Joakim Hove
3aff5378e7 Removed stale tests - moved to TableManagerTests. 2015-09-14 16:35:03 +02:00
Joakim Hove
bca167a53a Added THCONR as grid property 2015-09-11 14:03:30 +02:00
Joakim Hove
c75f7b4fcf Added hasItem() method to DeckRecord 2015-09-11 14:03:29 +02:00
Joakim Hove
fb0daa39f4 Changed std::cout message for keywordloader. 2015-09-11 14:03:28 +02:00
Joakim Hove
714990ae97 DeckXXX returns const std::string&.
fixup! DeckStringItem returns const std::string&.
2015-09-11 14:03:28 +02:00
Joakim Hove
99aa34588c Added some new keywords. 2015-09-11 14:03:27 +02:00
Joakim Hove
260ceeb757 Added BEFORE attribute to include_directories( ) 2015-09-10 17:38:15 +02:00
Fredrik Gundersen
2ca3b0c3ab Merge pull request #575 from joakim-hove/table-refactor
Minor table refactor
2015-09-09 13:48:08 +02:00
Atgeirr Flø Rasmussen
1a772d8edd Merge pull request #578 from akva2/rename_common
changed: sync with renaming to opm-common
2015-09-09 11:37:31 +02:00
Arne Morten Kvarving
f1feae7a9d changed: sync with renaming to opm-common 2015-09-08 10:34:45 +02:00
Joakim Hove
ebd1354805 Renamed SingleRecordTable -> SimpleTable 2015-09-07 15:54:14 +02:00
Joakim Hove
5e6044061b Using DeckRecord in table init() methods. 2015-09-07 15:54:11 +02:00
Joakim Hove
5fa02b7f17 Removed typedef SingleRecordTable ParentType; 2015-09-07 15:54:08 +02:00
Joakim Hove
e258097c19 Merge pull request #576 from iLoop2/OPM-223
Support for WCONINJH
2015-09-07 12:26:31 +02:00
Fredrik Gundersen
956b7c53fb OPM-223 Changed error text 2015-09-07 12:19:55 +02:00
Andreas Lauser
21ca5336e4 add the STONE1EX keyword 2015-09-04 17:55:06 +02:00
Fredrik Gundersen
69abd7b0ce OPM-223 Fix wrong factor used on Gas 2015-09-04 13:46:23 +02:00
Fredrik Gundersen
e8f9114944 OPM-223 Added missing behavior to WELTARG 2015-09-04 13:42:10 +02:00
Joakim Hove
7f853e9709 Merge pull request #572 from atgeirr/fix-minor-bug-and-warnings
Fix minor bug and warnings
2015-09-02 15:13:25 +02:00
babrodtk
c113c80e42 Changed throw => catch to an if test instead 2015-09-02 13:49:32 +02:00
Atgeirr Flø Rasmussen
76e6972042 Silence various warnings. 2015-09-02 13:08:11 +02:00
Atgeirr Flø Rasmussen
5981df7f82 Bugfix: adding integer to string literal is not concatenation. 2015-09-02 13:07:26 +02:00
Christine Fløysand
273b1ecdda Merge pull request #571 from chflo/OPM-222
OPM-222: Fixed error in completionorder enum conversion method
2015-09-02 12:27:23 +02:00
chflo
adcfba1810 OPM-222: Fixed error in completionorder enum conversion method 2015-09-02 12:24:33 +02:00
Joakim Hove
d0c9006580 Added getVFPTables 2015-09-01 17:54:07 +02:00
Joakim Hove
86b63013f3 Removed initSimpletables from EclipseState 2015-09-01 17:54:07 +02:00
Joakim Hove
cf5b4e36f8 Renamed file Tables -> TableManager 2015-09-01 17:54:06 +02:00
Joakim Hove
8bf744e590 Renamed class Tables -> TableManager 2015-09-01 17:54:05 +02:00
Joakim Hove
7c8152bb27 This works: renamed back -> Tables 2015-09-01 17:54:03 +02:00
Joakim Hove
07e5fa04ce Moved PVTO and PVTG tables EclipseState -> Tables 2015-09-01 17:54:02 +02:00
Joakim Hove
0250a9408c Moved VFP Tables EclipseState -> Tables 2015-09-01 17:54:01 +02:00
Joakim Hove
9e79fa2e41 Moved xxxVD tables EclipseState -> Tables 2015-09-01 17:54:01 +02:00
Joakim Hove
688447bc0d Moved PLYSHLOG EclipseState -> Tables 2015-09-01 17:54:00 +02:00
Joakim Hove
9c8c38bd9e Moved RTEMPVD table EclipseState -> Tables 2015-09-01 17:53:59 +02:00
Joakim Hove
39ad0dcfe5 MOved GASVISC tables EclipseState -> Tables 2015-09-01 17:53:58 +02:00
Joakim Hove
a032ea925d Moved RockTables EclipseState -> Tables 2015-09-01 17:53:57 +02:00