Commit Graph

59 Commits

Author SHA1 Message Date
Pål Grønås Drange
e48b64c41d Substantial edits to Eclipse3DProperties
* Removed all references to state, need to fix initPORV
* Made TransMult return raw pointer const GridProperty over shared pointer.
* Moved getDirectionProperty and hasDirectionProperty out of API
** Removed tests as these methods are no longer public
* Moved grid properties stuff to new class
* Removed use of deck in SatfuncInitializers, moved to TableManager
* Removed shared_ptr for several members of EclipseState and 3DProperties
* Moved region-property from EclipseState to Eclipse3DProperties
* Moved initGridopts from EclipseState to Eclipse3DProperties
* Made several Eclipse3DProperties methods private
* Postprocessors take raw pointers, not shared_ptr---these will be phased out
* Fixed return reference instead of copy several places
** GridProperties<T> in Eclipse3DProperties are now references, not shared_ptr
** Eclipse3DProperties takes const Deck&, not shared_ptr
* Removed obsolete tests
2016-04-12 14:42:18 +02:00
Jørgen Kvalsvik
135f405e93 InitUnitSystem private; constness managed by .get
The const_cast in Deck::get*UnitSystem are potentially undefined
behaviour under a series of (plausible) conditions, and are deprecated
in favour of mutable members. Removes initUnitSystem from the public
interface, as the initialisation is handled on the first getUnitSystem
anyway, cleaning up the Deck interface slightly.

Adds proper constness to the use of unit systems that don't actually
modify the internal state in any way.
2016-04-06 15:09:32 +02:00
chflo
f2ed1ba7ea Moved OpmLog from opm-parser to opm-common 2016-03-21 22:07:49 +01:00
Tor Harald Sandve
3991bf6e51 Add new keyword TLPMIXPA
The TLPMIXPA keyword can be used for giving pressure depended Todd-
Longstaff parameters. The implementation follows the description of
PMISC.
2016-03-08 15:14:21 +01:00
Jørgen Kvalsvik
f0ae5db131 opm-parser adoption of Deck automatic ownership
Since the Deck* family of classes have changed their interfaces to no
longer use shared_ptr, a lot of code broke. This patch fixes all
problems in tests, other signatures and accesses to now use the new Deck
interfaces.
2016-02-18 13:27:24 +01:00
Jørgen Kvalsvik
04900a4bb6 ParserKeywords.hpp -> ParserKeywordsX.hpp
To reduce compiler stress and be more explicit w.r.t. dependencies, all
files now includes only the keywords they need, instead of the
collection of all files.
2016-01-21 09:25:58 +01:00
Jørgen Kvalsvik
c85a032240 Splits tables' implementations into .cpp file
Most tables are trivial extensions of SimpleTable, but had their
implementation in headers. This required them to include more headers
than we want to expose and makes them harder to maintain and verify.
Instead, all these SimpleTable derivatives are now implemented in
Tables.cpp, only declaring their interfaces in their respective .hpp
files. Clients won't notice the difference.

rebase into tables
2016-01-21 09:23:07 +01:00
Jørgen Kvalsvik
f404828d63 Cleans up headers to improve build preformance
This is an effort to improve build performance.  Several includes
scattered across the project are either unused or partially used (i.e.
just used to import a type name, not depending on the actual contents of
the header file).

Replaces a lot of these includes with forward declarations.
2016-01-21 09:22:06 +01:00
Joakim Hove
6cff4d5aae Changed PVTO / PVTG implementation 2016-01-08 14:04:29 +01:00
Tor Harald Sandve
3ba7382146 Add missing methods in TableManager.cpp
Add missing methods for MSFN, PMISC, MISC, SGCWMIS and SORWMIS
2015-12-03 15:18:56 +01:00
Tor Harald Sandve
ddcba13dfe Add support for MSFN 2015-12-01 12:19:43 +01:00
Tor Harald Sandve
9badf045a9 Add support for PMISC 2015-12-01 12:19:43 +01:00
Tor Harald Sandve
e97c6461e1 Add support for MISC 2015-12-01 12:19:43 +01:00
Tor Harald Sandve
5c35b8edeb Add support for SGCWMIS 2015-12-01 12:19:43 +01:00
Tor Harald Sandve
d151bfc83a Add support for SORWMIS 2015-12-01 12:19:42 +01:00
Liu Ming
68a9366d8d Add keyword SGWFN. 2015-10-12 10:56:21 +08:00
Atgeirr Flø Rasmussen
6cf9d01cc3 Avoid shadowing the 'record' variable. 2015-10-07 09:43:51 +02:00
Joakim Hove
b3972de557 Immplemented PLYSHLOG table with TableContainer.
The PLYSHLOG table specification is based on alternating header and data
records, this is not supported by th parser - and the thing will throw
if more than table is specified.
2015-10-04 20:03:54 +02:00
Joakim Hove
ea86b51b8d TableContainer for PLYMAX and PLYROCK. 2015-10-04 20:03:53 +02:00
Joakim Hove
40fa456603 TableContainer for PLYADS,PLYDHFL and PLYVISC. 2015-10-04 20:03:51 +02:00
Joakim Hove
821bc9bc9e Implemented ROCKTAB with TableContainer. 2015-10-04 20:03:48 +02:00
Joakim Hove
4857f2299f Using TableContainer for RTEMPVD. 2015-10-03 17:32:12 +02:00
Joakim Hove
d1451bc4e3 Using TableContainer for gas viscosity. 2015-10-03 17:32:12 +02:00
Joakim Hove
1542957e49 Using TableContainer for oil and water viscosity. 2015-10-03 17:32:11 +02:00
Joakim Hove
eb69d85ee4 TableContainer: PVDO, PVDS and PVDG. 2015-10-03 17:32:11 +02:00
Joakim Hove
d9c5811e90 TableContainer: ENKRVD, ENPTVD, IMKRVD and IMPTVD. 2015-10-03 17:32:10 +02:00
Joakim Hove
295385cab7 TableContainer for RSVD and RVVD tables. 2015-10-03 17:32:10 +02:00
Joakim Hove
9c9e9f48fd TableContainer for SGFN, SWFN and SSFN tables. 2015-10-03 17:32:09 +02:00
Joakim Hove
836ea66a49 TableContainer for SWOF,SGOF,SLGOF,SOF2 ans SOF3. 2015-10-03 17:32:08 +02:00
Joakim Hove
f77e1af9f0 Added TableContainers for the simplest tables. 2015-10-03 17:32:08 +02:00
Joakim Hove
d1bb9bd2f0 Added Eqldims and Regdims wrapper classes 2015-10-03 17:32:07 +02:00
Joakim Hove
d377345f95 Added map of tablecontainers to TableManager. 2015-10-03 17:32:07 +02:00
Joakim Hove
2e1533c945 Added new default based Tabdims constructor. 2015-10-03 17:32:06 +02:00
Joakim Hove
dfb2ff6744 All simple table inits called from common method. 2015-10-03 17:32:06 +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
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
5e6044061b Using DeckRecord in table init() methods. 2015-09-07 15:54:11 +02:00
Joakim Hove
d0c9006580 Added getVFPTables 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
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
Joakim Hove
91d5facc4b Moved simple polymer tables EclipseState -> Tables 2015-09-01 17:53:56 +02:00
Joakim Hove
9cb2440068 Moved OILVISCT and WATVISCT EclipseState -> Tables 2015-09-01 17:53:55 +02:00