fix issues on run_fcst

chan-hoo · Jan 23, 2025 · d3c1087 · d3c1087
1 parent 3645b71
commit d3c1087
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/parm/FV3.input.yml b/parm/FV3.input.yml
@@ -104,8 +104,6 @@ FV3_HRRR_gf:
   atmos_model_nml:
     avg_max_length: 3600.
     ignore_rst_cksum: true
-  external_ic_nml:
-    levp: 66
   fv_core_nml:
     agrid_vel_rst: true
     d_con: 0.5
@@ -125,7 +123,6 @@ FV3_HRRR_gf:
     n_split: 5
     n_sponge: 65
     nord_tr: 0
-    npz: 65
     psm_bc: 1
     range_warn: False
     regional_bcs_from_gsi: false

diff --git a/parm/wflow/coldstart.yaml b/parm/wflow/coldstart.yaml
@@ -209,3 +209,19 @@ metatask_run_ensemble:
           taskdep:
             attrs:
               task: aqm_lbcs
+        or_smoke_dust:
+          not:
+            taskvalid:
+              attrs:
+                task: smoke_dust
+          taskdep:
+            attrs:
+              task: smoke_dust
+        or_prepstart:
+          not:
+            taskvalid:
+              attrs:
+                task: prepstart
+          taskdep:
+            attrs:
+              task: prepstart
diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
@@ -120,7 +120,7 @@ for sect in user nco platform workflow global cpl_aqm_parm constants fixed_files
   task_get_extrn_lbcs task_run_fcst task_run_post smoke_dust_parm fire; do
   source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
-
+set -xue
 #
 #-----------------------------------------------------------------------
 #

diff --git a/ush/config.smoke_dust.yaml b/ush/config.smoke_dust.yaml
@@ -49,8 +49,10 @@ task_get_extrn_lbcs:
 #  EXTRN_MDL_SOURCE_BASEDIR_LBCS: /work/noaa/epic/SRW-AQM_DATA/input_model_data/RAP/${yyyymmddhh} # orion/hercules
 #  EXTRN_MDL_SOURCE_BASEDIR_LBCS: /gpfs/f6/bil-fire8/world-shared/UFS_SRW_data/develop/input_model_data/RAP/${yyyymmddhh}  # gaea-c6
 task_make_ics:
+  LEVP: 66
   VCOORD_FILE: "{{ workflow.FIXam }}/global_hyblev_fcst_rrfsL65.txt"
 task_make_lbcs:
+  LEVP: 66
   VCOORD_FILE: "{{ workflow.FIXam }}/global_hyblev_fcst_rrfsL65.txt"
 task_run_fcst:
   OMP_NUM_THREADS_RUN_FCST: 1

diff --git a/ush/generate_FV3LAM_wflow.py b/ush/generate_FV3LAM_wflow.py
@@ -424,6 +424,11 @@ def generate_FV3LAM_wflow(
         "print_diff_pgr": PRINT_DIFF_PGR,
     })
 
+    if DO_SMOKE_DUST:
+        gfs_physics_nml_dict.update({
+            "ebb_dcycle": EBB_DCYCLE,
+    })
+
     if CPL_AQM:
         gfs_physics_nml_dict.update({
             "cplaqm": True,

diff --git a/ush/job_preamble.sh b/ush/job_preamble.sh
@@ -32,6 +32,8 @@ export DATAROOT="${DATAROOT:-${PTMP}/${envir}/tmp}"
 export DCOMROOT="${DCOMROOT:-${PTMP}/${envir}/dcom}"
 export DATA_SHARE="${DATA_SHARE:-${DATAROOT}/DATA_SHARE/${PDY}${cyc}}"
 
+mkdir -p ${DATA_SHARE}
+
 export DBNROOT="${DBNROOT:-${DBNROOT_default}}"
 export SENDECF="${SENDECF:-${SENDECF_default}}"
 export SENDDBN="${SENDDBN:-${SENDDBN_default}}"

diff --git a/ush/link_fix.py b/ush/link_fix.py
@@ -206,7 +206,7 @@ def link_fix(
             f"C*{dot_or_uscore}oro_data.tile{tile_rgnl}.halo{nh0}.nc",
             f"C*{dot_or_uscore}oro_data.tile{tile_rgnl}.halo{nh4}.nc",
         ]
-        if ccpp_phys_suite == "FV3_RAP" or ccpp_phys_suite == "FV3_HRRR" or ccpp_phys_suite == "FV3_GFS_v15_thompson_mynn_lam3km" or ccpp_phys_suite == "FV3_GFS_v17_p8":
+        if ccpp_phys_suite == "FV3_RAP" or ccpp_phys_suite == "FV3_HRRR" or ccpp_phys_suite == "FV3_HRRR_gf" or ccpp_phys_suite == "FV3_GFS_v15_thompson_mynn_lam3km" or ccpp_phys_suite == "FV3_GFS_v17_p8":
             fns += [
                 f"C*{dot_or_uscore}oro_data_ss.tile{tile_rgnl}.halo{nh0}.nc",
                 f"C*{dot_or_uscore}oro_data_ls.tile{tile_rgnl}.halo{nh0}.nc",