Merge branch 'develop' into feature/4d_data

.github/workflows/unit_tests.yaml

@@ -22,6 +22,10 @@ jobs:
         - name: Install Python packages
           run: pip3 install .[test]
 
+        - name: prepare input eta files
+          run: |
+            python tests/grid/generate_eta_files.py
+
         - name: Run serial-cpu tests
           run: coverage run --rcfile=setup.cfg -m pytest -x tests
 

ndsl/grid/eta.py

@@ -30,10 +30,8 @@ class HybridPressureCoefficients:
 
 
 def _load_ak_bk_from_file(eta_file: str) -> Tuple[np.ndarray, np.ndarray]:
-    if eta_file == "None":
-        raise ValueError("eta file not specified")
     if not os.path.isfile(eta_file):
-        raise ValueError("file " + eta_file + " does not exist")
+        raise ValueError(f"eta file {eta_file} does not exist")
 
     # read file into ak, bk arrays
     data = xr.open_dataset(eta_file)

ndsl/grid/generation.py

@@ -237,7 +237,7 @@ def __init__(
         dy_const: float = 1000.0,
         deglat: float = 15.0,
         extdgrid: bool = False,
-        eta_file: str = "None",
+        eta_file: Optional[str] = None,
         ak: Optional[np.ndarray] = None,
         bk: Optional[np.ndarray] = None,
     ):
@@ -297,12 +297,34 @@ def __init__(
         self._dy_center = None
         self._area = None
         self._area_c = None
-        (
-            self._ks,
-            self._ptop,
-            self._ak,
-            self._bk,
-        ) = self._set_hybrid_pressure_coefficients(eta_file, ak, bk)
+        if eta_file is not None:
+            (
+                self._ks,
+                self._ptop,
+                self._ak,
+                self._bk,
+            ) = self._set_hybrid_pressure_coefficients(eta_file, ak, bk)
+        else:
+            self._ks = self.quantity_factory.zeros(
+                [],
+                "",
+                dtype=Float,
+            )
+            self._ptop = self.quantity_factory.zeros(
+                [],
+                "Pa",
+                dtype=Float,
+            )
+            self._ak = self.quantity_factory.zeros(
+                [Z_INTERFACE_DIM],
+                "Pa",
+                dtype=Float,
+            )
+            self._bk = self.quantity_factory.zeros(
+                [Z_INTERFACE_DIM],
+                "",
+                dtype=Float,
+            )
         self._ec1 = None
         self._ec2 = None
         self._ew1 = None

ndsl/stencils/corners.py

@@ -1003,6 +1003,7 @@ def fill_corners_dgrid_defn(
     with computation(PARALLEL), interval(...):
         # this line of code is used to fix the missing symbol crash due to the node visitor depth limitation
         acoef = mysign
+        x_out = x_out
         # sw corner
         with horizontal(region[i_start - 1, j_start - 1]):
             x_out = mysign * y_in[0, 1, 0]

ndsl/stencils/testing/test_translate.py

@@ -210,13 +210,19 @@ def test_sequential_savepoint(
                     near_zero=case.testobj.near_zero,
                 )
             if not metric.check:
+                os.makedirs(OUTDIR, exist_ok=True)
+                log_filename = os.path.join(
+                    OUTDIR,
+                    f"details-{case.savepoint_name}-{varname}-rank{case.rank}.log",
+                )
+                metric.report(log_filename)
                 pytest.fail(str(metric), pytrace=False)
             passing_names.append(failing_names.pop())
         ref_data_out[varname] = [ref_data]
     if len(failing_names) > 0:
         get_thresholds(case.testobj, input_data=original_input_data)
         os.makedirs(OUTDIR, exist_ok=True)
-        out_filename = os.path.join(OUTDIR, f"translate-{case.savepoint_name}.nc")
+        nc_filename = os.path.join(OUTDIR, f"translate-{case.savepoint_name}.nc")
         input_data_on_host = {}
         for key, _input in input_data.items():
             input_data_on_host[key] = gt_utils.asarray(_input)
@@ -226,7 +232,7 @@ def test_sequential_savepoint(
             [output],
             ref_data_out,
             failing_names,
-            out_filename,
+            nc_filename,
         )
     if failing_names != []:
         pytest.fail(
@@ -353,11 +359,16 @@ def test_parallel_savepoint(
                     near_zero=case.testobj.near_zero,
                 )
             if not metric.check:
+                os.makedirs(OUTDIR, exist_ok=True)
+                log_filename = os.path.join(
+                    OUTDIR, f"details-{case.savepoint_name}-{varname}.log"
+                )
+                metric.report(log_filename)
                 pytest.fail(str(metric), pytrace=False)
             passing_names.append(failing_names.pop())
     if len(failing_names) > 0:
         os.makedirs(OUTDIR, exist_ok=True)
-        out_filename = os.path.join(
+        nct_filename = os.path.join(
             OUTDIR, f"translate-{case.savepoint_name}-{case.grid.rank}.nc"
         )
         try:
@@ -370,7 +381,7 @@ def test_parallel_savepoint(
                 [output],
                 ref_data,
                 failing_names,
-                out_filename,
+                nct_filename,
             )
         except Exception as error:
             print(f"TestParallel SaveNetCDF Error: {error}")

ndsl/stencils/testing/translate.py

@@ -178,6 +178,8 @@ def make_storage_data_input_vars(self, inputs, storage_vars=None, dict_4d=True):
         for p in self.in_vars["parameters"]:
             if type(inputs_in[p]) in [np.int64, np.int32]:
                 inputs_out[p] = int(inputs_in[p])
+            elif type(inputs_in[p]) is bool:
+                inputs_out[p] == inputs_in[p]
             else:
                 inputs_out[p] = Float(inputs_in[p])
         for d, info in storage_vars.items():