Joakim Hove
97f3d0d29b
Added many new keywords
2013-09-29 18:45:30 +02:00
Joakim Hove
c75b443d02
Added newline
2013-09-29 17:54:15 +02:00
Joakim Hove
c8b6071f8f
Added many keyword config files + createDefaultKeywordList will print
2013-09-26 22:49:27 +02:00
Joakim Hove
ff52309c72
Will print a error message and continue when meeting malformed json
2013-09-26 00:05:34 +02:00
Joakim Hove
f1916fe324
Added a list of keywords
2013-09-26 00:04:52 +02:00
Joakim Hove
6cca207a30
Added new keyword DATES
2013-09-25 22:04:56 +02:00
Joakim Hove
72aec8893b
Added test for parsing PORO keyword from file
2013-09-22 18:54:14 +02:00
Joakim Hove
4088570085
Added methods const std::vector<T>& DeckKeyword::getTData() which goes all the way through DeckRecord(0)->DeckItem(0)
2013-09-22 18:53:29 +02:00
Joakim Hove
33520fbd9f
Added const std::vector<T>& DeckTItem::getTData()
2013-09-22 18:51:41 +02:00
Joakim Hove
383f98b375
Changed data container in DeckXXXItem std::deque -> std::vector
2013-09-22 18:50:18 +02:00
Joakim Hove
f7aa4f09cf
Added some keywords
2013-09-22 17:26:27 +02:00
Joakim Hove
d7ca4fee83
Added support for 'data' keywords ~ the PORO and PERMX keywords
2013-09-22 17:23:27 +02:00
Kristian Flikka
297c719a1c
Cleanup of some remaining Logger stuff
2013-09-19 10:57:46 +02:00
flikka
0fb31be49b
Merge pull request #22 from joakim-hove/cleanup
...
Removed Logger class
2013-09-19 01:51:04 -07:00
Joakim Hove
111d92b9e6
Removed explicit size_type : SINGLE from all config files
2013-09-18 07:27:50 +02:00
Joakim Hove
0afbcfc6e4
sizeType is default set to SINGLE - and optional in Json config
2013-09-18 07:16:09 +02:00
Joakim Hove
3992a32efc
Made sizeType : SINGLE default
2013-09-17 22:27:53 +02:00
Joakim Hove
9986916ca7
Fixing parser tests
2013-09-17 17:45:42 +02:00
Kristian Flikka
687b5aed2f
Formatting...
2013-09-16 15:53:56 +02:00
Kristian Flikka
7f1acfe279
Deleted unused file
2013-09-16 15:53:38 +02:00
Joakim Hove
d8dff84cb3
Removed Logger class
2013-09-16 14:36:14 +02:00
Joakim Hove
07a0a831f2
MOved the mkdir generated_source a bit - it still does not work 100%
2013-09-14 22:53:47 +02:00
Joakim Hove
1ff18bb38a
Removed constructor with one global JSON config file + addedd optional flag to include all built in keywords
2013-09-14 22:39:43 +02:00
Joakim Hove
3778077422
Assemble all generated cpp source in build/generated-source
2013-09-14 22:29:56 +02:00
Joakim Hove
79a59fc629
Added indent parameter to ParserKeyword::inlineNew() to beautify generated cpp source
2013-09-14 22:14:58 +02:00
Joakim Hove
ccac972d6c
Removed - not needed - ParserRecord::inlineNew
2013-09-14 21:46:16 +02:00
Joakim Hove
414feb1132
Added dynamic creation of inline default list of keywords
2013-09-14 21:44:20 +02:00
Joakim Hove
f461ba6f07
Created code to create cpp representation of complete ParserKeyword
2013-09-13 22:23:12 +02:00
Joakim Hove
c04f9728b0
Added temporaryr library target buildParser which is used for executables creating source
2013-09-13 12:50:40 +02:00
Joakim Hove
b36fa7d42c
Added inlineNew() method to create ParserRecord
2013-09-13 12:34:38 +02:00
Joakim Hove
414752b78a
Fixed quoting of string default arguments
2013-09-13 10:26:56 +02:00
Joakim Hove
c11fdeeb42
Added ParserRecord::equal() method
2013-09-13 10:16:00 +02:00
Joakim Hove
b10952bb4f
Added typeid() based test in ParserItem::equal()
2013-09-13 10:15:42 +02:00
Joakim Hove
9bc8090c08
Added parserItem method inlineNew() which will create a cpp source representation of self
2013-09-12 23:50:16 +02:00
Joakim Hove
6d0ed41b29
Added property m_defaultSet to track if the default value has been explicitly set
2013-09-12 12:13:32 +02:00
Joakim Hove
5284b4ff89
Added equal() method for the ParserItem classes
2013-09-12 10:58:44 +02:00
Joakim Hove
0dce7e5aec
Cmake if test update
2013-09-12 10:58:21 +02:00
Andreas Lauser
86db9baa6f
fix the SparseVector and SparseTable unit tests
...
also, throw std::logic_error in the OPM_ERROR_IF macro
2013-09-06 13:27:14 +02:00
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
