Kristian Flikka
e02cfe3878
Refactored tests into DefaultValues test and, actual set values test
2013-11-08 09:14:57 +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
Kristian Flikka
3de996acc3
Merged with upstream, fixed BXSAT conflict, joakim-hove updated
2013-11-04 10:22:35 +01:00
Joakim Hove
2ec09d4cf7
Added keywords GCONINJE/RPTRST/WPITAB/WRFTPLT/WTRACER
2013-11-03 22:30:43 +01:00
Joakim Hove
8d313d1e33
Added BOSAT and BGSAT keywords ~ BPR
2013-11-01 22:07:22 +01:00
Kristian Flikka
f4778b8e67
some ignored keywords
2013-11-01 15:17:34 +01:00
Kristian Flikka
e8a33b1e5d
Merge remote-tracking branch 'joakim/spe1-missing-keywords' into spe1-integration
2013-11-01 15:11:06 +01:00
Kristian Flikka
e457acda44
New keyword files missing in the SPE1 dataset
2013-11-01 15:10:27 +01:00
Joakim Hove
5252daa460
Added keyword: ROCK
2013-11-01 12:40:03 +01:00
Joakim Hove
c949e4a47b
Added keyword: PVDG
2013-11-01 12:33:10 +01:00
Joakim Hove
9d8e07a56e
Added keyword: PVTO
2013-11-01 12:14:14 +01:00
Joakim Hove
502d26afef
Added keyword: RPTPROPS
2013-11-01 12:11:02 +01:00
Joakim Hove
3d50023041
Added keywords SOLUTION & PRESSURE
2013-11-01 11:56:20 +01:00
Joakim Hove
133791706d
Added RS / SGAS / SWAT keywords for initial distributions
2013-11-01 11:53:40 +01:00
Joakim Hove
1a8c1f2098
Added RPTSOL keyword
2013-11-01 11:49:47 +01:00
Joakim Hove
5de0d8799e
Added EXCEL and RUNSUM keywords
2013-11-01 10:48:24 +01:00
Joakim Hove
5bb04cdbdd
Added WGOR keyword
2013-11-01 10:45:09 +01:00
Joakim Hove
809e0b8b23
Added WBHP keyword
2013-11-01 10:44:23 +01:00
Joakim Hove
4496592f9e
Added TUNING keryword
2013-11-01 10:40:25 +01:00
Joakim Hove
bc7f8d9666
Added WCONPROD keyword
2013-11-01 10:38:25 +01:00
Kristian Flikka
33b0bed250
Changed the test-program to include Deck.hpp in stead of Parser.hpp to avoid problem with cJSON.h
2013-10-30 10:27:39 +01:00
Joakim Hove
a30b5aae0d
Merge pull request #40 from joakim-hove/time-map
...
Time map
2013-10-28 02:30:53 -07: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
02c410e9af
Merge pull request #39 from rolk/039_src
...
Extract source location from cache in build tree
2013-10-28 02:06:18 -07: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
4b94800073
Added some Eclipse project files to .gitignore
2013-10-25 17:34:08 +02: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
51d16d24da
Added install to .gitignore
2013-10-25 16:48:57 +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
Roland Kaufmann
e8e8d1c21e
Extract source location from cache in build tree
...
If opm-parser_ROOT is given, this should point to a build tree. The
only way to extract the corresponding source directory is to parse
the build cache located there.
2013-10-24 09:40:36 +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
Joakim Hove
29a168ee52
Merge pull request #38 from rolk/038_cmake
...
Allow directory root to be specified as the rest of the OPM modules
2013-10-24 00:22:33 -07:00
Joakim Hove
113d488242
Merge pull request #33 from rolk/033_bld
...
Support more build configurations
2013-10-24 00:01:05 -07:00
Roland Kaufmann
940f31295b
Test for all the required header directories
2013-10-23 22:40:45 +02:00
Roland Kaufmann
7e9c45b765
Allow package to be specified as required
...
Although CMake prefers the uppercase variant variables, and the
find_package_handle_standard_args will convert to them for us, the
part that parses REQUIRED and QUIET arguments to find_package still
only uses the package name verbatim (sic).
2013-10-23 22:40:45 +02:00
