cleanup

Author: jedwards4b

cmip7_prep/pipeline.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 from typing import Optional, Sequence, Union, Dict, List
 import re
-from venv import logger
+import logging
 import warnings
 import glob
 import sys
@@ -16,7 +16,7 @@
 from .regrid import regrid_to_1deg_ds
 from .vertical import to_plev19
 
-
+logger = logging.getLogger(__name__)
 # --------------------------- file discovery ---------------------------
 
 _VAR_TOKEN = re.compile(r"(?<![A-Za-z0-9_])([A-Za-z0-9_]+)(?![A-Za-z0-9_])")
@@ -222,7 +222,7 @@ def realize_regrid_prepare(
         ds_native = open_native_for_cmip_vars(
             [cmip_var], ds_or_glob, mapping, **open_kwargs
         )
-    if not "landfrac" in ds_native and not "ncol" in ds_native:
+    if "landfrac" not in ds_native and "ncol" not in ds_native:
         logger.info("Variable has no 'landfrac' or 'ncol' dim; assuming ocn variable.")
         # Add MOM6 grid info if provided
         if mom6_grid:
@@ -234,10 +234,8 @@ def realize_regrid_prepare(
 
         else:
             logger.error("No MOM6 grid info provided; geolat/geolon not added.")
-            return (
-                cmip_var,
-                f"ERROR: MOM6 grid information is required for variable {cmip_var} "
-                "but was not provided.",
+            raise ValueError(
+                f"MOM6 grid information is required for variable {cmip_var} but was not provided."
             )
     # 2) Realize the target variable
     ds_v = mapping.realize(ds_native, cmip_var)

cmip7_prep/regrid.py

@@ -511,7 +511,7 @@ def regrid_to_1deg_ds(
         force_method="conservative",
         realm=realm,
     )  # fx always conservative
-    print(f"using fx map: {spec.path}")
+    logger.info("using fx map: %s", spec.path)
     ds_fx = _regrid_fx_once(spec.path, ds_in)  # ← uses cache
     if ds_fx:
         # Don’t overwrite if user already computed and passed them in
@@ -620,8 +620,12 @@ def regrid_to_1deg(
         force_method=method,
         realm=realm,
     )
-    print(
-        f"Regridding {varname} using {spec.method_label} map: {spec.path} for realm {realm}"
+    logger.info(
+        "Regridding %s using %s map: %s for realm %s",
+        varname,
+        spec.method_label,
+        spec.path,
+        realm,
     )
     regridder = _RegridderCache.get(spec.path, spec.method_label)
 
@@ -642,11 +646,15 @@ def regrid_to_1deg(
             *non_spatial, "lon", "lat"
         )
         da2_2d = da2_2d.assign_coords(lon=((da2_2d.lon % 360)))
-    print(
-        f"da2_2d range: {da2_2d['lat'].min().item()} to {da2_2d['lat'].max().item()} lat, "
-        f"{da2_2d['lon'].min().item()} to {da2_2d['lon'].max().item()} lon"
+    logger.info(
+        "da2_2d range: %f to %f lat, %f to %f lon",
+        da2_2d["lat"].min().item(),
+        da2_2d["lat"].max().item(),
+        da2_2d["lon"].min().item(),
+        da2_2d["lon"].max().item(),
     )
-    if hdim == "lndgrid":
+
+    if realm == "lnd":
         out_norm = regridder(da2_2d, **kwargs)
         out = _denormalize_land_field(out_norm, ds_in, spec.path)
     else:

scripts/monthly_cmor.py

@@ -244,7 +244,7 @@ def _extract_array(val):
                 f"Exception while processing {varname} with dims {dims}: {e!r}"
             )
             results.append((varname, f"ERROR: {e!r}"))
-    return results if len(results) > 1 else results[0]
+    return results
 
 
 process_one_var_delayed = delayed(process_one_var)