Joakim Hove
011919ef0c
Shallow copy now does new to create a heap instance; which should be wrapped by a smart pointer
2013-11-11 10:29:37 +01:00
Joakim Hove
88457973aa
Added CompletionSet
2013-11-11 10:29:37 +01:00
Joakim Hove
59bc1d0ddd
Renamed sameCell -> sameCoordinate
2013-11-11 10:29:36 +01:00
Joakim Hove
b9b9a984ae
Created integrationTest for building a collections of Completions from COMPDAT Record & Keyword
2013-11-11 10:29:36 +01:00
Joakim Hove
69f52542eb
Added Completion class for holding one single completion
2013-11-11 10:29:36 +01:00
Joakim Hove
c0aa3c0417
Removed stale commented code
2013-11-11 10:29:36 +01:00
Joakim Hove
bc6e2ee2c6
Added ScheduleEnums file - with CompletionStateEnum
2013-11-11 10:25:58 +01:00
flikka
cf0b1235a4
Merge pull request #47 from flikka/throw-on-too-long-records
...
Throw on too long records
2013-11-11 01:20:11 -08:00
Kristian Flikka
862d2ee302
Added support for WCONPROD, with use of predictionMode. Fixed a bug in the TSTEP reading in Schedule.cpp
2013-11-08 15:55:11 +01:00
Kristian Flikka
f0def0cdff
Added dynamic field inPredictionMode to Well
2013-11-08 09:39:37 +01:00
Kristian Flikka
e02cfe3878
Refactored tests into DefaultValues test and, actual set values test
2013-11-08 09:14:57 +01:00
Kristian Flikka
006ab6d35d
Added keywordName and dataFilename to RawRecord. Using these in the ParserRecord to give better error message when throwing on too long RawRecords
2013-11-07 12:32:07 +01:00
Joakim Hove
e5b921fe1c
Added simple datafile parser which focuses on the Schedule section
2013-11-05 18:06:51 +01:00
Joakim Hove
df741dfc89
Changed Schedule::init() to load both time related and other keywords in the same main loop
2013-11-05 17:59:54 +01:00
Joakim Hove
ddc24927e4
Allow data to be added after the (currently) last TSTEP
2013-11-05 17:58:19 +01:00
Joakim Hove
ffc5dc3c53
1. Added well collection to Schedule object.
...
2. Adding wells from Welspecs and setting Oilrate from WCONHIST
2013-11-05 15:25:47 +01:00
Joakim Hove
6d30a6a7fa
Added DynamicState template class
2013-11-05 12:57:25 +01:00
Joakim Hove
61b640f00f
Added simple Schedule::Well object
2013-11-05 12:55:49 +01:00
Joakim Hove
b4bd6a8ed1
Added test for DATES and TSTEP keyword respectively in TimeMap
2013-10-28 10:29:43 +01:00
Joakim Hove
bd289194f3
Merged with upstream/master
2013-10-28 10:12:53 +01:00
Joakim Hove
e1088eee71
Merge remote-tracking branch 'upstream/master' into test-compile-time-polymorphism
2013-10-28 10:02:21 +01:00
Joakim Hove
8b7c27fa17
Merge pull request #37 from rolk/037_virt
...
Change unintended compile-time polymorphism to dynamic
2013-10-28 02:01:07 -07:00
Joakim Hove
91704558a6
Added test for compile time polymorphism
2013-10-28 10:00:40 +01:00
Joakim Hove
039f6ea4cf
Merge pull request #36 from joakim-hove/cmake-package-config
...
Cmake package config
2013-10-28 01:00:03 -07:00
Joakim Hove
76a9cbb0b8
Updated test to check a return value
2013-10-25 17:31:48 +02:00
Joakim Hove
77cc1fd03b
Added Integration test to build TimeMap from Deck
2013-10-25 17:30:16 +02:00
Joakim Hove
d511d2ee2d
Added Schedule class
2013-10-25 17:28:56 +02:00
Joakim Hove
488782d8c5
TimeMap class can now be constructed from an Eclipse DECK
2013-10-25 17:26:37 +02:00
Joakim Hove
14b8759b7e
Removed not-used ParserItemTemplate.hpp from install targets
2013-10-24 15:51:38 +02:00
Joakim Hove
1efadb4af2
Merge remote-tracking branch 'upstream/master' into time-map
2013-10-24 15:25:43 +02:00
Joakim Hove
53ef54225a
Merge remote-tracking branch 'upstream/master'
2013-10-24 09:38:57 +02:00
Joakim Hove
54d94d7634
Parser->addKeyword() will erase first; NOW the ReplaceKeyword works
2013-10-24 09:38:03 +02:00
Joakim Hove
f303c09690
Parser->addKeyword() will erase first; NOW the ReplaceKeyword works
2013-10-24 09:37:14 +02:00
Roland Kaufmann
f8c6bfbaf2
Change unintended compile-time polymorphism to dynamic
...
equals(ParserIntItem&) has a different signature than equals(ParserItem&),
thus the former method does *not* overload the latter. Virtual just means
then only means that you have created a *new* entry in the v-table. If
you call equals through a pointer/reference to the base class ParserItem,
the defined method in the derived class is not called, and we miss out the
test for the equal default value.
Instead, we should take an argument of the base type and use a dynamic
cast to the derived type. If this downcast fails, then they are not equal;
otherwise we have gotten ourselves a pointer to get the properly typed
default value.
We must use pointers instead of references; if we cast to a reference,
a bad_cast exception is thrown if the expression is not in the proper
type hierarchy.
2013-10-23 20:54:56 +02:00
Joakim Hove
dd0676126e
Merge remote-tracking branch 'upstream/master' into time-map
2013-10-23 18:15:43 +02:00
Joakim Hove
0b3a4d64ec
Merge branch 'master' into cmake-package-config
2013-10-23 17:23:46 +02:00
Roland Kaufmann
781ef04a0e
Compare size with unsigned int literal
...
Surprisingly, some compilers (notably GCC 4.6.3) will issue a warning
when comparing a literal which is clearly positive to an unsigned type,
when looking for a suitable instantiation in Boost. This is fixed by
making the literal unsigned too, so there's no doubt.
2013-10-22 23:39:49 +02:00
Roland Kaufmann
0a69727bf7
Add missing header for function used inline in class
2013-10-22 22:38:08 +02:00
Joakim Hove
8cc555c5ac
Added basic functionality to assemble a timeMap
2013-10-22 17:11:33 +02:00
Joakim Hove
2a09a6b2c1
Added (empty) TimeMap class
2013-10-22 14:24:31 +02: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
Joakim Hove
63fb47515b
Relaxed internalParseLarge test
2013-10-22 10:48:39 +02:00
Joakim Hove
d5a78e3232
Added function install_headers() which will retain header prefix path
2013-10-21 17:13:37 +02:00
Joakim Hove
f934254f90
Removed ParserItemTemplate.hpp for install list
2013-10-21 07:03:51 +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
