fix utlncf create test

Author: mjreno

autotest/regression/test_model_netcdf.py

@@ -1,8 +1,5 @@
-import math
 import os
 import shutil
-from traceback import format_exc
-from warnings import warn
 
 import numpy as np
 import pytest
@@ -13,7 +10,6 @@
 import flopy
 from flopy.discretization.structuredgrid import StructuredGrid
 from flopy.discretization.vertexgrid import VertexGrid
-from flopy.utils.datautil import DatumUtil
 from flopy.utils.gridutil import get_disv_kwargs
 from flopy.utils.model_netcdf import create_dataset
 
@@ -47,13 +43,6 @@ def compare_netcdf(base, gen, projection=False, update=None):
                 else:
                     attr = "crs_wkt"
                 assert attr in xrg.data_vars[varname].attrs
-
-                # TODO
-                # crs_b = CRS.from_wkt(da.attrs[attr])
-                # epsg_b = crs_b.to_epsg(min_confidence=90)
-                # crs_g = CRS.from_wkt(xrg.data_vars[varname].attrs[attr])
-                # epsg_g = crs_g.to_epsg(min_confidence=90)
-                # assert epsg_b == epsg_g
             continue
 
         compare_netcdf_var(
@@ -143,7 +132,6 @@ def test_load_gwfsto01(function_tmpdir, example_data_path):
 
         # load example
         sim = flopy.mf6.MFSimulation.load(sim_ws=base_path)
-        # gwf = sim.get_model("gwf_sto01")
 
         # set simulation path and write simulation
         sim.set_sim_path(test_path)
@@ -902,10 +890,6 @@ def test_disv01b(function_tmpdir, example_data_path):
 
     nlay, nrow, ncol = 3, 3, 3
     ncpl = nrow * ncol
-    # delr = 10.0
-    # delc = 10.0
-    # xoff = 100000000.0
-    # yoff = 100000000.0
 
     vertices = [
         (0, 1.0000000e08, 1.0000003e08),
@@ -1244,8 +1228,25 @@ def test_utlncf_create(function_tmpdir, example_data_path):
         "test_utlncf_create": {
             "base_sim_dir": "disv01b",
             "netcdf_output_file": "disv01b.in.nc",
+            "netcdf_type": "mesh2d",
         },
     }
+
+    name = "disv01b"
+    nlay = 3
+    nrow = 3
+    ncol = 3
+    delr = 10.0
+    delc = 10.0
+    top = 0
+    botm = [-10, -20, -30]
+    xoff = 100000000.0
+    yoff = 100000000.0
+    disvkwargs = get_disv_kwargs(nlay, nrow, ncol, delr, delc, top, botm, xoff, yoff)
+    idomain = np.ones((nlay, nrow * ncol), dtype=int)
+    idomain[0, 1] = 0
+    disvkwargs["idomain"] = idomain
+
     ws = function_tmpdir / "ws"
     for dirname, test in tests.items():
         data_path = os.path.join(data_path_base, dirname, test["base_sim_dir"])
@@ -1255,8 +1256,40 @@ def test_utlncf_create(function_tmpdir, example_data_path):
         test_path = os.path.join(ws, f"{dirname}_test")
         shutil.copytree(data_path, base_path)
 
-        # load example
-        sim = flopy.mf6.MFSimulation.load(sim_ws=base_path)
+        # create example
+        sim = flopy.mf6.MFSimulation(
+            sim_name=name,
+            version="mf6",
+            exe_name="mf6",
+            sim_ws=ws,
+        )
+        tdis = flopy.mf6.ModflowTdis(sim, start_date_time="2041-01-01t00:00:00-05:00")
+        kwargs = {}
+        kwargs["crs"] = "EPSG:26918"
+        gwf = flopy.mf6.ModflowGwf(sim, modelname=name, **kwargs)
+        ims = flopy.mf6.ModflowIms(sim, print_option="SUMMARY")
+        disv = flopy.mf6.ModflowGwfdisv(gwf, **disvkwargs)
+        ncf = flopy.mf6.ModflowUtlncf(
+            disv,
+            deflate=9,
+            shuffle=True,
+            chunk_time=1,
+            chunk_face=3,
+            filename=f"{name}.disv.ncf",
+        )
+        ic = flopy.mf6.ModflowGwfic(gwf, strt=0.0)
+        npf = flopy.mf6.ModflowGwfnpf(gwf)
+        spd = {0: [[(0, 0), 1.0], [(0, nrow * ncol - 1), 0.0]]}
+        chd = flopy.mf6.modflow.mfgwfchd.ModflowGwfchd(gwf, stress_period_data=spd)
+        oc = flopy.mf6.ModflowGwfoc(
+            gwf,
+            head_filerecord=f"{name}.hds",
+            saverecord=[("HEAD", "ALL")],
+        )
+
+        # set path and write simulation
+        sim.set_sim_path(test_path)
+        sim.write_simulation(netcdf=test["netcdf_type"])
 
         # set simulation path and write simulation
         sim.set_sim_path(test_path)

examples/data/mf6/netcdf/test_utlncf_create/disv01b/disv01b.chd

@@ -610,10 +610,9 @@ def store_internal(
                 ):
                     layer_list.append(index)
             if (
-                #TODO NETCDF-DEV improve
-                len(layer_list) == 1
+                storage.netcdf
+                and len(layer_list) == 1
                 and layer_list[0] == 0
-                and storage.netcdf
             ):
                 layer_list[0] = -1
         else:
@@ -957,9 +956,6 @@ def _set_data(
                     else:
                         layer_data = aux_var_data
                     try:
-                        #NETCDF-DEV
-                        if storage.netcdf:
-                            multiplier = 1.0
                         storage.set_data(
                             layer_data,
                             [layer],
@@ -1076,7 +1072,6 @@ def load(
         nc_dataset=None
         if self.structure.netcdf:
             if (
-                # TODO use util splitting method e.g. see mffileaccess #NETCDF-DEV
                 hasattr(self._model_or_sim, "_nc_dataset")
                 and len(first_line.split()) > 1
                 and first_line.split()[1].lower() == "netcdf"
@@ -1625,7 +1620,7 @@ def plot(
     def _set_storage_netcdf(self, nc_dataset, create=False):
         if create:
             # add array to netcdf dataset
-            # TODO: fix, this won't work for multi-packages #NETCDF-DEV
+            # TODO: update to use pname for (stress) multi-packages
             nc_dataset.create_array(
                 self.structure.get_package(),
                 self.structure.name.lower(),

examples/data/mf6/netcdf/test_utlncf_create/disv01b/disv01b.disv

@@ -2011,7 +2011,6 @@ def external_to_internal(
                     self._model_or_sim.modeldiscrit,
                 )[0]
             elif self.layer_storage[layer].nc_dataset is not None:
-                # TODO: ensure multiplier only set by open/close #NETCDF-DEV
                 data_out = (
                     file_access.read_netcdf_array(
                         self.layer_storage[layer].nc_dataset,

examples/data/mf6/netcdf/test_utlncf_create/disv01b/disv01b.disv.ncf

@@ -934,21 +934,18 @@ def load_base(
             if nc_filerecord:
                 from ..utils.model_netcdf import open_dataset
 
-                dis_str = {
+                grid_str = {
                     "dis6": "structured",
                     "disv6": "vertex",
-                    #"disu6": "unstructured",
                 }
                 dis_type = None
                 for t in instance.name_file.packages.get_data():
                     if t[0].lower().startswith("dis"):
                         dis_type = t[0].lower()
                         break
-                if dis_type and dis_type in dis_str:
+                if dis_type and dis_type in grid_str:
                     nc_fpth = os.path.join(instance.model_ws, nc_filerecord[0][0])
-                    # TODO: verify a partial dataset (not all griddata vars) don't
-                    #       break everything
-                    instance._nc_dataset = open_dataset(nc_fpth, dis_type=dis_str[dis_type])
+                    instance._nc_dataset = open_dataset(nc_fpth, grid_type=grid_str[dis_type])
                 else:
                     message = (
                         "Invalid discretization type "