testone is working in cmip7 account

Author: jedwards4b

cmip7_prep/cmor_writer.py

@@ -9,7 +9,6 @@
 
 from contextlib import AbstractContextManager, contextmanager
 from pathlib import Path
-
 import re
 import types
 import warnings
@@ -407,20 +406,20 @@ def __init__(
         # NEW: one log per run (session)
         log_dir: Path | str | None = None,
         log_name: str | None = None,
-        outdir: Path,
+        outdir: Path | str | None = None,
     ) -> None:
         self.tables_path = Path(tables_path)
         self.dataset_attrs = dict(dataset_attrs or {})
         self.dataset_json = dataset_json
-        self._dataset_json_path = None
         self._dataset_json_cm = None
         self.tracking_prefix = tracking_prefix
         # logging config
         self._log_dir = Path(log_dir) if log_dir is not None else None
         self._log_name = log_name
         self._log_path: Path | None = None
         self._pending_ps = None
-        self._outdir = outdir
+        self._outdir = Path(outdir) if outdir is not None else Path.cwd() / "CMIP7"
+        self._outdir.mkdir(parents=True, exist_ok=True)
 
     def __enter__(self) -> "CmorSession":
         # Resolve logfile path if requested
@@ -429,7 +428,7 @@ 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 logs to {self._log_path}")
+        print(f"Creating CMOR data with Tables path {self.tables_path}")
 
         # Setup CMOR; pass logfile if CMOR supports it, else fall back
         try:
@@ -478,9 +477,9 @@ def __enter__(self) -> "CmorSession":
             # caller passed a context manager directly
             self._dataset_json_cm = dj
             p = dj.__enter__()  # ← ENTER the CM, get a Path
-        self._dataset_json_path = str(p)
-        cmor.set_cur_dataset_attribute("outpath", self._outdir)
-
+        cmor.dataset_json(str(p))
+        cmor.set_cur_dataset_attribute("outpath", str(self._outdir))
+        print(f"outpath set to {self._outdir}")
         try:
             prod = cmor.get_cur_dataset_attribute("product")  # type: ignore[attr-defined]
         except Exception:  # pylint: disable=broad-except
@@ -772,7 +771,7 @@ 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]
@@ -786,13 +785,6 @@ def write_variable(
             positive=getattr(vdef, "positive", None),
             missing_value=fillv,
         )
-        # Optional variable attributes (e.g., cell_methods, long_name, standard_name)
-        if getattr(vdef, "cell_methods", None):
-            cmor.set_variable_attribute(var_id, "cell_methods", vdef.cell_methods)
-        if getattr(vdef, "long_name", None):
-            cmor.set_variable_attribute(var_id, "long_name", vdef.long_name)
-        if getattr(vdef, "standard_name", None):
-            cmor.set_variable_attribute(var_id, "standard_name", vdef.standard_name)
         data = ds[varname]
 
         # ---- Prepare time info for this write (local, not cached) ----
@@ -827,7 +819,6 @@ def write_variable(
                 cmor.write(ps_id, np.asarray(ps_filled), store_with=var_id)
             self._pending_ps = None
         outdir = Path(cmor.get_cur_dataset_attribute("outpath"))
-        outdir.mkdir(parents=True, exist_ok=True)
         outfile = outdir / f"{getattr(vdef, 'name', varname)}.nc"
         cmor.close(var_id, file_name=str(outfile))
 

cmip7_prep/data/cmor_dataset.json

@@ -1,13 +1,13 @@
 {
-  "mip_era": "CMIP6",
+  "mip_era": "CMIP7",
   "activity_id": "CMIP",
   "institution_id": "NCAR",
   "institution": "National Center for Atmospheric Research, Climate and Global Dynamics Laboratory, 1850 Table Mesa Drive, Boulder, CO 80305, USA",
   "contact": "[email protected]",
     "product": "model-output",
 
   "source_id": "CESM2",
-  "source": "CESM2 (2025): atmosphere: CAM; ocean: MOM; sea ice: CICE5; land: CTSM; aerosol: MAM4; coupler: CMEPS.",
+  "source": "CESM3 (2025): atmosphere: CAM; ocean: MOM; sea ice: CICE6; land: CTSM; aerosol: MAM4; coupler: CMEPS.",
   "source_type": "AOGCM",
   "nominal_resolution": "100 km",
 
@@ -28,8 +28,9 @@
 
   "grid_label": "gr",
 
-  "title": "CESM2 piControl on 1x1 degree grid (regridded)",
-  "references": "See CESM2 documentation and CMIP6 references for NCAR/CGD.",
+  "title": "CESM3 piControl on 1x1 degree grid (regridded from ne30np3 se grid)",
+  "references": "See CESM3 documentation and CMIP7 references for NCAR/CGD.",
+  "outpath": ".",
   "output_path_template": "<mip_era><activity_id><institution_id><source_id><experiment_id><_member_id><table><variable_id><grid_label>",
     "output_file_template": "<variable_id><table><source_id><experiment_id><run_variant><grid_label>"
 }

scripts/testone.py

@@ -11,7 +11,7 @@
     scratch
     + "/archive/timeseries/b.e30_beta06.B1850C_LTso.ne30_t232_wgx3.192.wrkflw.1/atm/hist/"
 )
-TABLES = "/glade/work/cmip7/e3sm_to_cmip/cmip6-cmor-tables/Tables"
+TABLES = Path("/glade/work/cmip7/e3sm_to_cmip/cmip6-cmor-tables/Tables")
 
 # 0) Load mapping (uses packaged data/cesm_to_cmip7.yaml by default)
 mapping = Mapping.from_packaged_default()
@@ -76,8 +76,7 @@
             "levels": cfg.get("levels", None),
         },
     )()
-
     # Your writer expects a dataset with varname present:
-    cm.write_variable(ds_cmor, varname, vdef, outdir=OUTDIR)
+    cm.write_variable(ds_cmor, varname, vdef)
 
 print("ok")

tests/test_cmor_writer_load_table.py

@@ -37,10 +37,12 @@ def test_write_variable_loads_basename_table_and_defines_axes(fake_cmor, tmp_pat
         cw.CmurSession
         if False
         else cw.CmorSession(
-            tables_path=tables_path, dataset_attrs={"institution_id": "NCAR"}
+            tables_path=tables_path,
+            dataset_attrs={"institution_id": "NCAR"},
+            outdir=outdir,
         )
     ) as cm:  # noqa: E701
-        cm.write_variable(ds, "tas", vdef, outdir=outdir)
+        cm.write_variable(ds, "tas", vdef)
 
     # Table basename should be used (resolved by inpath)
     assert fake.last_table == "Amon.json"