Update UFS WM hash to main repository, add new variable FIRE_GEO_EM_FILE for specifying netCDF input filename (defaults to previous behavior)

Author: mkavulich

Externals.cfg

@@ -9,10 +9,10 @@ required = True
 
 [ufs-weather-model]
 protocol = git
-repo_url = https://github.com/mkavulich/ufs-weather-model
+repo_url = https://github.com/ufs-community/ufs-weather-model
 # Specify either a branch name or a hash but not both.
-branch = feature/fire_MPI
-#hash = 855243a
+#branch = develop
+hash = 0de77d26
 local_path = sorc/ufs-weather-model
 required = True
 

scripts/exregional_run_fcst.sh

@@ -831,7 +831,7 @@ if [ $(boolify "${UFS_FIRE}") = "TRUE" ]; then
 $settings"
   fi
   # Link fire input file
-  create_symlink_to_file ${FIRE_INPUT_DIR}/geo_em.d01.nc geo_em.d01.nc FALSE
+  create_symlink_to_file ${FIRE_GEO_EM_FILE} geo_em.d01.nc FALSE
 fi
 #
 #-----------------------------------------------------------------------

ush/config_defaults.yaml

@@ -3116,6 +3116,7 @@ fire:
   envvars:
     UFS_FIRE: False
     FIRE_INPUT_DIR: ""
+    FIRE_GEO_EM_FILE: '{{ [fire.envvars.FIRE_INPUT_DIR, "geo_em.d01.nc"]|path_join}}'
   DT_FIRE: 0.5
   OUTPUT_DT_FIRE: 300
   FIRE_NUM_TASKS: 0

ush/setup.py

@@ -1715,13 +1715,12 @@ def _get_location(xcs, fmt, expt_cfg):
                     ("UFS_FIRE == True but UFS SRW has not been built for fire coupling;",
                     "see users guide for details")
                 )
-            fire_input_file = Path(fire_conf_vars["FIRE_INPUT_DIR"], "geo_em.d01.nc")
-            if not Path(fire_input_file).is_file():
+            if not Path(fire_conf_vars["FIRE_GEO_EM_FILE"]).is_file():
                 raise FileNotFoundError(
                     dedent(
                         f"""
-                    The fire input file (geo_em.d01.nc) does not exist in the specified directory:
-                    {fire_conf["FIRE_INPUT_DIR"]}
+                    The specified fire input file does not exist:
+                    {fire_conf_vars["FIRE_GEO_EM_FILE"]}
                     Check that the specified path is correct, and the file exists and is readable
                     """
                     )