Update most instances of FIRE_INPUT_DIR to use FIRE_GEO_EM_FILE instead. Use FIRE_NUM_TASKS: 2 in multifire test. Remove unnecessary vars from pass_settings (they are under envvars now)

Author: mkavulich

doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst

@@ -2130,6 +2130,9 @@ Non-default parameters for the Community Fire Behavior Model (CFBM) in SRW are s
 ``FIRE_INPUT_DIR``: (Default: "")
    Directory where fire input file (geo_em.d01.nc) can be found
 
+``FIRE_GEO_EM_FILE``: (default: '{{ [fire.envvars.FIRE_INPUT_DIR, "geo_em.d01.nc"]|path_join}}')
+   Full path to fire input geo_em netCDF file
+
 ``DT_FIRE``: (Default: 0.5)
    The fire behavior component’s integration timestep in seconds
 

tests/WE2E/test_configs/fire/config.UFS_FIRE_multifire_two-way-coupled.yaml

@@ -39,8 +39,8 @@ task_plot_allvars:
 fire:
   envvars:
     UFS_FIRE: True
-    FIRE_INPUT_DIR: '{{ platform.WE2E_TEST_DATA }}/UFS_FIRE/{{ workflow.DATE_FIRST_CYCL }}'
-  FIRE_NUM_TASKS: 1
+    FIRE_GEO_EM_FILE: '{{ platform.WE2E_TEST_DATA }}/UFS_FIRE/{{ workflow.DATE_FIRST_CYCL }}/geo_em.d01.nc'
+  FIRE_NUM_TASKS: 2
   DT_FIRE: 0.5
   OUTPUT_DT_FIRE: 600
   FIRE_NUM_IGNITIONS: 2

tests/WE2E/test_configs/fire/config.UFS_FIRE_one-way-coupled.yaml

@@ -42,7 +42,7 @@ task_plot_allvars:
 fire:
   envvars:
     UFS_FIRE: True
-    FIRE_INPUT_DIR: '{{ platform.WE2E_TEST_DATA }}/UFS_FIRE/{{ workflow.DATE_FIRST_CYCL }}'
+    FIRE_GEO_EM_FILE: '{{ platform.WE2E_TEST_DATA }}/UFS_FIRE/{{ workflow.DATE_FIRST_CYCL }}/geo_em.d01.nc'
   FIRE_NUM_TASKS: 1
   DT_FIRE: 0.5
   OUTPUT_DT_FIRE: 300
@@ -64,4 +64,4 @@ fire:
   FIRE_LSM_ZCOUPLING_REF: 60.0
 task_integration_test:
   envvars:
-    TEST_UFS_FIRE: true
+    TEST_UFS_FIRE: true

ush/config.fire.yaml

@@ -52,7 +52,7 @@ fire:
     UFS_FIRE: True
   # Uncomment to override the input directory location. An example netCDF for this configuration is
   # staged on Tier 1 platform and set in the platform-specific YAML files.
-#    FIRE_INPUT_DIR: /path/to/directory/containing/geo_em.d01.nc
+#    FIRE_GEO_EM_FILE: /path/to/geo_em.d01.nc
   FIRE_NUM_TASKS: 1
   DT_FIRE: 0.5
   OUTPUT_DT_FIRE: 300

ush/config_defaults.yaml

@@ -3102,6 +3102,9 @@ fire:
   # FIRE_INPUT_DIR
   # Directory where fire input file (geo_em.d01.nc) can be found
   #
+  # FIRE_GEO_EM_FILE
+  # Full path to fire input geo_em netCDF file
+  #
   # DT_FIRE
   # The fire behavior component’s integration timestep
   #

ush/generate_FV3LAM_wflow.py

@@ -461,7 +461,7 @@ def generate_FV3LAM_wflow(
         ]
 
         # These settings do not get added to namelist, or are handled elsewhere
-        pass_settings = ["UFS_FIRE", "FIRE_INPUT_DIR", "FIRE_NUM_TASKS", "envvars"]
+        pass_settings = ["FIRE_NUM_TASKS", "envvars"]
         pass_settings.extend(each_ignit)
 
         for setting in expt_config["fire"]: