Merge pull request #205 from USDA-ARS-NWRC/drop_hrrr_forecast_flag

HRRR - drop experimental config option 'hrrr_forecast_flag'
USDA-ARS-NWRC · Apr 22, 2021 · 024be6e · 024be6e
2 parents 1c4c0f6 + b7cc703
commit 024be6e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 15 deletions.
diff --git a/smrf/framework/CoreConfig.ini b/smrf/framework/CoreConfig.ini
@@ -64,7 +64,7 @@ time_zone:
 default = UTC,
 type = RawString,
 description =  Case sensitive time zone for all times provided and how the model will be run. See
-                pytz docs for information on what is accepted. Full list can be found 
+                pytz docs for information on what is accepted. Full list can be found
                 en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
 ################################################################################
@@ -116,11 +116,6 @@ default = hrrr_grib,
 options = [wrf hrrr_grib netcdf],
 description = Type of gridded input data
 
-hrrr_forecast_flag:
-default = False,
-type = bool,
-description = True if the HRRR data is a forecast
-
 hrrr_directory:
 default = None,
 type = CriticalDirectory,
@@ -1172,7 +1167,7 @@ description = Format to use for outputting data.
 netcdf_output_precision:
 default = float,
 options = [float double],
-description = NetCDF variable output precision for float (32-bit) or double (64-bit) 
+description = NetCDF variable output precision for float (32-bit) or double (64-bit)
 
 input_backup:  default = true,
 type = bool,

diff --git a/smrf/framework/model_framework.py b/smrf/framework/model_framework.py
@@ -160,8 +160,6 @@ def __init__(self, config, external_logger=None):
         if 'gridded' in self.config:
             self.gridded = True
             if self.config['gridded']['data_type'] in ['hrrr_grib']:
-                self.forecast_flag = \
-                    self.config['gridded']['hrrr_forecast_flag']
                 self.hrrr_data_timestep = \
                     self.config['gridded']['hrrr_load_method'] == 'timestep'
 

diff --git a/smrf/framework/recipes.ini b/smrf/framework/recipes.ini
@@ -287,22 +287,21 @@ trigger:
 
 gridded:
     wrf_file = default,
-    remove_item = [hrrr_directory netcdf_file hrrr_forecast_flag]
+    remove_item = [hrrr_directory netcdf_file]
 
 [grib_recipe]
 trigger:
   has_value = [gridded data_type hrrr_grib]
 
 gridded:
   remove_item = [wrf_file netcdf_file],
-  hrrr_forecast_flag = default
 
 [generic_gridded_nc_recipe]
 trigger:
   has_value = [gridded data_type netcdf]
 
 gridded:
-  remove_item = [wrf_file hrrr_directory hrrr_forecast_flag hrrr_load_method]
+  remove_item = [wrf_file hrrr_directory hrrr_load_method]
 
 [dk_recipe]
 trigger:
@@ -355,4 +354,4 @@ trigger:
   has_value = [wind wind_model wind_ninja]
 
 wind:
-  remove_item = [distribution grid_method grid_local grid_mask grid_local_n]
+  remove_item = [distribution grid_method grid_local grid_mask grid_local_n]
diff --git a/smrf/tests/basins/Lakes/gold_hrrr/gold_config.ini b/smrf/tests/basins/Lakes/gold_hrrr/gold_config.ini
@@ -38,7 +38,6 @@ time_zone:                     utc
 
 [gridded]
 data_type:                     hrrr_grib
-hrrr_forecast_flag:            False
 hrrr_directory:                ../input
 
 ################################################################################

diff --git a/smrf/tests/basins/RME/gold_hrrr/gold_config.ini b/smrf/tests/basins/RME/gold_hrrr/gold_config.ini
@@ -38,7 +38,6 @@ time_zone:                     utc
 
 [gridded]
 data_type:                     hrrr_grib
-hrrr_forecast_flag:            False
 hrrr_directory:                ../gridded/hrrr_test
 
 ################################################################################