Commit Graph

141 Commits

Author SHA1 Message Date
Liu Ming
17918ac5b3 use proper function to log filename, line number, msg. 2016-04-19 15:06:03 +08:00
Liu Ming
940d7f8449 Merge remote-tracking branch 'remotes/opm/master' into MessageContainer-sub-class
Conflicts:
	opm/parser/eclipse/EclipseState/EclipseState.cpp
2016-04-15 09:14:00 +08:00
Andreas Lauser
92a55cb267 avoid reserved names for guard macros
just like for macros that start and end with `__`, `clang++
-Weverything` likes to complain about macros which start and end with
a single underscore. This is basically the same issue as
Ensembles/ert#1048
2016-04-14 17:19:37 +02:00
Liu Ming
63e54c0157 use message container instead of OpmLog. 2016-04-14 11:03:53 +08:00
Liu Ming
f28dd65142 add MessageContainer object. 2016-04-14 09:39:28 +08:00
Atgeirr Flø Rasmussen
c74a441a3b Remove const with no effect on value return. 2016-04-13 12:56:05 +02:00
Pål Grønås Drange
3680dfcb97 Substantial edits to Eclipse3DProperties and ptr's
* moved region-property from EclipseState to Eclipse3DProperties
* moved initGridopts from EclipseState to Eclipse3DProperties
* made several Eclipse3DProperties methods private
* removed obsolete tests
* replaced log with throw internally in private method---is domain_error
* removed typedef in SatFuncPropertyInitializers
* 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
** EclipseGrid and Section are references
2016-04-12 14:42:34 +02:00
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
Liu Ming
a4a449538d rename ParseMode as ParseContext in EclipseState folder. 2016-03-16 17:15:09 +08:00
Joakim Hove
53471d2329 PLYVISC: INCREASING instead of STRIVLY_INCREASING. 2016-03-15 14:11:42 +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
0781ec968d Change static private methods to static functions
Since these really aren't a part of the class, they're moved to the more
approperiate static function to not pollute the header.
2016-02-18 13:26:55 +01:00
Jørgen Kvalsvik
4b98943665 Replaces unecessary header includes with fwd decls
Every header is self-contained and includes only what it must to
function, relying on users include what they need in source files,
adopting a pay-what-you-use model (in particular for internal
dependencies).
2016-01-26 13:23:22 +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
d59b34bcb5 Added copy constructor for TableIndex. 2016-01-17 16:37:31 +01:00
Joakim Hove
356958309c Added hasColumn() method. 2016-01-08 14:04:30 +01:00
Joakim Hove
6cff4d5aae Changed PVTO / PVTG implementation 2016-01-08 14:04:29 +01:00
Joakim Hove
a2b64a83eb SimpleTable improvements:
- Added constructor without DeckItem
 - Added addRow( ) method
 - Added random access get( ) methd.
2016-01-08 14:04:28 +01:00
Joakim Hove
874a5320e7 Changed implementation of all SimpleTable tables. 2016-01-05 12:33:19 +01:00
Joakim Hove
772473ae1c Refactored SimpleTable class 2015-12-21 15:38:49 +01:00
Joakim Hove
40ac6ec7e8 Added class TableColumn. 2015-12-21 15:38:45 +01:00
Joakim Hove
5e469c0676 Added class TableSchema with table metadata. 2015-12-21 15:31:29 +01:00
Joakim Hove
e94d01e88c Added class ColumnSchema with table metadata. 2015-12-21 15:30:54 +01:00
Joakim Hove
102a994190 Added TableIndex to bookkeep linear interpolation. 2015-12-21 14:52:23 +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
d3f3c74358 Adress minor issues
- rename checkRange() to assertUnitRange()
- use string instead of char
2015-12-01 14:12:39 +01:00
Tor Harald Sandve
dc7cf4ada6 Add missing tables 2015-12-01 13:53:05 +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
ce595d7592 Add method to check that table input spans [0,1] 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
664b6a80e5 SGWFN table. 2015-10-12 14:26:51 +08: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
51e3aa82cc Update include path 2015-10-06 11:30:43 +02:00
Joakim Hove
6dee686dc0 Implemented accessor functions for REGDIMS. 2015-10-06 08:44:00 +02:00
Joakim Hove
7070517d1c Removed debug output. 2015-10-05 07:46:49 +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