Commit Graph

2511 Commits

Author SHA1 Message Date
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
Jørgen Kvalsvik
590e3d2efe ALL_keywords in tests non-constexpr (MSVC compat)
Windows' compiler complains that {} yields a non-const expr for the
std::initializer_list, meaning compilation breaks. Changed to a const
static instead so that MSVC is happy.
2016-07-11 14:59:02 +02:00
Joakim Hove
1e3000fc54 Merge pull request #871 from jokva/remove-dependency-opm-common
Remove opm-common dependency
2016-07-11 10:06:04 +02:00
Kai Bao
4a112f4fd5 updating the path for the MSW in the opm-data for test. 2016-07-09 16:37:44 +02:00
Jørgen Kvalsvik
3696b750cd Remove opm-common dependency
Severs the code dependency on opm-commmon. There was no actual
functional dependency here, with the exception of some enable/disable
warning headers. To properly make opm-parser a stand-alone module the
usage of these headers have been removed and the dependency on
opm-common is gone.
2016-07-08 15:53:40 +02:00
Jørgen Kvalsvik
44cd4868f8 Syntactic cleanup
Fixup of some messy constructors.
2016-07-05 08:22:13 +02:00
Jørgen Kvalsvik
e1befcc03f SummaryConfig: don't register duplicate entries
By using the ALL keyword or by denoting the same keyword multiple times,
there would be corresponding multiple entries in the SUMMARY file.
Address this by removing duplicate entries from the list of smspec
nodes.
2016-07-04 16:47:20 +02:00
Jørgen Kvalsvik
c998b35647 Reindentation 2016-07-04 16:47:19 +02:00
Jørgen Kvalsvik
27eeb9f85e Refactor SummaryConfig internals
The internal helper functions have been redesign. The initial ambition
was to create small, composable functions by-value functions and have
the high-level algorithm, which is essentially (concat . map handler
[kwlist]). However, MSVC breaking and therefore poor development speed
of utility libraries mandates adjusting the approach a bit.

The major change here is the "return value" of the helper functions
being passed by-reference to all helpers, which will append the elements
they generate onto the collection.
2016-07-04 16:47:04 +02:00
Jørgen Kvalsvik
daf833e3ba Minor control flow simplification 2016-07-04 13:15:25 +02:00
Jørgen Kvalsvik
3d01da1f4c ALL keyword SummaryConfig as parse-then-merge
Generalises the SummaryConfig internal representation building by no
longer special casing the ALL keyword in the loop, but rather explicitly
look it up, analyse the expanded list as a new and isolated deck, and
then merge the results.
2016-07-04 13:10:57 +02:00
Jørgen Kvalsvik
17464851ad Initializer list constructors for Deck
Initializer list support makes some tests much easier to write (and
read) and enables some nifty features for when small, special-purpose
decks are needed.
2016-07-04 12:40:31 +02:00
Jørgen Kvalsvik
4f8ad8a533 SummaryConfig::merge
Combine two Summary configs, essentially concatenating the underlying
vectors.
2016-07-04 12:02:43 +02:00
Jørgen Kvalsvik
ffc94fc0b2 SummaryConfig: anon namespace; private ALL list
Some minor hygiene, not exposing some highly internal detail. The list
of keywords ALL expands to is duplicated rather than acessible via a
method, but:

1. this is highly likely never an interesting list of applications
2. it's really only useful for testing **AND** is unlikely to change
3. unclutters the header files slightly
2016-07-04 11:47:22 +02:00
Liu Ming
9e0398c134 add comma. 2016-07-04 08:55:32 +08:00
Joakim Hove
d3f415c5aa ParseContext treatment of unknown wells/groups. 2016-07-01 17:04:58 +02:00
Joakim Hove
433b8ce73e Removed unused filter/remove functionality. 2016-07-01 17:04:58 +02:00
Joakim Hove
0db0637ef7 RPTRST / TimeMap updates
- Fixed bug with RPTRST BASIC=4 terminated before a year.

 - Refactored machinery to keep track of first report step in every
   month/year.
2016-07-01 17:04:58 +02:00