Merge pull request #206 from USDA-ARS-NWRC/WFR_0.7

Weather Forecast Retrieval - Update to v0.7

requirements.txt

@@ -8,7 +8,7 @@ scipy>=1.0.0,<1.5.0
 utm==0.4.0
 pykrige>=1.5.0
 spatialnc>=0.2.12
-weather-forecast-retrieval>=0.6.12
+weather-forecast-retrieval>=0.7
 topocalc>=0.5
 setuptools_scm<4.2
 xarray>=0.15,<0.16

smrf/data/hrrr_grib.py

@@ -1,6 +1,6 @@
 import numpy as np
 import pandas as pd
-from weather_forecast_retrieval.hrrr import HRRR
+import weather_forecast_retrieval.data.hrrr as hrrr_data
 
 from smrf.data.gridded_input import GriddedInput
 from smrf.envphys.solar.cloud import get_hrrr_cloud
@@ -55,14 +55,15 @@ def load(self):
             self.config['hrrr_directory']
         ))
 
-        metadata, data = HRRR(external_logger=self._logger).\
-            get_saved_data(
-                self.start_date,
-                self.end_date,
-                self.bbox,
-                output_dir=self.config['hrrr_directory'],
-                force_zone_number=self.topo.zone_number
-            )
+        metadata, data = hrrr_data.FileLoader(
+            file_dir=self.config['hrrr_directory'],
+            external_logger=self._logger
+        ).get_saved_data(
+            self.start_date,
+            self.end_date,
+            self.bbox,
+            force_zone_number=self.topo.zone_number
+        )
 
         self.parse_data(metadata, data)