Merged upstream/master

2013-08-23 09:30:23 +02:00
parent 4b728a5196 0e49eacc98
commit b630140316
26 changed files with 230 additions and 115 deletions
--- a/testdata/integration_tests/EQUIL/EQUIL1
+++ b/testdata/integration_tests/EQUIL/EQUIL1
--- a/testdata/integration_tests/WCONHIST/WCONHIST1
+++ b/testdata/integration_tests/WCONHIST/WCONHIST1
--- a/testdata/integration_tests/include
+++ b/testdata/integration_tests/include
--- a/testdata/integration_tests/mini.data
+++ b/testdata/integration_tests/mini.data
--- a/testdata/integration_tests/small.data
+++ b/testdata/integration_tests/small.data
--- a/testdata/integration_tests/someobscureelements.data
+++ b/testdata/integration_tests/someobscureelements.data
@@ -0,0 +1,16 @@
+-- Comment 
+OIL
+
+GRIDUNIT 
+METRES                   /
+
+GRUDINT -- A wrong, or unknown keyword
+ "text" 3 5 /
+  3 3 3 3 3 3 /
+/
+
+
+
+RADFIN4
+213 123 123 /
+