Commit Graph

2687 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
c4e8149717 UnitSystem string-description of a unit
Analoguous to to/from_si but for string-representation of the unit in
question.
2016-07-19 14:34:21 +02:00
Joakim Hove
19aa54a7e1 Merge pull request #883 from jokva/summary-config-well-name-matching
[Summary] W-keywords accept patterns
2016-07-19 09:43:57 +02:00
jokva
6fc1aec8c0 Merge pull request #882 from joakim-hove/restart-config
Extracted configuration of *when* to write restart
2016-07-18 23:10:33 +02:00
Jørgen Kvalsvik
d98215ae40 [Summary] W-keywords accept patterns
The W-family of keywords accept a pattern to expand, rather than just
names or defaulted-all. This is the actual behaviour, according to the
manual.
2016-07-18 14:46:00 +02:00
Joakim Hove
0069b02e9f Extracted configuration of *when* to write restart
The configuration of when to write restart files is quite complex,
involving at least the three keywords RPTSOL, RPTRST and RPTSCHED. This
commit moves that configuration from the IOConfig class to the
RestartConfig class.

At a later stage the RestartConfgig class will be extended with
information of *what* to save in the restart file.
2016-07-15 15:26:51 +02:00
Jørgen Kvalsvik
3f98a747df Connection keywords support well matching
Looking up well keywords uses the well matching algorithm. This covers
all cases supplied by the eclipse documentation, and extends it slightly
by also allowing matching.
2016-07-15 14:40:27 +02:00
Jørgen Kvalsvik
9eb23b2971 Well matching gives empty list on no matches
The well matching algorithm has been tuned to not throw when a well name
is used for pattern and the well is not registered. Instead it will
return the empty list, meaning keywords that expects to match over
wells, but passes full identifiers, that also rely on the match to throw
for control flow, will have to manually check the emptiness of the well
list.
2016-07-15 14:40:22 +02:00
Joakim Hove
148b9b22ea Extracted configuration of *when* to write restart
The configuration of when to write restart files is quite complex,
involving at least the three keywords RPTSOL, RPTRST and RPTSCHED. This
commit moves that configuration from the IOConfig class to the
RestartConfig class.

At a later stage the RestartConfgig class will be extended with
information of *what* to save in the restart file.
2016-07-15 14:15:26 +02:00
Jørgen Kvalsvik
4635318e8f COMPDAT I/J can be defaulted
According to the manual, defaulting or putting 0 for I and J coordinates
will default to the well head I/J.
2016-07-15 12:04:01 +02:00
Joakim Hove
df9d3c660f Merge pull request #877 from jokva/remove-warnings
Remove warnings
2016-07-14 12:05:21 +02:00
Joakim Hove
4a22657e76 Added iterator support to GridProperties<T>
- Removed std::vector<> storage of GridProperty<T> objects.
 - Completely removed std::shared_ptr<> from GridProperties<T>.
2016-07-13 23:45:06 +02:00
Joakim Hove
c3e292399b Added getIntProperties() and getDoubleProperties() 2016-07-13 23:45:06 +02:00
Jørgen Kvalsvik
c804a1372a Remove BOOST_TEST_DYN_LINK directive from NNCTest 2016-07-13 23:40:35 +02:00
Jørgen Kvalsvik
178f563c72 Fix warnings in Compsegs 2016-07-13 23:40:35 +02:00
Jørgen Kvalsvik
784e04eb81 Fix warnings in IntegrationTests 2016-07-13 23:40:35 +02:00
Jørgen Kvalsvik
38573e9309 Fix warnings in IOConfigIntegrationTest 2016-07-13 23:40:35 +02:00
Jørgen Kvalsvik
5f6f7d2d03 Fix warnings in opmi 2016-07-13 23:40:35 +02:00
Jørgen Kvalsvik
d7aae5b75a Fix warnings in GridPropertyTests 2016-07-13 23:40:10 +02:00
Jørgen Kvalsvik
ecb2f0a1ab Fix warnings in SatfuncPropertyInitTests 2016-07-13 23:40:10 +02:00
Jørgen Kvalsvik
5df5c769f6 Fix warnings in TableManagerTests 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
036a4619e2 Fix warnings in TableContainerTests 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
de9ecedf2d Fix warnings in COMPSEGUnits 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
ca2985d5a0 Fix warnings in ParserTests 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
d85bbf9f2b Fix warnings in ParserKeywordTests 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
616e810858 Fix warnings in Parser 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
a84327ca25 Fix warnings in SummaryConfig 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
de31ac9743 Fix warnings in NNC 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
a7e45bf7d4 Fix warnings in GridProperty 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
f36851d127 Fix warnings in GridDims 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
7bcd4a428d Fix warnings in Tables 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
508be3ecd5 Fix warnings in Stringview 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
02785741a6 Fix warnings in Functional 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
6226a154c7 Fix warnings in VFPProdTable 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
ee121931b8 Fix warnings in ColumnSchema 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
33a87a1ced Fix warnings in StarToken 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
efc10007be Fix warnings in KeywordGenerator 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
89f62a743d Fix warnings in Well 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
ef9fa57fa6 Fix warnings in Eclipse3DProperties 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
29604ac2af Fix warnings in DeckRecord 2016-07-13 23:39:29 +02:00
Jørgen Kvalsvik
aff1908529 Fix warnings in DeckItem 2016-07-13 23:39:29 +02:00
Jørgen Kvalsvik
2f0f7201eb Fix warnings in Deck 2016-07-13 23:39:29 +02:00
Joakim Hove
a15cee598a Removed OpmLog from opmi. 2016-07-13 15:37:48 +02:00
Joakim Hove
84321ba48d Changes to Properties lookup:
1. The normalizing in keyword names has been moved from
   Eclipse3DProperties to GridProperties.

2. The normalizing does both UPPERCASE and removes trailing
   whitespace.
2016-07-13 14:56:15 +02:00
Joakim Hove
2ce7be2b69 opmi will dump messages to std::cout 2016-07-13 14:56:15 +02:00
Joakim Hove
f2e94061d8 Added Json config for new keywords. 2016-07-13 14:56:15 +02:00
Joakim Hove
f16283e367 Removed the EclipseGrid.fwriteEGRID() method. 2016-07-12 14:28:57 +02:00
Joakim Hove
14db80e91b Merge pull request #873 from jokva/appveyor
Appveyor support
2016-07-11 22:46:13 +02:00
Jørgen Kvalsvik
0823232aae Windows integration: boost::path for path equality
Use boost path for comparison, in order to get portable path comparison,
which makes the test pass on Windows.
2016-07-11 14:59:02 +02:00
Jørgen Kvalsvik
d78dcae1ce Windows integration; make portable temp path
Uses boost's temporary path facilities rather than suggesting /tmp for
temporary directory creation. Linux users will observe no difference,
but the test itself will run on Windows.
2016-07-11 14:59:02 +02:00
Jørgen Kvalsvik
a33c6ad1a2 IOConfig::fullBasePath gives correct OS path
Leverages boost to properly convert path speficiations to the current
platform's preferred format.
2016-07-11 14:59:02 +02:00