Merge branch 'scn20-46'

Author: nwagenbrenner

autotest/CMakeLists.txt

@@ -238,6 +238,8 @@ if(WITH_NOMADS_SUPPORT)
              ${EXECUTABLE_OUTPUT_PATH}/test_main --run_test=simplenomadsclient/download_1 alaska hrrr_alaska 1 2 0 zip)
     add_test(nomads_hrrr_15_hour_zip
              ${EXECUTABLE_OUTPUT_PATH}/test_main --run_test=simplenomadsclient/download_1 mackay hrrr_conus 15 16 0 zip)
+    add_test(nomads_hrrr_ext_1_hour_zip
+             ${EXECUTABLE_OUTPUT_PATH}/test_main --run_test=simplenomadsclient/download_1 mackay hrrr_conus_ext 1 2 0 zip)
     add_test(nomads_buffer_1
              ${EXECUTABLE_OUTPUT_PATH}/test_main --run_test=simplenomadsclient/download_1 small gfs_global 1 2 0 zip)
     if(NOMADS_EXPER_FORECASTS)

src/ninja/nomads.h

@@ -591,6 +591,46 @@ static const char *apszNomadsKeys[][11] =
       "3 km",
       "HRRR ALASKA SUBHOURLY" },
     /*
+    ** HRRR Conus Extended
+    ** SCN20-46 adds some extened cycles to HRRR and RAP:
+    ** https://www.weather.gov/media/notification/pdf2/scn20-46rap_v5_hrrr_v4_aab.pdf
+    **
+    ** The HRRR-*-EXT and RAP-*-EXT handle these models.
+    */
+    {
+      "hrrr_conus_ext",
+      "filter_hrrr_2d.pl",
+      "hrrr.t%02dz.wrfsfcf%02d.grib2",
+      "hrrr.%s/conus",
+      NOMADS_GENERIC_DATE,
+      NOMADS_GENERIC_FCST_HOURS,
+      "0:48:1",
+      NOMADS_GENERIC_VAR_LIST,
+      "2_m_above_ground,10_m_above_ground," \
+      "entire_atmosphere",
+      "3 km",
+      "HRRR CONUS EXT" },
+    /*
+    ** RAP Extended
+    */
+    {
+      "rap_conus_ext",
+      "filter_rap.pl",
+      "rap.t%02dz.awp130pgrbf%02d.grib2",
+      "rap.%s",
+      NOMADS_GENERIC_DATE,
+      "3:21:3",
+      "0:51:1",
+      NOMADS_GENERIC_VAR_LIST,
+      /*
+      ** The August 2016 TIN changed the level for cloud cover to
+      ** entire_atmosphere.  Request both levels so if they change it, we won't
+      ** fail.
+      */
+      NOMADS_GENERIC_LEVELS_LIST ",entire_atmosphere",
+      "13 km",
+      "RAP CONUS EXT" },
+    /*
     ** RAP
     */
     {