Adding new WIND_VINTERP_OPT option, add OMP_NUM_THREADS_FIRE (not tested for compile yet)

Author: mkavulich

Externals.cfg

@@ -9,10 +9,10 @@ required = True
 
 [ufs-weather-model]
 protocol = git
-repo_url = https://github.com/ufs-community/ufs-weather-model
+repo_url = https://github.com/masih-e/ufs-weather-model
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 93d51ae
+hash = 3efc3422
 local_path = sorc/ufs-weather-model
 required = True
 

parm/ufs.configure

@@ -33,7 +33,8 @@ AQM_attributes::
 {% if ufs_fire %}
 # FIRE #
 FIRE_model:                     fire_behavior
-FIRE_petlist_bounds:            {{ FIRE_pb }}
+FIRE_petlist_bounds:            {{ FIRE_pb }}{{
+FIRE_omp_num_threads_line }}
 FIRE_attributes::
   Verbosity = high
   Diagnostic = 0

ush/config_defaults.yaml

@@ -3050,14 +3050,17 @@ fire:
   # The fire behavior component’s output timestep
   # 
   # FIRE_NUM_TASKS
-  # Number of MPI tasks assigned to the FIRE_BEHAVIOR component.
+  # Number of MPI tasks assigned to the fire behavior component.
   #
+  # OMP_NUM_THREADS_FIRE
+  # Number of OpenMP tasks assigned to the fire behavior component.
   envvars:
     UFS_FIRE: False
     FIRE_INPUT_DIR: ""
   DT_FIRE: 0.5
   OUTPUT_DT_FIRE: 300
   FIRE_NUM_TASKS: 0
+  OMP_NUM_THREADS_FIRE: 1
 
 
   # The following options control namelist values in the Community Fire
@@ -3148,3 +3151,9 @@ fire:
   FIRE_IGNITION_START_TIME: 6480
   FIRE_IGNITION_END_TIME: 7000
 
+  # WIND_VINTERP_OPT
+  # Option for which wind variable should be used for driving fire behavior
+  #   0: Use prognostic 3-d wind
+  #   1: Use diagnosed 10-meter wind
+  WIND_VINTERP_OPT: 0
+

ush/create_ufs_configure_file.py

@@ -55,6 +55,8 @@ def create_ufs_configure_file(run_dir,cfg):
             f"\nATM_omp_num_threads:            {cfg['OMP_NUM_THREADS_RUN_FCST']}"
         atm_diag_line = ''
         fire_petlist_bounds = f'{fire_start} {fire_end}'
+        fire_omp_num_threads_line = \
+            f"\nFIRE_omp_num_threads:            {cfg['OMP_NUM_THREADS_FIRE']}"
         runseq = [ f"  @{cfg['DT_ATMOS']}\n",
                    "    ATM -> FIRE\n",
                    "    FIRE -> ATM :remapmethod=conserve\n",
@@ -114,6 +116,7 @@ def create_ufs_configure_file(run_dir,cfg):
         settings["AQM_pb"] = aqm_petlist_bounds
     if cfg["UFS_FIRE"]:
         settings["FIRE_pb"] = fire_petlist_bounds
+        settings["FIRE_omp_num_threads_line"] = fire_omp_num_threads_line
 
     print_info_msg(
         dedent(

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 = ["UFS_FIRE", "FIRE_INPUT_DIR", "FIRE_NUM_TASKS", "OMP_NUM_THREADS_FIRE", "envvars"]
         pass_settings.extend(each_ignit)
 
         for setting in expt_config["fire"]: