Merge pull request #2 from MarcelCaron-NOAA/develop

Develop
MarcelCaron-NOAA · Jan 24, 2025 · 333ded5 · 333ded5
2 parents 235fa0e + 195e0cb
commit 333ded5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/parm/hgt500_acc_timeseries.config b/parm/hgt500_acc_timeseries.config
@@ -32,7 +32,7 @@ export FCST_VALID_HOUR="0,6,12,18"
 export FCST_LEVEL="P500"
 export OBS_LEVEL="P500"
 export var_name="HGT"
-export VX_MASK_LIST="CONUS"
+export VX_MASK_LIST="NHEM"
 export FCST_LEAD="24, 48, 72, 96, 120, 144, 168, 192, 216, 240, 264, 288, 312, 336"
 export LINE_TYPE="SAL1L2"
 export INTERP="NEAREST"

diff --git a/ush/plot_util.py b/ush/plot_util.py
@@ -2740,7 +2740,7 @@ def get_rolling_mean(y_vals_metric, window_size):
     """
     # Compute rolling mean
     y_vals_rolling = pd.Series(y_vals_metric).rolling(
-        int(window_size), center=True, min_periods=1
+        int(window_size), center=True, min_periods=int(window_size)
     ).mean()
 
     # Get first and last non-NaN indices

diff --git a/ush/settings.py b/ush/settings.py
@@ -678,6 +678,10 @@ def __init__(self):
                                       'long_name': 'North America',
                                       'save_name': 'NAMR',
                                   },
+                                  'NHEM': {
+                                      'long_name': 'Northern Hemisphere',
+                                      'save_name': 'nhem',
+                                  },
                                   'NHM': {
                                       'long_name': 'Northern Hemisphere',
                                       'save_name': 'NHM',
@@ -686,10 +690,18 @@ def __init__(self):
                                       'long_name': 'North Pacific Ocean',
                                       'save_name': 'NPCF',
                                   },
+                                  'SHEM': {
+                                      'long_name': 'Southern Hemisphere',
+                                      'save_name': 'shem',
+                                  },
                                   'SHM': {
                                       'long_name': 'Southern Hemisphere',
                                       'save_name': 'SHM',
                                   },
+                                  'TROPICS': {
+                                      'long_name': 'Tropics',
+                                      'save_name': 'tropics',
+                                  },
                                   'TRP': {
                                       'long_name': 'TRP',
                                       'save_name': 'TRP',
@@ -1123,7 +1135,7 @@ def __init__(self):
                                         + ' oabar'),
                     'interp': 'NEAREST',
                     'vx_mask_list' : [
-                        'CONUS', 'CONUS_East', 'CONUS_West', 'CONUS_Central', 'CONUS_South',
+                        'NHEM', 'SHEM', 'TROPICS', 'G003', 'CONUS', 'CONUS_East', 'CONUS_West', 'CONUS_Central', 'CONUS_South',
                         'Appalachia', 'CPlains', 'DeepSouth', 'GreatBasin', 'GreatLakes', 
                         'Mezquital', 'MidAtlantic', 'NorthAtlantic', 'NPlains', 'NRockies',
                         'PacificNW', 'PacificSW', 'Prairie', 'Southeast', 'Southwest', 'SPlains', 'SRockies',
@@ -1283,7 +1295,7 @@ def __init__(self):
                                         + ' oabar'),
                     'interp': 'NEAREST',
                     'vx_mask_list' : [
-                        'CONUS', 'CONUS_East', 'CONUS_West', 'CONUS_Central', 'CONUS_South',
+                        'NHEM', 'SHEM', 'TROPICS', 'G003', 'CONUS', 'CONUS_East', 'CONUS_West', 'CONUS_Central', 'CONUS_South',
                         'Appalachia', 'CPlains', 'DeepSouth', 'GreatBasin', 'GreatLakes', 
                         'Mezquital', 'MidAtlantic', 'NorthAtlantic', 'NPlains', 'NRockies',
                         'PacificNW', 'PacificSW', 'Prairie', 'Southeast', 'Southwest', 'SPlains', 'SRockies',
@@ -1333,7 +1345,7 @@ def __init__(self):
                                         + ' obar'),
                     'interp': 'NEAREST, BILIN',
                     'vx_mask_list' : [
-                        'CONUS', 'CONUS_East', 'CONUS_West', 'CONUS_Central', 'CONUS_South',
+                        'NHEM', 'SHEM', 'TROPICS', 'G003', 'CONUS', 'CONUS_East', 'CONUS_West', 'CONUS_Central', 'CONUS_South',
                         'Appalachia', 'CPlains', 'DeepSouth', 'GreatBasin', 'GreatLakes', 
                         'Mezquital', 'MidAtlantic', 'NorthAtlantic', 'NPlains', 'NRockies',
                         'PacificNW', 'PacificSW', 'Prairie', 'Southeast', 'Southwest', 'SPlains', 'SRockies',
@@ -1520,7 +1532,7 @@ def __init__(self):
                                         + ' obar'),
                     'interp': 'NEAREST, BILIN',
                     'vx_mask_list' : [
-                        'CONUS', 'CONUS_East', 'CONUS_West', 'CONUS_Central', 'CONUS_South',
+                        'NHEM', 'SHEM', 'TROPICS', 'G003', 'CONUS', 'CONUS_East', 'CONUS_West', 'CONUS_Central', 'CONUS_South',
                         'Appalachia', 'CPlains', 'DeepSouth', 'GreatBasin', 'GreatLakes', 
                         'Mezquital', 'MidAtlantic', 'NorthAtlantic', 'NPlains', 'NRockies',
                         'PacificNW', 'PacificSW', 'Prairie', 'Southeast', 'Southwest', 'SPlains', 'SRockies',
@@ -1568,7 +1580,7 @@ def __init__(self):
                                         + ' faratio, sratio'),
                     'interp': 'NEAREST, BILIN',
                     'vx_mask_list' : [
-                        'CONUS', 'CONUS_East', 'CONUS_West', 'CONUS_Central', 'CONUS_South',
+                        'NHEM', 'SHEM', 'TROPICS', 'G003', 'CONUS', 'CONUS_East', 'CONUS_West', 'CONUS_Central', 'CONUS_South',
                         'Appalachia', 'CPlains', 'DeepSouth', 'GreatBasin', 'GreatLakes', 
                         'Mezquital', 'MidAtlantic', 'NorthAtlantic', 'NPlains', 'NRockies',
                         'PacificNW', 'PacificSW', 'Prairie', 'Southeast', 'Southwest', 'SPlains', 'SRockies',