OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
313 Commits 18 Branches 75 Tags
2b52adadf24eff2136afff3a4984e0548d4f7753
Commit Graph
313 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Kaufmann 2b52adadf2 Search for build tree relative to this project 
The CMake script is run in the source tree. We assume a certain
directory layout and that the cjson is available in a sibling
directory of this project. Thus, we can pick up a build tree without
having the library installed.
 2013-10-23 10:22:50 +02:00
Roland Kaufmann 9663d187a7 Search for library in proper build directory 
The library will end up in the opm/json library in a build tree; we
want to be able to point the CJSON_ROOT variable to the root of the
build tree and have it pick up the libraries from there.
 2013-10-23 10:22:50 +02:00
Roland Kaufmann 1b4a71bdfb Raise error if module is required but not found 
Otherwise the error will just be silently ignored.
 2013-10-23 10:22:49 +02:00
flikka 6ffa9052ef Merge pull request #32 from joakim-hove/reload-keyword 
Added test for replace keyword functionality
 2013-10-18 05:48:06 -07:00
Joakim Hove 1cc16de2bd Added test for replace keyword functionality 2013-10-18 10:17:48 +02:00
Kristian Flikka 65e01082d2 Added tests exposed tracking of default usage 2013-10-16 15:07:54 +02:00
Kristian Flikka 13f30cb3ef Removed template for ParserItem for decoding default/repetetive tokens for String and Double 2013-10-16 14:57:01 +02:00
Joakim Hove 0aa416675a ??? 2013-10-16 09:59:32 +02:00
Joakim Hove 2d68ebe94c Merge remote-tracking branch 'upstream/master' into track-default 2013-10-15 14:24:42 +02:00
Joakim Hove 2ac8bc55a5 Merge pull request #30 from joakim-hove/data-with-space 
Data with space
 2013-10-15 05:23:11 -07:00
Joakim Hove 49ac9f4568 ParserIntItem::scan() implemented with (temporary) specialized code 2013-10-14 21:30:17 +02:00
Joakim Hove dabfdb922b Added loose function tokenCOntainsStar to StarToken.cpp 2013-10-14 21:27:20 +02:00
Joakim Hove f38cd79839 Commented out failing DefaultApplied tests 2013-10-14 21:15:57 +02:00
Joakim Hove 9be183cf52 Minor reformat to not confuse comment end marker 2013-10-14 21:14:39 +02:00
Joakim Hove 7ec4be5b47 Including StarTokenTest 2013-10-14 21:13:24 +02:00
Joakim Hove 801e6b9fd1 Added DeckIntItem->push_backMultiple() 2013-10-14 21:12:22 +02:00
Joakim Hove a7078ba687 Implemented StarToken specializations in cpp file 2013-10-14 21:05:10 +02:00
Joakim Hove ccae60777d Ensure that StarToken() will throw for missing multiplier 2013-10-14 17:49:07 +02:00
Joakim Hove aae260c47d Added class StarToken() to treat tokens with a multiplier/default 2013-10-14 16:54:43 +02:00
Joakim Hove d1f0a9f5f7 Moved some tests around 2013-10-14 14:15:44 +02:00
Joakim Hove 48a0fa39e1 Added DexkXXXItem.push_backDefault() 2013-10-11 16:16:45 +02:00
Joakim Hove 268119e1ce Removed unneceessary includes 2013-10-11 15:38:30 +02:00
Joakim Hove fb7dc690d1 Added defaultApplied() method to DeckItem - and FAILING test 2013-10-10 13:32:05 +02:00
Joakim Hove d5b6e84f18 Fixed bug with string items with embedded space - using an ugly template specialization hack 2013-10-09 17:04:08 +02:00
Joakim Hove 2b118a660c Added test for parsing of stringdata with space 2013-10-09 17:01:47 +02:00
Joakim Hove b63244228d Added Parser::dropKeyword() 2013-10-09 08:22:43 +02:00
Joakim Hove a8543c29aa Merge branch 'master' into add-keywords 2013-10-09 08:07:37 +02:00
Joakim Hove fa3cc810d8 Updated GRIDUNIT keyword 2013-10-09 08:07:02 +02:00
Joakim Hove 253d8bec0f Minor minor 2013-10-08 17:03:46 +02:00
Joakim Hove 6dce82c5a5 Added action: THROW_EXCEPTION 2013-10-08 16:54:41 +02:00
Joakim Hove 8e550b7f32 Added warnings in Deck for keywords of type IGNORE_WARNING and unrecognized keywords 2013-10-08 16:19:18 +02:00
Joakim Hove f3a38425cb Added warning capabilities to the Deck 2013-10-08 16:02:16 +02:00
Joakim Hove 2345835233 Added warning capabilities to the Deck 2013-10-08 15:58:46 +02:00
Joakim Hove 997d53ea99 Merge branch 'store-file-and-line' into keyword-status 2013-10-08 15:28:21 +02:00
Joakim Hove f0770f47fb Added filename and line nr to RawRecord 2013-10-08 15:23:45 +02:00
Joakim Hove 00c434614a Minor typo 2013-10-08 14:45:58 +02:00
Joakim Hove f019d40dd4 Parser will inspect keyword->action; only INTERNALIZE are stored 2013-10-08 14:45:41 +02:00
Joakim Hove b99d5d75cc Removed explicit keyword loading 2013-10-08 14:19:05 +02:00
Joakim Hove cc21644c9e Added Json parsing of action attribute 2013-10-08 14:13:45 +02:00
Joakim Hove e6b38c6445 Added action value to ParserKeyword constructor 2013-10-08 13:46:55 +02:00
Joakim Hove 9b96d6dfa5 Added new enum ParserKeywordActionEnum 2013-10-08 11:39:04 +02:00
Joakim Hove 8884f865b3 Updated MAPAXES 2013-10-08 10:35:52 +02:00
Joakim Hove 49a00eb3b0 Added O/ keywords for NORNE 2013-10-08 10:20:18 +02:00
Joakim Hove 819f20bc26 Added N/ keywords for NORNE 2013-10-08 10:16:05 +02:00
Joakim Hove 32ba204570 Added M/ keywords for NORNE 2013-10-08 09:51:20 +02:00
Joakim Hove cc6d068476 Added G/ keywords required for Norne 2013-10-08 09:34:53 +02:00
Joakim Hove d430b97533 Merge remote-tracking branch 'kristian/new-norne-keywords' into add-keywords 2013-10-07 09:28:22 +02:00
Kristian Flikka 65de3adf4a Added keyword only F words 2013-10-04 15:06:05 +02:00
Joakim Hove 5204b195c6 Added two files with test data 2013-10-04 13:38:40 +02:00
Kristian Flikka 09e28bf86c E keywords 2013-10-04 13:30:01 +02:00