[production/RRFS.v1] Update DA task names in workflow, cleanup module…

…files (#424) * Update task names in workflow * Fix for DA engineering test --------- Co-authored-by: benjamin blake <[email protected]>
NOAA-EMC · Jul 30, 2024 · 54a1523 · 54a1523
1 parent f2f6a9d
commit 54a1523
Show file tree

Hide file tree

Showing 69 changed files with 689 additions and 710 deletions.
diff --git a/jobs/JRRFS_RUN_ENKF → jobs/JRRFS_ANALYSIS_ENKF b/jobs/JRRFS_RUN_ENKF → jobs/JRRFS_ANALYSIS_ENKF
@@ -73,7 +73,7 @@ cd ${DATA}
 export pgmout="${DATA}/OUTPUT.$$"
 env
 
-$SCRIPTSdir/exrrfs_run_enkf.sh
+$SCRIPTSdir/exrrfs_analysis_enkf.sh
 export err=$?; err_chk
 
 if [ -e "$pgmout" ]; then

diff --git a/jobs/JRRFS_RUN_ANALYSIS → jobs/JRRFS_ANALYSIS_GSI b/jobs/JRRFS_RUN_ANALYSIS → jobs/JRRFS_ANALYSIS_GSI
@@ -134,7 +134,7 @@ mkdir -p "${COMOUT}"
 export pgmout="${DATA}/OUTPUT.$$"
 env
 
-$SCRIPTSdir/exrrfs_run_analysis.sh
+$SCRIPTSdir/exrrfs_analysis_gsi.sh
 export err=$?; err_chk
 
 if [ -e "$pgmout" ]; then

diff --git a/jobs/JRRFS_RUN_GSIDIAG → jobs/JRRFS_ANALYSIS_GSIDIAG b/jobs/JRRFS_RUN_GSIDIAG → jobs/JRRFS_ANALYSIS_GSIDIAG
@@ -88,7 +88,7 @@ mkdir -p "${COMOUT}"
 export pgmout="${DATA}/OUTPUT.$$"
 env
 
-$SCRIPTSdir/exrrfs_run_gsidiag.sh
+$SCRIPTSdir/exrrfs_analysis_gsidiag.sh
 export err=$?; err_chk
 
 if [ -e "$pgmout" ]; then

diff --git a/jobs/JRRFS_NONVARCLDANL → jobs/JRRFS_ANALYSIS_NONVARCLD b/jobs/JRRFS_NONVARCLDANL → jobs/JRRFS_ANALYSIS_NONVARCLD
@@ -105,7 +105,7 @@ mkdir -p "${COMOUT}"
 export pgmout="${DATA}/OUTPUT.$$"
 env
 
-$SCRIPTSdir/exrrfs_nonvarcldanl.sh
+$SCRIPTSdir/exrrfs_analysis_nonvarcld.sh
 export err=$?; err_chk
 
 if [ -e "$pgmout" ]; then

diff --git a/jobs/JRRFS_RUN_PREPSTART → jobs/JRRFS_PREP_CYC b/jobs/JRRFS_RUN_PREPSTART → jobs/JRRFS_PREP_CYC
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #-----------------------------------------------------------------------
-# RRFS Run Prepstart
+# RRFS Prep Cyc
 #-----------------------------------------------------------------------
 
 #-----------------------------------------------------------------------
@@ -40,7 +40,7 @@ print_info_msg "
 Entering script:  \"${scrfunc_fn}\"
 In directory:     \"${scrfunc_dir}\"
 
-This is the J-job script for the prepstart tasks for the specified cycle.
+This is the J-job script for the prep_cyc tasks for the specified cycle.
 ========================================================================"
 
 #-----------------------------------------------------------------------
@@ -99,7 +99,7 @@ mkdir -p "${COMOUT}"
 export pgmout="${INPUT_DATA}/OUTPUT.$$"
 env
 
-$SCRIPTSdir/exrrfs_run_prepstart.sh
+$SCRIPTSdir/exrrfs_prep_cyc.sh
 export err=$?; err_chk
 
 if [ -e "$pgmout" ]; then

diff --git a/jobs/JRRFS_PROCESS_GLMFED → jobs/JRRFS_PROCESS_LIGHTNING b/jobs/JRRFS_PROCESS_GLMFED → jobs/JRRFS_PROCESS_LIGHTNING
@@ -37,7 +37,7 @@ print_info_msg "
 Entering script:  \"${scrfunc_fn}\"
 In directory:     \"${scrfunc_dir}\"
 
-This is the J-job script for the task that runs a GLM FED 
+This is the J-job script for the task that runs a GLM FED lightning
 preprocess with RRFS for the specified cycle.
 ========================================================================"
 
@@ -51,15 +51,15 @@ export RUN=${RUN:-rrfs}
 
 if [ ${CYCLE_TYPE} == "spinup" ]; then
   if [ ${DO_ENSEMBLE} = TRUE ]; then
-    export jobid=${RUN}_process_glmfed_enkf_spinup_${envir}_${cyc}
+    export jobid=${RUN}_process_lightning_enkf_spinup_${envir}_${cyc}
   else
-    export jobid=${RUN}_process_glmfed_spinup_${envir}_${cyc}
+    export jobid=${RUN}_process_lightning_spinup_${envir}_${cyc}
   fi
 else
   if [ ${DO_ENSEMBLE} = TRUE ]; then
-    export jobid=${RUN}_process_glmfed_enkf_${envir}_${cyc}
+    export jobid=${RUN}_process_lightning_enkf_${envir}_${cyc}
   else
-    export jobid=${RUN}_process_glmfed_${envir}_${cyc}
+    export jobid=${RUN}_process_lightning_${envir}_${cyc}
   fi
 fi
 
@@ -82,7 +82,7 @@ export MODE=$GLMFED_DATA_MODE
 export pgmout="${DATA}/OUTPUT.$$"
 env
 
-python -u ${SCRIPTSdir}/exrrfs_process_glmfed.py
+python -u ${SCRIPTSdir}/exrrfs_process_lightning.py
 export err=$?; err_chk
 
 if [ -e "$pgmout" ]; then

diff --git a/jobs/JRRFS_PROCESS_RADARREF → jobs/JRRFS_PROCESS_RADAR b/jobs/JRRFS_PROCESS_RADARREF → jobs/JRRFS_PROCESS_RADAR
@@ -53,14 +53,14 @@ export envir=${envir:-prod}
 export RUN=${RUN:-rrfs}
 
 if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  export jobid=${RUN}_process_radarref_spinup_${envir}_${cyc}
+  export jobid=${RUN}_process_radar_spinup_${envir}_${cyc}
   if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-    export jobid=${RUN}_process_radarref_spinup_enkf_${envir}_${cyc}
+    export jobid=${RUN}_process_radar_spinup_enkf_${envir}_${cyc}
   fi
 else
-  export jobid=${RUN}_process_radarref_${envir}_${cyc}
+  export jobid=${RUN}_process_radar_${envir}_${cyc}
   if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-    export jobid=${RUN}_process_radarref_enkf_${envir}_${cyc}
+    export jobid=${RUN}_process_radar_enkf_${envir}_${cyc}
   fi
 fi
 
@@ -88,7 +88,7 @@ mkdir -p "${COMOUT}"
 export pgmout="${DATA}/OUTPUT.$$"
 env
 
-$SCRIPTSdir/exrrfs_process_radarref.sh
+$SCRIPTSdir/exrrfs_process_radar.sh
 export err=$?; err_chk
 
 if [ -e "$pgmout" ]; then

diff --git a/jobs/JRRFS_RUN_RECENTER → jobs/JRRFS_RECENTER b/jobs/JRRFS_RUN_RECENTER → jobs/JRRFS_RECENTER
@@ -94,7 +94,7 @@ fi
 export pgmout="${DATA}/OUTPUT.$$"
 env
 
-$SCRIPTSdir/exrrfs_run_recenter.sh
+$SCRIPTSdir/exrrfs_recenter.sh
 export err=$?; err_chk
 
 if [ -e "$pgmout" ]; then

diff --git a/jobs/JRRFS_RUN_POSTANAL → jobs/JRRFS_UPDATE_LBC_SOIL b/jobs/JRRFS_RUN_POSTANAL → jobs/JRRFS_UPDATE_LBC_SOIL
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #-----------------------------------------------------------------------
-# RRFS Post Analysis
+# RRFS Update LBC & Soil
 #-----------------------------------------------------------------------
 
 #-----------------------------------------------------------------------
@@ -118,7 +118,7 @@ mkdir -p "${COMOUT}"
 export pgmout="${DATA}/OUTPUT.$$"
 env
 
-$SCRIPTSdir/exrrfs_run_postanal.sh
+$SCRIPTSdir/exrrfs_update_lbc_soil.sh
 export err=$?; err_chk
 
 if [ -e "$pgmout" ]; then

diff --git a/modulefiles/tasks/hera/run_bufrsnd.local.lua → modulefiles/tasks/hera/bufrsnd.local.lua b/modulefiles/tasks/hera/run_bufrsnd.local.lua → modulefiles/tasks/hera/bufrsnd.local.lua
diff --git a/modulefiles/tasks/hera/get_extrn_ics.local.lua b/modulefiles/tasks/hera/get_extrn_ics.local.lua
diff --git a/modulefiles/tasks/hera/get_extrn_lbcs.local.lua b/modulefiles/tasks/hera/get_extrn_lbcs.local.lua
diff --git a/...files/tasks/hera/run_proc_smoke.local.lua → ...efiles/tasks/hera/process_smoke.local.lua b/...files/tasks/hera/run_proc_smoke.local.lua → ...efiles/tasks/hera/process_smoke.local.lua
diff --git a/modulefiles/tasks/hera/run_graphics.local.lua b/modulefiles/tasks/hera/run_graphics.local.lua
diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua
diff --git a/modulefiles/tasks/jet/run_bufrsnd.local.lua → modulefiles/tasks/jet/bufrsnd.local.lua b/modulefiles/tasks/jet/run_bufrsnd.local.lua → modulefiles/tasks/jet/bufrsnd.local.lua
diff --git a/modulefiles/tasks/jet/get_extrn_ics.local.lua b/modulefiles/tasks/jet/get_extrn_ics.local.lua
diff --git a/modulefiles/tasks/jet/get_extrn_lbcs.local.lua b/modulefiles/tasks/jet/get_extrn_lbcs.local.lua
diff --git a/modulefiles/tasks/jet/run_prepstart.local → modulefiles/tasks/jet/prep_cyc.local.lua b/modulefiles/tasks/jet/run_prepstart.local → modulefiles/tasks/jet/prep_cyc.local.lua
diff --git a/...efiles/tasks/jet/run_proc_smoke.local.lua → ...lefiles/tasks/jet/process_smoke.local.lua b/...efiles/tasks/jet/run_proc_smoke.local.lua → ...lefiles/tasks/jet/process_smoke.local.lua
diff --git a/modulefiles/tasks/jet/run_enspost.local.lua b/modulefiles/tasks/jet/run_enspost.local.lua
diff --git a/modulefiles/tasks/jet/run_graphics.local.lua b/modulefiles/tasks/jet/run_graphics.local.lua
diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua
diff --git a/modulefiles/tasks/wcoss2/add_aerosol.local.lua b/modulefiles/tasks/wcoss2/add_aerosol.local.lua
diff --git a/...s/tasks/wcoss2/run_analysis_gsi.local.lua → ...files/tasks/wcoss2/analysis_gsi.local.lua b/...s/tasks/wcoss2/run_analysis_gsi.local.lua → ...files/tasks/wcoss2/analysis_gsi.local.lua
diff --git a/...efiles/tasks/wcoss2/run_bufrsnd.local.lua → modulefiles/tasks/wcoss2/bufrsnd.local.lua b/...efiles/tasks/wcoss2/run_bufrsnd.local.lua → modulefiles/tasks/wcoss2/bufrsnd.local.lua
diff --git a/...files/tasks/wcoss2/run_enkfupdt.local.lua → modulefiles/tasks/wcoss2/enkfupdt.local.lua b/...files/tasks/wcoss2/run_enkfupdt.local.lua → modulefiles/tasks/wcoss2/enkfupdt.local.lua
diff --git a/...iles/tasks/wcoss2/run_prepstart.local.lua → modulefiles/tasks/wcoss2/prep_cyc.local.lua b/...iles/tasks/wcoss2/run_prepstart.local.lua → modulefiles/tasks/wcoss2/prep_cyc.local.lua
diff --git a/...les/tasks/wcoss2/run_proc_smoke.local.lua → ...iles/tasks/wcoss2/process_smoke.local.lua b/...les/tasks/wcoss2/run_proc_smoke.local.lua → ...iles/tasks/wcoss2/process_smoke.local.lua
diff --git a/...files/tasks/wcoss2/run_recenter.local.lua → modulefiles/tasks/wcoss2/recenter.local.lua b/...files/tasks/wcoss2/run_recenter.local.lua → modulefiles/tasks/wcoss2/recenter.local.lua
diff --git a/modulefiles/tasks/wcoss2/run_vx.local.lua b/modulefiles/tasks/wcoss2/run_vx.local.lua