fix(mf6): omit removed fields from generated code (#2804)

Filter out fields marked in DFNs as removed from the generated classes in the MF6 module. Before, removed fields were included in the generated classes and would be written to input files, which would cause MF6 to raise an error.

And remove usages of options recently been removed from MF6.

Author: wpbonelli

.docs/Notebooks/dis_triangle_example.py

@@ -204,8 +204,8 @@
     sim,
     print_option="SUMMARY",
     complexity="complex",
-    outer_hclose=1.0e-8,
-    inner_hclose=1.0e-8,
+    outer_dvclose=1.0e-8,
+    inner_dvclose=1.0e-8,
 )
 cell2d = tri.get_cell2d()
 vertices = tri.get_vertices()

.docs/Notebooks/export_vtk_tutorial.py

@@ -480,11 +480,11 @@ def run_vertex_grid_example(ws):
         pname="ims",
         print_option="SUMMARY",
         complexity="SIMPLE",
-        outer_hclose=1.0e-5,
+        outer_dvclose=1.0e-5,
         outer_maximum=100,
         under_relaxation="NONE",
         inner_maximum=100,
-        inner_hclose=1.0e-6,
+        inner_dvclose=1.0e-6,
         rcloserecord=0.1,
         linear_acceleration="BICGSTAB",
         scaling_method="NONE",

.docs/Notebooks/mf6_data_tutorial10.py

@@ -62,11 +62,11 @@
     sim,
     print_option="SUMMARY",
     complexity="SIMPLE",
-    outer_hclose=0.0001,
+    outer_dvclose=0.0001,
     outer_maximum=500,
     under_relaxation="NONE",
     inner_maximum=100,
-    inner_hclose=0.0001,
+    inner_dvclose=0.0001,
     rcloserecord=0.001,
     linear_acceleration="CG",
     scaling_method="NONE",

.docs/Notebooks/modpath7_create_simulation_example.py

@@ -100,8 +100,8 @@ def get_nodes(locs):
     sim,
     pname="ims",
     complexity="SIMPLE",
-    outer_hclose=1e-6,
-    inner_hclose=1e-6,
+    outer_dvclose=1e-6,
+    inner_dvclose=1e-6,
     rcloserecord=1e-6,
 )
 

.docs/Notebooks/plot_cross_section_example.py

@@ -685,11 +685,11 @@ def run_vertex_grid_example(ws):
         pname="ims",
         print_option="SUMMARY",
         complexity="SIMPLE",
-        outer_hclose=1.0e-5,
+        outer_dvclose=1.0e-5,
         outer_maximum=100,
         under_relaxation="NONE",
         inner_maximum=100,
-        inner_hclose=1.0e-6,
+        inner_dvclose=1.0e-6,
         rcloserecord=0.1,
         linear_acceleration="BICGSTAB",
         scaling_method="NONE",

.docs/Notebooks/plot_map_view_example.py

@@ -863,11 +863,11 @@ def run_vertex_grid_example(ws):
         pname="ims",
         print_option="SUMMARY",
         complexity="SIMPLE",
-        outer_hclose=1.0e-5,
+        outer_dvclose=1.0e-5,
         outer_maximum=100,
         under_relaxation="NONE",
         inner_maximum=100,
-        inner_hclose=1.0e-6,
+        inner_dvclose=1.0e-6,
         rcloserecord=0.1,
         linear_acceleration="BICGSTAB",
         scaling_method="NONE",

autotest/regression/test_mf6.py

@@ -1897,7 +1897,7 @@ def test004_create_tests_bcfss(function_tmpdir, example_data_path):
     ims_package = ModflowIms(
         sim,
         print_option="ALL",
-        csv_output_filerecord="bcf2ss.ims.csv",
+        csv_outer_output_filerecord="bcf2ss.ims.csv",
         complexity="SIMPLE",
         outer_dvclose=0.000001,
         outer_maximum=500,

autotest/test_modpathfile.py

@@ -76,8 +76,8 @@ def get_nodes(locs):
         sim,
         pname="ims",
         complexity="SIMPLE",
-        outer_hclose=1e-6,
-        inner_hclose=1e-6,
+        outer_dvclose=1e-6,
+        inner_dvclose=1e-6,
         rcloserecord=1e-6,
     )
 

autotest/test_specific_discharge.py

@@ -211,11 +211,11 @@ def mf6_model(function_tmpdir):
         pname="ims",
         print_option="SUMMARY",
         complexity="SIMPLE",
-        outer_hclose=1.0e-5,
+        outer_dvclose=1.0e-5,
         outer_maximum=50,
         under_relaxation="NONE",
         inner_maximum=30,
-        inner_hclose=1.0e-5,
+        inner_dvclose=1.0e-5,
         rcloserecord=rcloserecord,
         linear_acceleration="CG",
         scaling_method="NONE",

flopy/mf6/mfmodel.py

@@ -744,15 +744,15 @@ def solver_tols(self):
 
         Returns
         -------
-        inner_hclose, rclose : float, float
+        inner_dvclose, rclose : float, float
 
         """
         ims = self.get_ims_package()
         if ims is not None:
             rclose = ims.rcloserecord.get_data()
             if rclose is not None:
                 rclose = rclose[0][0]
-            return ims.inner_hclose.get_data(), rclose
+            return ims.inner_dvclose.get_data(), rclose
         return None
 
     @property