move example data changes to separate branch

wpbonelli · wpbonelli · commit ee674752aaf6 · 2024-02-01T08:37:08.000-05:00
diff --git a/.docs/Notebooks/mf6_complex_model_example.py b/.docs/Notebooks/mf6_complex_model_example.py
@@ -56,6 +56,7 @@
     "examples",
     "data",
     "mf6",
+    "create_tests",
     "test005_advgw_tidal",
 )
 assert os.path.isdir(data_pth)
diff --git a/autotest/regression/test_mf6.py b/autotest/regression/test_mf6.py
@@ -1336,7 +1336,7 @@ def test005_create_tests_advgw_tidal(function_tmpdir, example_data_path):
     # init paths
     test_ex_name = "test005_advgw_tidal"
     model_name = "AdvGW_tidal"
-    pth = example_data_path / "mf6" / test_ex_name
+    pth = example_data_path / "mf6" / "create_tests" / test_ex_name
     expected_output_folder = pth / "expected_output"
     expected_head_file = expected_output_folder / "AdvGW_tidal.hds"
 
diff --git a/autotest/test_binaryfile.py b/autotest/test_binaryfile.py
@@ -210,6 +210,7 @@ def test_get_headfile_precision(example_data_path):
     precision = get_headfile_precision(
         example_data_path
         / "mf6"
+        / "create_tests"
         / "test005_advgw_tidal"
         / "expected_output"
         / "AdvGW_tidal.hds"
diff --git a/examples/data/mf2005_test/l1b2k_bath.nam b/examples/data/mf2005_test/l1b2k_bath.nam
@@ -11,4 +11,4 @@ LAK  16 l1b2k_bath.lak
 DIS  14 l1b2k_bath.dis
 FHB  21 l1b2k_bath.fhb
 #CHD  21 l1b2k_bath.chd
-DATA 22 l1b2k_bath.txt
+DATA 22 lak1b_bath.txt
diff --git a/examples/data/mf2005_test/lak1b_bath.txt b/examples/data/mf2005_test/lak1b_bath.txt
diff --git a/examples/data/mf2k_test/str.ba6 b/examples/data/mf2k_test/str.ba6
@@ -0,0 +1,12 @@
+#EXAMPLE SIMULATION OF STREAM ROUTING PACKAGE -- STEADY STATE OCTOBER 21, 1987 
+#-- STREAM STAGE IS CALCULATED                                                 
+NO OPTIONS
+CONSTANT          1  IBOUND layer   1
+    999.00  HNOFLO
+INTERNAL   1.000000E+00 (10F13.0)    0  Initial Head layer   1
+ 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02
+ 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02
+ 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02
+ 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02
+ 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02
+ 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02 4.800000E+02
diff --git a/examples/data/mf2k_test/str.bc6 b/examples/data/mf2k_test/str.bc6
@@ -0,0 +1,4 @@
+         0  1.00E+30         0  0.00E+00         0         0  IBCFCB,HDRY,IWDFLG,WETFCT,IWETIT,IHDWET
+ 0
+CONSTANT   1.000000E+00  TRPY
+CONSTANT   8.000000E-02  TRAN layer   1
diff --git a/examples/data/mf2k_test/str.dis b/examples/data/mf2k_test/str.dis
@@ -0,0 +1,7 @@
+    1    6    6    1    1    0  NLAY,NROW,NCOL,NPER,ITMUNI,LENUNI
+ 0
+CONSTANT   1.000000E+03  DELR
+CONSTANT   1.000000E+03  DELC
+CONSTANT   6.000000E+02  TOP of system          
+CONSTANT   0.000000E+00  Layer BOTM layer   1
+ 1.296E+06         3 1.500E+00  SS  PERLEN,NSTP,TSMULT,Ss/tr
diff --git a/examples/data/mf2k_test/str.nam b/examples/data/mf2k_test/str.nam
@@ -0,0 +1,11 @@
+#
+# NOTE: Forward slashes (/) in pathnames may need to be converted
+#       to back slashes (\) in some computing environments
+#
+LIST  7 str.lst
+BAS6  8 str.ba6
+SIP  13 str.sip
+OC   14 str.oc
+str  15 str.str
+BCF6  9 str.bc6
+DIS  10 str.dis
diff --git a/examples/data/mf2k_test/str.oc b/examples/data/mf2k_test/str.oc
@@ -0,0 +1,7 @@
+         5         5         0         0
+         0         0         0         0          T.S. 1    S.P. 1
+         0         0         0         0
+         0         0         0         0          T.S. 2    S.P. 1
+         0         0         0         0
+         0         1         1         1          T.S. 3    S.P. 1
+         1         0         0         0
diff --git a/examples/data/mf2k_test/str.sip b/examples/data/mf2k_test/str.sip
@@ -0,0 +1,2 @@
+       150         5
+        1.    0.0001         1         0         0
diff --git a/examples/data/mf2k_test/str.str b/examples/data/mf2k_test/str.str
@@ -0,0 +1,62 @@
+        23         7         3         1         1     1.486        -1         0
+        23         0         0
+    1    1    3    1    1            4.5     495.0      1.20     490.0     492.0
+    1    2    3    1    2                    490.0      0.60     485.0     487.0
+    1    2    3    2    1            1.5     487.0      0.20     483.0     485.0
+    1    3    3    2    2                    486.0      0.40     482.0     484.0
+    1    4    3    2    3                    484.0      0.40     480.0     482.0
+    1    5    3    2    4                    480.0      0.20     476.0     478.0
+    1    2    3    3    1           -1.0     486.0      0.40     481.0     483.0
+    1    3    4    3    2                    482.0      1.20     477.0     479.0
+    1    4    4    3    3                    478.0      1.20     473.0     475.0
+    1    5    4    3    4                    475.0      0.60     470.0     472.0
+    1    4    1    4    1            0.8     492.0      0.40     489.0     490.0
+    1    4    2    4    2                    488.0      0.32     485.0     486.0
+    1    5    2    4    3                    483.0      0.32     480.0     481.0
+    1    5    3    4    4                    480.0      0.20     477.0     478.0
+    1    5    3    5    1           -1.0     478.0      0.20     475.0     476.0
+    1    5    4    5    2                    474.0      0.20     471.0     472.0
+    1    2    6    6    1            1.2     495.0      0.80     491.0     493.0
+    1    3    6    6    2                    490.0      0.80     486.0     488.0
+    1    4    5    6    3                    480.0      0.80     476.0     478.0
+    1    5    5    6    4                    477.0      0.60     473.0     475.0
+    1    5    4    6    5                    474.0      0.20     470.0     472.0
+    1    5    4    7    1           -1.0     472.0      0.60     467.0     469.0
+    1    6    4    7    2                    469.0      1.20     464.0     466.0
+       10.     0.007     0.030
+       10.     0.007     0.030
+        5.     0.002     0.022
+        5.     0.002     0.022
+        5.     0.002     0.022
+        5.     0.004     0.022
+       10.     0.005     0.030
+       10.     0.005     0.030
+       10.     0.005     0.030
+       10.     0.005     0.030
+        5.     0.004     0.022
+        5.     0.004     0.022
+        5.     0.004     0.022
+        5.     0.004     0.022
+        5.     0.005     0.022
+        5.     0.005     0.022
+        5.     0.005     0.022
+        5.     0.008     0.022
+        5.     0.007     0.022
+        5.     0.004     0.022
+        5.     0.003     0.022
+       10.     0.004     0.030
+       10.     0.004     0.030
+    0    0    0
+    0    0    0
+    1    0    0
+    0    0    0
+    2    4    0
+    0    0    0
+    3    5    6
+         0
+         1
+         0
+         0
+         0
+         0
+         0
diff --git a/examples/data/mp6_examples/freybergmp.gitmpend b/examples/data/mp6_examples/freybergmp.gitmpend
diff --git a/examples/data/mp6_examples/freybergmpp.gitmppth b/examples/data/mp6_examples/freybergmpp.gitmppth

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@`
`56`	`56`	`"examples",`
`57`	`57`	`"data",`
`58`	`58`	`"mf6",`
	`59`	`+ "create_tests",`
`59`	`60`	`"test005_advgw_tidal",`
`60`	`61`	`)`
`61`	`62`	`assert os.path.isdir(data_pth)`