Joakim Hove
c410f99625
Merge pull request #1039 from atgeirr/replace-backslash-include
...
Replace backslash in INCLUDE paths
2017-02-13 13:35:00 +01:00
Atgeirr Flø Rasmussen
8936d9ab38
Fix tests: actually check for keyword in deck.
2017-02-13 11:16:32 +01:00
Atgeirr Flø Rasmussen
8527e646a1
Improve tests by checking for present keyword.
2017-02-10 13:02:21 +01:00
Atgeirr Flø Rasmussen
b82d9eb9b3
Add tests and test files with backslashes in INCLUDE paths.
2017-02-09 21:17:14 +01:00
Atgeirr Flø Rasmussen
b52381ca14
In INCLUDE paths, replace backslashes with slashes.
2017-02-09 21:08:16 +01:00
Joakim Hove
9e0495dfee
Added FWIP as WIP dependency.
2017-02-07 14:35:37 +01:00
Joakim Hove
5ea448ac93
Check required restart fields for summary.
2017-02-07 11:16:28 +01:00
Pål Grønås Drange
4543de807b
Merge pull request #1031 from pgdr/opernum_regions
...
added REGIONS to opernum kw
2017-01-13 12:53:42 +01:00
Pål Grønås Drange
149f39baf5
OPERNUM defaults to reg0 and note on redefinability
2017-01-13 11:55:00 +01:00
Joakim Hove
bc37418d47
Merge pull request #1029 from joakim-hove/runspec-ecl-phase-masl
...
Added method Runspec::eclPhaseMask( )
2017-01-13 09:52:14 +01:00
Joakim Hove
f1308fa352
Instantiate unit system from Eclipse type id.
2017-01-12 13:36:42 +01:00
Joakim Hove
6e64935d5c
Implement restartfilename with ERT::EclFilename
2017-01-12 13:36:39 +01:00
Joakim Hove
ef6def6511
Added getEclType() to UnitSystem
2017-01-12 13:36:38 +01:00
Pål Grønås Drange
41dd173be6
added REGIONS to opernum kw
2017-01-12 12:25:39 +01:00
Pål Grønås Drange
97294c988c
Made getRegion() in e3d private
2017-01-11 16:18:04 +01:00
Joakim Hove
4f076c4813
Added method Runspec::eclPhaseMask( )
2017-01-11 13:48:12 +01:00
Pål Grønås Drange
b8b5bd374b
Added FIP_PROBE and tests, we now accept FIPxxxx kws
2017-01-11 12:36:22 +01:00
Joakim Hove
d4c7d6f92e
Merge pull request #1021 from joakim-hove/endscale-rename
...
Endscale rename
2017-01-10 12:21:00 +01:00
Pål Grønås Drange
c4d13a4650
add WOVPR to WELL_PROBE JSON
2017-01-09 17:06:18 +01:00
Pål Grønås Drange
1c6d82ebd6
added JSON for OPERNUM
2017-01-09 16:47:05 +01:00
Pål Grønås Drange
58840f763a
added JSON for FIPOWG
2017-01-09 16:19:40 +01:00
Pål Grønås Drange
14cf9ff16f
dont choke on WPAVEDEP
2017-01-09 15:34:39 +01:00
Pål Grønås Drange
164d5f449a
Do not choke when encounter AITS or ROCKNUM
...
* internalized ROCKNUM, added tests
2017-01-09 15:16:50 +01:00
Pål Grønås Drange
67e2199a68
implement == for Well
2017-01-09 15:16:43 +01:00
Joakim Hove
694ace932e
Renamed endpoint_scaling() -> endpointScaling()
2017-01-03 19:29:56 +01:00
Joakim Hove
1e191fe928
Moved EndpointScaling.hpp to separate file.
2017-01-03 19:25:30 +01:00
Jørgen Kvalsvik
36d2e1349d
Understand ENDSCALE and SCALECRS
...
Exposes the semantics defined by ENDSCALE (and SCALECRS) in
Runspec.endpoint_scaling.
2017-01-03 16:49:51 +01:00
Jørgen Kvalsvik
083b834cd1
Return uppercase() by value, don't force move
2017-01-03 15:42:30 +01:00
jokva
328c320641
Merge pull request #1015 from jokva/solvent-support-in-phases
...
Solvent support in Runspec.phases
2017-01-03 12:23:52 +01:00
jokva
35df865753
Merge pull request #1016 from jokva/pvcdo-viscref-watdent
...
Understand PVCDO, VISCREF, WATDENT
2017-01-03 11:51:38 +01:00
Jørgen Kvalsvik
45cfedb183
Understand PVDCO, VISCREF, WATDENT
2017-01-03 11:39:08 +01:00
Jørgen Kvalsvik
eec0ebf708
Changelog December 2016
2017-01-03 10:48:10 +01:00
Jørgen Kvalsvik
20abeb5754
Tests for production_rate+injection_rate
2017-01-03 10:18:36 +01:00
Pål Grønås Drange
e5de0ca8d1
Revert throw, write warning to stderr
...
* no throw on JFUNC abuse, std::cerr
* removed 'get' from function names
2016-12-28 19:20:31 +01:00
Pål Grønås Drange
172725aef8
Added JFUNC in TableManager and getJFuncColumn()
...
* Fully internalized JFUNC
* Added JFunc.cpp, throw on wrong FLAG/DIR in JFUNC kw
* added tests for JFUNC in TableManagerTests
* added protected member m_jfunc to SimpleTable
* Added getJFuncColumn to accompany getPcowColumn
* Throws if pressure or jfunc is accessed inappropriately
* ... meaning if getPcowColumn is called when JFUNC is in deck, or
* getJFuncColumn is called when JFUNC is not in deck
* added tests for throwing and for getJFuncColumn
* SimpleTable.getColumn("PCOW/PCOG") throws if JFUNC
* In the event that one tries to get "PCOW" or "PCOG" via getColumn
* ... this will throw if JFUNC is present in the deck.
* Added tests.
2016-12-28 19:20:31 +01:00
Jørgen Kvalsvik
295a808310
Const'd OilVaporizationProperties
2016-12-22 15:18:04 +01:00
Jørgen Kvalsvik
31b4c4a0fb
Solvent support in Runspec.phases
2016-12-20 14:13:07 +01:00
jokva
848d701b0d
Merge pull request #1013 from jokva/understand-density-keyword
...
Provide DENSITY & ROCK table through EclipseState
2016-12-20 14:06:47 +01:00
Jørgen Kvalsvik
9a336f62fb
Understand the ROCK keyword
2016-12-20 12:52:43 +01:00
Jørgen Kvalsvik
5413b841ef
Generalise 'flat table'; implement DENSITY, PVTW
...
Several tables are identical both in structure *and* parsing, i.e. the
code required to parse them only differ in output type and possibly
number of items to read.
FlatTable is a simple vector-based template that expands into this exact
parsing routine, based on a simple specification of the record.
2016-12-20 12:52:43 +01:00
Jørgen Kvalsvik
e12ec3c003
Support RS+RV
2016-12-20 10:53:55 +01:00
Jørgen Kvalsvik
3c8b092dc5
Parse TUNINGDP
2016-12-14 10:44:48 +01:00
Jørgen Kvalsvik
dd673d6025
Parse WORKLIM
2016-12-14 10:44:48 +01:00
Jørgen Kvalsvik
8a76c7acf0
Parse WEFAC
2016-12-14 10:44:48 +01:00
Jørgen Kvalsvik
896b882c4b
Parse WDFACCOR
2016-12-14 10:44:48 +01:00
Jørgen Kvalsvik
05dc85379a
Parse CECON
2016-12-14 10:44:48 +01:00
Jørgen Kvalsvik
2526c69690
Parse PRORDER
2016-12-14 10:44:48 +01:00
Jørgen Kvalsvik
656c609904
Parse GRUPRIG
2016-12-14 10:44:48 +01:00
Jørgen Kvalsvik
3d2923d585
Parse COORDSYS
2016-12-14 10:44:48 +01:00
Jørgen Kvalsvik
771fe671d9
Complete TRACERS specification.
2016-12-14 10:44:48 +01:00
