fullamon working now

Author: jedwards4b

.github/workflows/pylint.yml

@@ -91,8 +91,7 @@ jobs:
           ESMF_ROOT: ${{ env.ESMF_ROOT }}
           LD_LIBRARY_PATH: ${{ env.ESMF_INSTALL_PREFIX }}/lib:${{ env.LD_LIBRARY_PATH }}
         run: |
-          poetry run python -m pip  --no-build-isolation --no-deps \
-      "git+https://github.com/esmf-org/[email protected]#subdirectory=src/addon/ESMPy"
+          poetry run python -m pip  --no-build-isolation --no-deps "git+https://github.com/esmf-org/[email protected]#subdirectory=src/addon/ESMPy"
           poetry run python -m pip install xesmf dask
       - name: Cache virtualenv
         uses: actions/cache@v4

cmip7_prep/cmor_writer.py

@@ -360,6 +360,7 @@ def _sigma_mid_and_bounds(
         raise ValueError(f"sigma mid {mid} not monotonic.")
     if not is_strictly_monotonic(bnds):
         raise ValueError(f"sigma bounds {bnds} not monotonic.")
+
     return mid, bnds
 
 
@@ -430,7 +431,6 @@ def __enter__(self) -> "CmorSession":
             fname = self._log_name or f"cmor_{ts}.log"
             self._log_dir.mkdir(parents=True, exist_ok=True)
             self._log_path = (self._log_dir / fname).resolve()
-        print(f"Creating CMOR data with Tables path {self.tables_path}")
 
         # Setup CMOR; pass logfile if CMOR supports it, else fall back
         try:
@@ -779,7 +779,6 @@ def write_variable(
         )
 
         table_filename = _resolve_table_filename(self.tables_path, table_key)
-        print(f"table_filename is {table_filename} table_key {table_key}")
         cmor.load_table(table_filename)
 
         data = ds[vdef.name]

cmip7_prep/data/cesm_to_cmip7.yaml

@@ -28,10 +28,6 @@ variables:
       units: "1"
       src_axis_name: lev                 # model midlevel dimension
       src_axis_bnds: ilev                # model interface/bounds dim (if you ever need it)
-      hyam: hyam                         # 1D (lev,)
-      hybm: hybm                         # 1D (lev,)
-      ps: PS                             # (time, lat, lon) — regridded with the rest
-      p0: P0                             # scalar (Pa); default to 100000 if missing
     sources:
       - cesm_var: CLOUD
   cli:
@@ -307,6 +303,7 @@ variables:
     units: "W m-2"
     dims: [time, lat, lon]
     formula: SOLIN - FSNTOAC
+    positive: up
     sources:
       - cesm_var: SOLIN
       - cesm_var: FSNTOAC

cmip7_prep/pipeline.py

@@ -246,7 +246,11 @@ def realize_regrid_prepare(
 
     # 7) If hybrid: merge in 1-D hybrid coefficients directly from native (no regridding needed)
     if is_hybrid:
-        aux = [nm for nm in ("hyam", "hybm", "P0", "ilev", "lev") if nm in ds_native]
+        aux = [
+            nm
+            for nm in ("hyai", "hybi", "hyam", "hybm", "P0", "ilev", "lev")
+            if nm in ds_native
+        ]
         if aux:
             ds_regr = ds_regr.merge(ds_native[aux], compat="override")
 

scripts/atm_monthly.py

@@ -67,6 +67,7 @@ def process_one_var(varname: str) -> tuple[str, str]:
             log_dir=log_dir,
             log_name=f"cmor_{datetime.now(UTC).strftime('%Y%m%dT%H%M%SZ')}_{varname}.log",
             dataset_attrs={"institution_id": "NCAR"},  # plus your other attrs if needed
+            outdir=OUTDIR,
         ) as cm:
             # vdef from mapping cfg
             cfg = mapping.get_cfg(varname)
@@ -87,7 +88,7 @@ def process_one_var(varname: str) -> tuple[str, str]:
             )()
 
             # Your writer expects a dataset with varname present:
-            cm.write_variable(ds_cmor, varname, vdef, outdir=OUTDIR)
+            cm.write_variable(ds_cmor, varname, vdef)
 
         return (varname, "ok")
     except Exception as e:  # keep task alive; report failure

scripts/testone.py

@@ -17,7 +17,7 @@
 mapping = Mapping.from_packaged_default()
 OUTDIR = scratch + "/CMIP7"
 
-cmip_vars = ["tas"]
+cmip_vars = ["cl"]
 
 ds_native, cmip_vars = open_native_for_cmip_vars(
     cmip_vars,