update granulation list to avoid looping over seasons; fix viewer

Author: chengzhuzhang

e3sm_diags/parameter/lat_lon_native_parameter.py

@@ -131,9 +131,9 @@ def _set_time_slice_attrs(self, test_ds, ref_ds, time_slice: str):
         time_slice : str
             The time slice specification.
         """
-        # Use the time slice as the "season" for naming purposes
-        # This ensures compatibility with existing file naming conventions
-        self.current_set = time_slice
+        # Store the time slice info but keep current_set as the diagnostic set name
+        # current_set should remain as "lat_lon_native" for proper directory structure
+        # The time slice will be used in filename generation via other attributes
 
         # Set the time slice info for potential use in plotting/output
         self.current_time_slice = time_slice

e3sm_diags/parser/core_parser.py

@@ -1031,7 +1031,19 @@ def _granulate(self, parameters):
                 delattr(param, module)
 
             # Granulate param.
-            vars_to_granulate = param.granulate  # Ex: ['seasons', 'plevs']
+            vars_to_granulate = param.granulate.copy()  # Ex: ['seasons', 'plevs']
+
+            # Special handling for lat_lon_native: if time_slices is specified, remove seasons from granulation
+            if (
+                hasattr(param, "time_slices")
+                and hasattr(param, "seasons")
+                and len(param.time_slices) > 0
+                and "seasons" in vars_to_granulate
+            ):
+                vars_to_granulate.remove("seasons")
+                # Also clear default seasons to avoid conflicts
+                param.seasons = []
+
             # Check that all of the vars_to_granulate are iterables.
             # Ex: {'season': ['ANN', 'DJF', 'MAM'], 'plevs': [850.0, 250.0]}
             vals_to_granulate = collections.OrderedDict()

e3sm_diags/viewer/default_viewer.py

@@ -59,7 +59,7 @@
 ]
 
 
-def create_viewer(root_dir, parameters):
+def create_viewer(root_dir, parameters):  # noqa: C901
     """
     Given a set of parameters for a certain set of diagnostics,
     create a single page.
@@ -99,7 +99,16 @@ def create_viewer(root_dir, parameters):
         #   ref_name-variable-plev'mb'-season-region
         ref_name = getattr(parameter, "ref_name", "")
         for var in parameter.variables:
-            for season in parameter.seasons:
+            # Handle either seasons or time_slices
+            time_periods = (
+                parameter.time_slices
+                if (
+                    hasattr(parameter, "time_slices") and len(parameter.time_slices) > 0
+                )
+                else parameter.seasons
+            )
+
+            for season in time_periods:
                 for region in parameter.regions:
                     # Since some parameters have plevs, there might be
                     # more than one row_name, filename pair.
@@ -177,10 +186,25 @@ def create_viewer(root_dir, parameters):
                             "..", "{}".format(set_name), parameter.case_id, fnm
                         )
                         print(
-                            os.path.join(
+                            f"DEBUG VIEWER: var={var}, season={season}, region={region}"
+                        )
+                        print(f"DEBUG VIEWER: fnm={fnm}")
+                        print(
+                            "DEBUG VIEWER: expected_path="
+                            + os.path.join(
                                 "..", "{}".format(set_name), parameter.case_id, fnm
                             )
                         )
+
+                        # Check what files actually exist
+                        actual_dir = os.path.join(
+                            parameter.results_dir, set_name, parameter.case_id
+                        )
+                        if os.path.exists(actual_dir):
+                            actual_files = os.listdir(actual_dir)
+                            print(f"DEBUG VIEWER: actual files: {actual_files}")
+                        else:
+                            print(f"DEBUG VIEWER: directory missing: {actual_dir}")
                         ROW_INFO[set_name][parameter.case_id][row_name][season][
                             "metadata"
                         ] = create_metadata(parameter)
@@ -224,11 +248,28 @@ def create_viewer(root_dir, parameters):
 
 def seasons_used(parameters):
     """
-    Get a list of the seasons used for this set of parameters.
+    Get a list of the seasons/time_slices used for this set of parameters.
+    Supports either seasons OR time_slices (mutually exclusive).
     """
-    seasons_used = set([s for p in parameters for s in p.seasons])
-    # Make sure this list is ordered by SEASONS.
-    return [season for season in SEASONS if season in seasons_used]
+    # Check if any parameter uses time_slices
+    uses_time_slices = any(
+        hasattr(p, "time_slices") and len(p.time_slices) > 0 for p in parameters
+    )
+
+    if uses_time_slices:
+        # Collect all time slices
+        time_slices_used = set()
+        for p in parameters:
+            if hasattr(p, "time_slices"):
+                time_slices_used.update(p.time_slices)
+
+        # Sort time slices for consistent ordering
+        return sorted(time_slices_used)
+    else:
+        # Use standard seasons logic
+        seasons_used = set([s for p in parameters for s in p.seasons])
+        # Make sure this list is ordered by SEASONS.
+        return [season for season in SEASONS if season in seasons_used]
 
 
 def _get_description(var, parameters):