Merge pull request #2 from inowas/dev

Merge dev into master
inowas · Oct 28, 2020 · eb08943 · eb08943
2 parents c45a5cb + f39f600
commit eb08943
Show file tree

Hide file tree

Showing 15 changed files with 543 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,10 @@
 
 # Python egg metadata, regenerated from source files by setuptools.
 /*.egg-info
+
+# Build
+/build
+/FlopyAdapter/test/Calculation/calculation/
+/FlopyAdapter/test/Read/data/*/CHD.chk
+/FlopyAdapter/test/Read/data/*/load.log
+/FlopyAdapter/test/Read/data/*/te1.chk
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,14 +3,15 @@ stages:
   - release
 
 test:
-  image: python:3.8-buster
+  image: inowas/modflow-build:latest
   stage: test
 
   script:
     - make install
     - make test
 
 release:
+  image: python:3.8-buster
   stage: release
   script:
     - make install

diff --git a/FlopyAdapter/test/Read/data/test_example_2/RP1.bas b/FlopyAdapter/test/Read/data/test_example_2/RP1.bas
@@ -0,0 +1,5 @@
+# BAS6 package for  MODFLOW-2005, generated by Flopy.
+FREE
+CONSTANT          1                                #ibound layer 1                
+   -999.99
+CONSTANT    4.600000E+02                           #strt layer 1                  
diff --git a/FlopyAdapter/test/Read/data/test_example_2/RP1.chd b/FlopyAdapter/test/Read/data/test_example_2/RP1.chd
@@ -0,0 +1,17 @@
+# CHD package for  MODFLOW-2005, generated by Flopy.
+        12
+        12         0 # stress period 1
+         1         1         1           450.0           450.0
+         1         2         1           450.0           450.0
+         1         3         1           450.0           450.0
+         1         4         1           450.0           450.0
+         1         5         1           450.0           450.0
+         1         6         1           450.0           450.0
+         1         1        11           445.0           445.0
+         1         2        11           445.0           445.0
+         1         3        11           445.0           445.0
+         1         4        11           445.0           445.0
+         1         5        11           445.0           445.0
+         1         6        11           445.0           445.0
+        -1         0 # stress period 2
+        -1         0 # stress period 3
diff --git a/FlopyAdapter/test/Read/data/test_example_2/RP1.chk b/FlopyAdapter/test/Read/data/test_example_2/RP1.chk
@@ -0,0 +1,2 @@
+type,package,k,i,j,value,desc
+Warning,OC,0,0,0,0.000000,action(s) defined in OC stress_period_data ignored as they are not part the stress periods defined by DIS
diff --git a/FlopyAdapter/test/Read/data/test_example_2/RP1.dis b/FlopyAdapter/test/Read/data/test_example_2/RP1.dis
@@ -0,0 +1,10 @@
+# DIS package for  MODFLOW-2005, generated by Flopy.
+         1         6        11         3         4         2
+  0
+CONSTANT    1.000000E+03                           #delr                          
+CONSTANT    1.000000E+03                           #delc                          
+CONSTANT    4.600000E+02                           #model_top                     
+CONSTANT    3.900000E+02                           #botm layer 1                  
+      1.000000             1  1.000000  TR 
+      1.000000             1  1.000000  TR 
+      1.000000             1  1.000000  TR 
diff --git a/FlopyAdapter/test/Read/data/test_example_2/RP1.hds b/FlopyAdapter/test/Read/data/test_example_2/RP1.hds
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		type,package,k,i,j,value,desc
		Warning,OC,0,0,0,0.000000,action(s) defined in OC stress_period_data ignored as they are not part the stress periods defined by DIS