Andreas Lauser
4e7c5e8e29
convert users of MESSAGE to OPM_MESSAGE
2013-09-05 13:04:38 +02:00
Andreas Lauser
1f7458e136
convert users of the ASSERT and the ASSERT2 macros to standard assert()
2013-09-05 13:04:37 +02:00
Andreas Lauser
d4b4ccbf75
convert users of the ASSERT and the ASSERT2 macros to standard assert()
2013-09-05 13:04:37 +02:00
Andreas Lauser
b48c9df650
convert THROW to OPM_THROW
2013-09-05 13:04:37 +02:00
Andreas Lauser
b9a1d3358b
convert THROW to OPM_THROW
2013-09-05 13:04:37 +02:00
Andreas Lauser
c2b8fe9caa
include iostream in the files which use std::cerr or std::cout
...
for some of these files this is needed to make to keep it compiling
after the next patch because the new ErrorMacros.hpp file will no
longer implicitly includes <iostream>. for the remaining files it is
just good style.
While at it, the includes for most of these files have been ordered in
order of decreasing abstraction level.
2013-09-05 13:04:37 +02:00
Joakim Hove
41376779f0
Fixed handling of INCLUDE keyword
2013-09-02 10:08:37 +02:00
Joakim Hove
0580cebb33
Merged with upstream/master
2013-08-29 12:13:47 +02:00
Joakim Hove
71dd19d11c
Added cmake machinery to find cjson library; and build bundled version if find_package(cjson) fails.
2013-08-29 12:05:18 +02:00
Joakim Hove
13adec09cc
Added some documentation about install of share/keywords
2013-08-28 16:56:24 +02:00
Joakim Hove
de8d819c96
Added SUMMARY and SCHEDULE keywords
2013-08-28 16:51:05 +02:00
Joakim Hove
467846c20d
Added install targets in json/CMakeLists.txt
2013-08-28 16:50:30 +02:00
Joakim Hove
785bc1aa1a
Added sub level CMakeLists.txt + share/CMakeLists.txt to install keywords
2013-08-28 16:49:48 +02:00
Joakim Hove
85476542ae
Added install target for Parser library and headers
2013-08-28 16:48:11 +02:00
Joakim Hove
52b1cbdd2e
Added option INCLUDE_STATOIL_TESTS wrapping usage of the Statoil internal test data
2013-08-28 13:50:32 +02:00
Kristian Flikka
e55d52654d
Added test to check that getKeyword throws when asked for non-existing keyword
2013-08-27 10:10:12 +02:00
Kristian Flikka
57ca1d0eb6
Added an else clause that throws, should check before getting
2013-08-27 10:06:55 +02:00
Kristian Flikka
1fc3857d06
Bumped boost to filesystem version 3, and changed a single usage of filename(), which has changed from string to path in filesystem v 3
2013-08-27 10:00:36 +02:00
Joakim Hove
10cd93c542
Merge pull request #11 from flikka/handle-truncated-records
...
Handle truncated records
2013-08-26 07:19:26 -07:00
Kristian Flikka
480d14934b
Added test for a case with fully, partial and empty record body, defaults are added
2013-08-26 15:17:52 +02:00
Joakim Hove
e6f3029ee5
Added more documentation
2013-08-25 21:49:28 +02:00
Joakim Hove
1803962001
Added more documentation
2013-08-25 18:27:34 +02:00
Joakim Hove
fb2a7372c2
Removed old doc keywordtypes.txt - added new keywords.txt
2013-08-25 17:28:58 +02:00
Kristian Flikka
0e5593dc9e
Removed removed extra layer of scan / scan__
2013-08-23 15:45:20 +02:00
Kristian Flikka
cdf16c747a
Removed the expectedItems concept from the scan functions
2013-08-23 15:39:08 +02:00
Kristian Flikka
64fb9a6cee
Removed expectedItems param from readFromRawRecord method in ParserItem
2013-08-23 14:43:17 +02:00
Kristian Flikka
771167c02e
Removed ParserXItem's scan with expected elements. Only SINGLE and ALL is now allowed
2013-08-23 14:35:47 +02:00
Kristian Flikka
375332eb99
Added check if rawRecord is empty, then default is used. Added some json data
2013-08-23 14:20:32 +02:00
Kristian Flikka
be882b6b27
Removed commented test
2013-08-23 12:18:38 +02:00
Kristian Flikka
07f1d70d79
Merge branch 'config-from-directory' of github.com:joakim-hove/opm-parser into config-from-directory
2013-08-23 12:04:10 +02:00
Kristian Flikka
1977d311ff
Fixed validName method
2013-08-23 11:58:56 +02:00
Kristian Flikka
f42536531a
Increased readabiliy
2013-08-23 11:53:03 +02:00
flikka
1fc65d2136
Changed indentation
2013-08-23 11:40:37 +02:00
Kristian Flikka
22e650de2e
Removed commented line
2013-08-23 10:37:55 +02:00
Joakim Hove
e865382406
Added (dummy) items for RADFIN4 keyword in testdata
2013-08-23 09:33:01 +02:00
Joakim Hove
e8e9f5bb87
Completed merge
2013-08-23 09:32:44 +02:00
Joakim Hove
33b8581522
Added keywords/ directory
2013-08-23 09:31:26 +02:00
Joakim Hove
b630140316
Merged upstream/master
2013-08-23 09:30:23 +02:00
Joakim Hove
4b728a5196
Added function declaration in .hpp
2013-08-23 00:20:22 +02:00
Joakim Hove
df031007db
Added items: to all inline config strings
2013-08-23 00:20:07 +02:00
Joakim Hove
19e42f4ce4
Based WCONHIST parse on KEYWORD directory
2013-08-23 00:19:09 +02:00
Joakim Hove
c05b90f4f9
Added #define symbol KEYWORD_DIRECTORY
2013-08-23 00:17:53 +02:00
Joakim Hove
7e9b817107
Reformatting
2013-08-23 00:16:50 +02:00
Joakim Hove
c01cbcfa71
Modified testdata to have correct number of items
2013-08-23 00:15:56 +02:00
Joakim Hove
d4cd119f43
Added items: to all keywords
2013-08-23 00:15:17 +02:00
Kristian Flikka
0e49eacc98
Removed setUknown from header, forgot in last commit
2013-08-22 15:55:33 +02:00
Kristian Flikka
3deab9cdf8
Changed unknown keyword concept to be a constructor only setting
2013-08-22 15:53:57 +02:00
Kristian Flikka
c218b803bc
Changed language
2013-08-22 15:53:26 +02:00
Joakim Hove
e75998666d
Updated ParserKeyword::validName() to disregard names with not alphanumeric (c)
2013-08-21 23:15:40 +02:00
Kristian Flikka
8b4d052f9c
Added parameter to parse function to indicate if strict (exception throwing) parsing should be performed
2013-08-21 14:54:38 +02:00
