Commit Graph

47 Commits

Author SHA1 Message Date
Joakim Hove
7ea0bb8e53 Changed getDouble() -> getRawDouble throughout. 2013-12-10 14:16:54 +01:00
Joakim Hove
4fce7703db Added dimension to DeckDoubleItem and method get SIData(). 2013-12-10 13:49:15 +01:00
Joakim Hove
24e233a53c Support for parsing keywords with unknown size. 2013-12-05 08:26:29 +01:00
Kristian Flikka
1d0135da5e Removed use of boost::shared_ptr, replaced with std::shared_ptr 2013-12-02 13:07:01 +01:00
Joakim Hove
803304d5f8 Deck->keywordContainer will set deckIndex of DeckKeyword when inserting: Have relaxed const properties of DeckKeyword 2013-10-22 11:42:15 +02:00
Joakim Hove
0598e9122a Added deckIndex property to deckKeyword 2013-10-22 11:40:45 +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
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
801e6b9fd1 Added DeckIntItem->push_backMultiple() 2013-10-14 21:12:22 +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
fb7dc690d1 Added defaultApplied() method to DeckItem - and FAILING test 2013-10-10 13:32:05 +02:00
Joakim Hove
2b118a660c Added test for parsing of stringdata with space 2013-10-09 17:01:47 +02:00
Joakim Hove
2345835233 Added warning capabilities to the Deck 2013-10-08 15:58:46 +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
d8dff84cb3 Removed Logger class 2013-09-16 14:36:14 +02:00
Kristian Flikka
cdf16c747a Removed the expectedItems concept from the scan functions 2013-08-23 15:39:08 +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
5f1c2722b5 Now also reading unrecognized keywords, labeled such in DeckKeyword class 2013-08-21 10:41:18 +02:00
Kristian Flikka
b5dac4b5bd Added function to get keyword from deck based on index. Added looping over all keywords in application. This should have been several commits 2013-08-20 15:51:19 +02:00
Joakim Hove
765ade785a Added Deck::size() 2013-08-13 14:49:58 +02:00
Joakim Hove
5c3de27077 1. Implemented support for inferring size from another kewyord - i.e EQLDIMS + EQUIL.
2. Cleaned up the main parser loop considerably; the RawKeyword instance now itself knows whether it is complete or not.
2013-08-11 12:36:16 +02:00
Joakim Hove
475b607faf Can now parse file with several WCONHIST keywords 2013-08-01 12:50:42 +02:00
Joakim Hove
75954575d5 Changed Deck::getKeyword() to take an additional inde argument 2013-08-01 10:57:25 +02:00
Joakim Hove
a8d4a22894 Renamed DeckRecord::get() -> DeckRecord::getItem() 2013-08-01 09:52:49 +02:00
Kristian Flikka
f1660460dc Replaced all instances of KW with Keyword. We can afford it. 2013-06-20 15:30:37 +02:00
Kristian Flikka
abcde19716 Removed unused import 2013-06-20 14:40:12 +02:00
Kristian Flikka
5fa04e5377 Added/implemented XStringItem for Parser and Deck, with tests. Added integration test for WWCT keyword. Moved DeckItem tests into type-specific files. Removed unused file. 2013-06-20 13:56:11 +02:00
Kristian Flikka
fbb468342d Finished up the last pieces for a simple BPR keyword vertical. 2013-06-04 14:32:30 +02:00
Kristian Flikka
b43d95c5a2 Starting to wrap up from the top, added the missing DeckKW, and refactored a bit in some of the Raw classes that returned the internal structure 2013-06-03 15:54:16 +02:00
Joakim Hove
f9ae0680eb Added DeckTests.cpp 2013-06-03 10:25:26 +02:00
Joakim Hove
c596b086c8 Started integration testing 2013-05-30 10:11:12 +02:00
Kristian Flikka
082978fc2e Functionality to read from RawRecord into DeckRecord, based on ParserRecord. 2013-05-27 14:28:23 +02:00
Kristian Flikka
6e20bfda09 Added Deck class (empty), and some integration tests. WIP 2013-05-27 14:27:22 +02:00
Kristian Flikka
7998a84b81 Made the ParserIntItem's scan return DeckItem, and put a virtual scan in ParserItem. The ParserRecord now has a simple, but functioning parse method 2013-05-24 10:09:59 +02:00
Kristian Flikka
7bfe185998 Started working on the flow RawRecord->ParserRecord->DeckRecord. DeckRecord has some containers now. 2013-05-23 12:42:59 +02:00
Joakim Hove
d69784c59d Added namespace Opm{} to DeckItem 2013-05-14 21:25:24 +02:00
Joakim Hove
6b338d09e7 Added skeleton implementation of DeckRecord 2013-05-14 21:23:34 +02:00
Joakim Hove
17f8ae7428 Added DeckDoubleItem implementation 2013-05-13 17:03:44 +02:00
Joakim Hove
9e1b00ef63 The ParserIntItem::scan() function will push unused values back on the front of the RawRecord. 2013-05-10 13:56:41 +02:00
Joakim Hove
7dbc4f0d2b Added size() method on DeckIntItem 2013-05-09 12:14:52 +02:00
Kristian Flikka
2088c3e96d Simple scan implementation in ParserIntItem added. DeckIntItem now support push_back 2013-05-08 14:31:20 +02:00
Kristian Flikka
2d6e6842d6 Changed ParserItem from template based to a base-inheritance based system. Corresponds to and creates DeckItem objects 2013-05-07 21:55:49 +02:00