Commit Graph

3018 Commits

Author SHA1 Message Date
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
Jørgen Kvalsvik
fa9c449fd9 Parse LGR
Don't choke on LGR keyword.
2016-12-14 10:44:47 +01:00
Jørgen Kvalsvik
6f53ce8abe DEBUG keyword
Adding the DEBUG keyword specification. Makes us no longer choke on it,
but we're not using it for anything in partcular. The keyword name is
DEBUG_ since DEBUG often is defined as a macro in C++ and the auto
generation would then fail. We look up the name itself by using the
deck_names field.
2016-12-13 14:49:20 +01:00
Jørgen Kvalsvik
6295435dd4 FMWSET expansion
FMWSET should, similar to ALL and GMWSET, expand to a set of field
property counting keywords.
2016-12-13 13:11:46 +01:00
Jørgen Kvalsvik
155e6d1cb5 GMWSET expansion
GMWSET should, similar to ALL, expand to a set of group property
counting keywords.
2016-12-13 12:55:09 +01:00
Jørgen Kvalsvik
ba824ac606 Don't choke on numerical aquifer keywords 2016-12-13 12:26:15 +01:00
Jørgen Kvalsvik
cba116fe59 Don't choke on analytical aquifers 2016-12-13 12:19:59 +01:00
jokva
4b45a02e79 Merge pull request #1008 from atgeirr/remove-pessimizing-move
Remove pessimizing move() in return statements.
2016-12-12 16:57:33 +01:00
jokva
1446cadb8f Merge pull request #1009 from atgeirr/extra-braces
Add extra braces for C++11 compilers.
2016-12-12 16:57:21 +01:00
Atgeirr Flø Rasmussen
b4360ff1e7 Add extra braces for C++11 compilers.
With C++14 the warnings generated will probably disappear, but for now
this keeps clang happy (warning-free).
2016-12-12 14:58:13 +01:00
Joakim Hove
3e3837c8f5 Merge pull request #997 from jokva/COMPLUMP
COMPLUMP support
2016-12-12 14:39:31 +01:00
Atgeirr Flø Rasmussen
489f9a658c Remove pessimizing move() in return statements. 2016-12-12 14:09:48 +01:00
Jørgen Kvalsvik
57843f4eab COMPLUMP support
Support for COMPLUMP. a keyword to re-assign completion numbers that can
be used with keywords such as WELOPEN.

Some helper functions were moved out of handleWELOPEN and reused in
handleCOMPLUMP.
2016-12-12 12:34:54 +01:00
Joakim Hove
7c9d91dd73 Merge pull request #1006 from atgeirr/facedir-variants
Allow 'X+', 'I+', 'Y+', 'J+', 'Z+' and 'K+' for FaceDir strings (in FAULTS)
2016-12-09 17:01:38 +01:00
Atgeirr Flø Rasmussen
d753ecd9b4 Allow 'X+', 'I+', 'Y+', 'J+', 'Z+' and 'K+'.
This has been encountered in the wild. We treat it like
the documented 'X', 'I' etc. strings.
2016-12-09 15:19:40 +01:00
Pål Grønås Drange
65a673496a Removed unused import CWrapper 2016-12-08 14:09:42 +01:00
Jørgen Kvalsvik
b3d44c83a7 Completion number aware WELOPEN
No longer chokes when WELOPEN is given its last two parameters, C1 and
C2 for completion number begin/end. Instead, these now weigh in on
whether or not a well matches the criteria for opening or closing.

Includes some test fixes and some restructuring of handleWELOPEN.
Obsolete verifications of throwing on COMPLUMP have been removed.
2016-12-07 09:17:55 +01:00
Joakim Hove
bf46f28fc1 Merge pull request #1003 from jokva/pvtw-table
TableManager.getPvtwTable
2016-12-06 22:41:27 +01:00
Joakim Hove
0bbd0b92e6 Merge pull request #1002 from jokva/no-crash-broken-locale
Don't crash keyword compilation on broken locales
2016-12-06 21:40:28 +01:00
Joakim Hove
c740479299 Merge pull request #993 from jokva/dynamic-state-sans-realloc
Remagine DynamicState
2016-12-06 21:39:25 +01:00
Jørgen Kvalsvik
1d535124ec TableManager.getPvtwTable
Provide a richer interface to the PVTW table.
2016-12-06 15:18:19 +01:00
Jørgen Kvalsvik
5986393930 Don't crash keyword compilation on broken locales
Work around a weakness of older boosts by forcing C locale if
std::locale throws.

The real solution is to not have broken locales, but this should make it
slightly easier to get the JSON keywords compiled.
2016-12-06 09:39:36 +01:00