Merge pull request #1132 from PCMDI/zhan391

Bug fix for the mean_climate and varibility_mode drivers
PCMDI · Sep 21, 2024 · 2aa8d00 · 2aa8d00
2 parents fd17646 + 0e69789
commit 2aa8d00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pcmdi_metrics/mean_climate/mean_climate_driver.py b/pcmdi_metrics/mean_climate/mean_climate_driver.py
@@ -167,7 +167,9 @@
     result_dict["Variable"] = dict()
     result_dict["Variable"]["id"] = varname
     if level is not None:
-        result_dict["Variable"]["level"] = level * 100  # hPa to Pa
+        result_dict["Variable"][
+            "level"
+        ] = level  # SZhang: should not "* 100" here  # hPa to Pa
 
     result_dict["References"] = dict()
 

diff --git a/pcmdi_metrics/variability_mode/lib/lib_variability_mode.py b/pcmdi_metrics/variability_mode/lib/lib_variability_mode.py
@@ -142,8 +142,8 @@ def subset_time(
         eyear = int(eyear)
 
     # First trimming
-    time1 = f"{syear}-01-01 00:00:00"
-    time2 = f"{eyear}-12-{eday} 23:59:59"
+    time1 = f"{syear:04d}-01-01 00:00:00"
+    time2 = f"{eyear:04d}-12-{eday:02d} 23:59:59"
     ds = select_subset(ds, time=(time1, time2))
 
     # Check available time window and adjust again if needed
@@ -170,8 +170,8 @@ def subset_time(
 
     # Second trimming
     if adjust_time_length:
-        time1 = f"{data_syear}-01-01 00:00:00"
-        time2 = f"{data_eyear}-12-{eday} 23:59:59"
+        time1 = f"{data_syear:04d}-01-01 00:00:00"
+        time2 = f"{data_eyear:04d}-12-{eday:02d} 23:59:59"
         ds = select_subset(ds, time=(time1, time2))
 
     return ds