Rename the land DA jobs to snow DA to better reflect what they are do…

…ing (NOAA-EMC#2330) This PR renames all of the land DA jobs to snow DA to better reflect that this is a JEDI-based snow analysis capability and not a more generic land surface analysis.
kayeekayee · Feb 28, 2024 · d3a4927 · d3a4927
1 parent 2693810
commit d3a4927
Show file tree

Hide file tree

Showing 33 changed files with 172 additions and 173 deletions.
diff --git a/ci/cases/pr/C96_atmsnowDA.yaml b/ci/cases/pr/C96_atmsnowDA.yaml
@@ -19,4 +19,3 @@ arguments:
 skip_ci_on_hosts:
   - orion
   - hercules
-  - hera
diff --git a/ci/cases/yamls/atmsnowDA_defaults_ci.yaml b/ci/cases/yamls/atmsnowDA_defaults_ci.yaml
@@ -2,5 +2,5 @@ defaults:
   !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
 base:
   DOIAU: "NO"
-  DO_JEDILANDDA: "YES"
+  DO_JEDISNOWDA: "YES"
   ACCOUNT: {{ 'SLURM_ACCOUNT' | getenv }}
diff --git a/env/AWSPW.env b/env/AWSPW.env
@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanlrun atmensanlrun aeroanlrun landanlrun"
+    echo "atmanlrun atmensanlrun aeroanlrun snowanl"
     echo "anal sfcanl fcst post metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"

diff --git a/env/CONTAINER.env b/env/CONTAINER.env
@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanlrun atmensanlrun aeroanlrun landanl"
+    echo "atmanlrun atmensanlrun aeroanlrun snowanl"
     echo "anal sfcanl fcst post metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"

diff --git a/env/HERA.env b/env/HERA.env
@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanlrun atmensanlrun aeroanlrun landanl"
+    echo "atmanlrun atmensanlrun aeroanlrun snowanl"
     echo "anal sfcanl fcst post metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
@@ -42,7 +42,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="HERA"
     export launcher_PREP="srun"
 
-elif [[ "${step}" = "preplandobs" ]]; then
+elif [[ "${step}" = "prepsnowobs" ]]; then
 
     export APRUN_CALCFIMS="${launcher} -n 1"
 
@@ -79,13 +79,13 @@ elif [[ "${step}" = "aeroanlrun" ]]; then
     [[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
     export APRUN_AEROANL="${launcher} -n ${npe_aeroanlrun} --cpus-per-task=${NTHREADS_AEROANL}"
 
-elif [[ "${step}" = "landanl" ]]; then
+elif [[ "${step}" = "snowanl" ]]; then
 
-    nth_max=$((npe_node_max / npe_node_landanl))
+    nth_max=$((npe_node_max / npe_node_snowanl))
 
-    export NTHREADS_LANDANL=${nth_landanl:-${nth_max}}
-    [[ ${NTHREADS_LANDANL} -gt ${nth_max} ]] && export NTHREADS_LANDANL=${nth_max}
-    export APRUN_LANDANL="${launcher} -n ${npe_landanl} --cpus-per-task=${NTHREADS_LANDANL}"
+    export NTHREADS_SNOWANL=${nth_snowanl:-${nth_max}}
+    [[ ${NTHREADS_SNOWANL} -gt ${nth_max} ]] && export NTHREADS_SNOWANL=${nth_max}
+    export APRUN_SNOWANL="${launcher} -n ${npe_snowanl} --cpus-per-task=${NTHREADS_SNOWANL}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 

diff --git a/env/HERCULES.env b/env/HERCULES.env
@@ -41,7 +41,7 @@ case ${step} in
     export sys_tp="HERCULES"
     export launcher_PREP="srun"
  ;;
- "preplandobs")
+ "prepsnowobs")
 
     export APRUN_CALCFIMS="${launcher} -n 1"
  ;;
@@ -79,13 +79,13 @@ case ${step} in
     [[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
     export APRUN_AEROANL="${launcher} -n ${npe_aeroanlrun} --cpus-per-task=${NTHREADS_AEROANL}"
  ;;
- "landanl")
+ "snowanl")
 
-    nth_max=$((npe_node_max / npe_node_landanl))
+    nth_max=$((npe_node_max / npe_node_snowanl))
 
-    export NTHREADS_LANDANL=${nth_landanl:-${nth_max}}
-    [[ ${NTHREADS_LANDANL} -gt ${nth_max} ]] && export NTHREADS_LANDANL=${nth_max}
-    export APRUN_LANDANL="${launcher} -n ${npe_landanl} --cpus-per-task=${NTHREADS_LANDANL}"
+    export NTHREADS_SNOWANL=${nth_snowanl:-${nth_max}}
+    [[ ${NTHREADS_SNOWANL} -gt ${nth_max} ]] && export NTHREADS_SNOWANL=${nth_max}
+    export APRUN_SNOWANL="${launcher} -n ${npe_snowanl} --cpus-per-task=${NTHREADS_SNOWANL}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
  ;;

diff --git a/env/JET.env b/env/JET.env
@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanlrun atmensanlrun aeroanlrun landanl"
+    echo "atmanlrun atmensanlrun aeroanlrun snowanl"
     echo "anal sfcanl fcst post metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
@@ -33,7 +33,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="JET"
     export launcher_PREP="srun"
 
-elif [[ "${step}" = "preplandobs" ]]; then
+elif [[ "${step}" = "prepsnowobs" ]]; then
 
     export APRUN_CALCFIMS="${launcher} -n 1"
 
@@ -70,13 +70,13 @@ elif [[ "${step}" = "aeroanlrun" ]]; then
     [[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
     export APRUN_AEROANL="${launcher} -n ${npe_aeroanlrun}"
 
-elif [[ "${step}" = "landanl" ]]; then
+elif [[ "${step}" = "snowanl" ]]; then
 
-    nth_max=$((npe_node_max / npe_node_landanl))
+    nth_max=$((npe_node_max / npe_node_snowanl))
 
-    export NTHREADS_LANDANL=${nth_landanl:-${nth_max}}
-    [[ ${NTHREADS_LANDANL} -gt ${nth_max} ]] && export NTHREADS_LANDANL=${nth_max}
-    export APRUN_LANDANL="${launcher} -n ${npe_landanl}"
+    export NTHREADS_SNOWANL=${nth_snowanl:-${nth_max}}
+    [[ ${NTHREADS_SNOWANL} -gt ${nth_max} ]] && export NTHREADS_SNOWANL=${nth_max}
+    export APRUN_SNOWANL="${launcher} -n ${npe_snowanl}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 

diff --git a/env/ORION.env b/env/ORION.env
@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanlrun atmensanlrun aeroanlrun landanl"
+    echo "atmanlrun atmensanlrun aeroanlrun snowanl"
     echo "anal sfcanl fcst post metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
@@ -40,7 +40,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="ORION"
     export launcher_PREP="srun"
 
-elif [[ "${step}" = "preplandobs" ]]; then
+elif [[ "${step}" = "prepsnowobs" ]]; then
 
     export APRUN_CALCFIMS="${launcher} -n 1"
 
@@ -78,13 +78,13 @@ elif [[ "${step}" = "aeroanlrun" ]]; then
     [[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
     export APRUN_AEROANL="${launcher} -n ${npe_aeroanlrun} --cpus-per-task=${NTHREADS_AEROANL}"
 
-elif [[ "${step}" = "landanl" ]]; then
+elif [[ "${step}" = "snowanl" ]]; then
 
-    nth_max=$((npe_node_max / npe_node_landanl))
+    nth_max=$((npe_node_max / npe_node_snowanl))
 
-    export NTHREADS_LANDANL=${nth_landanl:-${nth_max}}
-    [[ ${NTHREADS_LANDANL} -gt ${nth_max} ]] && export NTHREADS_LANDANL=${nth_max}
-    export APRUN_LANDANL="${launcher} -n ${npe_landanl} --cpus-per-task=${NTHREADS_LANDANL}"
+    export NTHREADS_SNOWANL=${nth_snowanl:-${nth_max}}
+    [[ ${NTHREADS_SNOWANL} -gt ${nth_max} ]] && export NTHREADS_SNOWANL=${nth_max}
+    export APRUN_SNOWANL="${launcher} -n ${npe_snowanl} --cpus-per-task=${NTHREADS_SNOWANL}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 

diff --git a/env/S4.env b/env/S4.env
@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanlrun atmensanlrun aeroanlrun landanl"
+    echo "atmanlrun atmensanlrun aeroanlrun snowanl"
     echo "anal sfcanl fcst post metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
@@ -33,7 +33,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="S4"
     export launcher_PREP="srun"
 
-elif [[ "${step}" = "preplandobs" ]]; then
+elif [[ "${step}" = "prepsnowobs" ]]; then
 
     export APRUN_CALCFIMS="${launcher} -n 1"
 
@@ -70,13 +70,13 @@ elif [[ "${step}" = "aeroanlrun" ]]; then
     [[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
     export APRUN_AEROANL="${launcher} -n ${npe_aeroanlrun}"
 
-elif [[ "${step}" = "landanl" ]]; then
+elif [[ "${step}" = "snowanl" ]]; then
 
-    nth_max=$((npe_node_max / npe_node_landanl))
+    nth_max=$((npe_node_max / npe_node_snowanl))
 
-    export NTHREADS_LANDANL=${nth_landanl:-${nth_max}}
-    [[ ${NTHREADS_LANDANL} -gt ${nth_max} ]] && export NTHREADS_LANDANL=${nth_max}
-    export APRUN_LANDANL="${launcher} -n ${npe_landanl}"
+    export NTHREADS_SNOWANL=${nth_snowanl:-${nth_max}}
+    [[ ${NTHREADS_SNOWANL} -gt ${nth_max} ]] && export NTHREADS_SNOWANL=${nth_max}
+    export APRUN_SNOWANL="${launcher} -n ${npe_snowanl}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 

diff --git a/env/WCOSS2.env b/env/WCOSS2.env
@@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
-    echo "atmanlrun atmensanlrun aeroanlrun landanl"
+    echo "atmanlrun atmensanlrun aeroanlrun snowanl"
     echo "anal sfcanl fcst post metp"
     echo "eobs eupd ecen esfc efcs epos"
     echo "postsnd awips gempak"
@@ -27,7 +27,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export sys_tp="wcoss2"
     export launcher_PREP="mpiexec"
 
-elif [[ "${step}" = "preplandobs" ]]; then
+elif [[ "${step}" = "prepsnowobs" ]]; then
 
     export APRUN_CALCFIMS="${launcher} -n 1"
 
@@ -64,13 +64,13 @@ elif [[ "${step}" = "aeroanlrun" ]]; then
     [[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
     export APRUN_AEROANL="${launcher} -n ${npe_aeroanlrun}"
 
-elif [[ "${step}" = "landanl" ]]; then
+elif [[ "${step}" = "snowanl" ]]; then
 
-    nth_max=$((npe_node_max / npe_node_landanl))
+    nth_max=$((npe_node_max / npe_node_snowanl))
 
-    export NTHREADS_LANDANL=${nth_landanl:-${nth_max}}
-    [[ ${NTHREADS_LANDANL} -gt ${nth_max} ]] && export NTHREADS_LANDANL=${nth_max}
-    export APRUN_LANDANL="${launcher} -n ${npe_landanl}"
+    export NTHREADS_SNOWANL=${nth_snowanl:-${nth_max}}
+    [[ ${NTHREADS_SNOWANL} -gt ${nth_max} ]] && export NTHREADS_SNOWANL=${nth_max}
+    export APRUN_SNOWANL="${launcher} -n ${npe_snowanl}"
 
     export APRUN_APPLY_INCR="${launcher} -n 6"
 

diff --git a/jobs/JGLOBAL_ATMOS_SFCANL b/jobs/JGLOBAL_ATMOS_SFCANL
@@ -26,7 +26,7 @@ export GPREFIX="${GDUMP}.t${gcyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
 
 YMD=${PDY} HH=${cyc} generate_com -rx COM_OBS COM_ATMOS_ANALYSIS COM_ATMOS_RESTART \
-    COM_LAND_ANALYSIS
+    COM_SNOW_ANALYSIS
 
 RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} generate_com -rx \
     COM_OBS_PREV:COM_OBS_TMPL \

diff --git a/jobs/JGLOBAL_PREP_LAND_OBS → jobs/JGLOBAL_PREP_SNOW_OBS b/jobs/JGLOBAL_PREP_LAND_OBS → jobs/JGLOBAL_PREP_SNOW_OBS
@@ -1,8 +1,8 @@
 #! /usr/bin/env bash
 
 source "${HOMEgfs}/ush/preamble.sh"
-export DATA=${DATA:-${DATAROOT}/${RUN}landanl_${cyc}}
-source "${HOMEgfs}/ush/jjob_header.sh" -e "preplandobs" -c "base preplandobs"
+export DATA=${DATA:-${DATAROOT}/${RUN}snowanl_${cyc}}
+source "${HOMEgfs}/ush/jjob_header.sh" -e "prepsnowobs" -c "base prepsnowobs"
 
 ##############################################
 # Set variables used in the script
@@ -25,7 +25,7 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} generate_com -rx \
 
 ###############################################################
 # Run relevant script
-EXSCRIPT=${GDASLANDPREPSH:-${HOMEgfs}/scripts/exglobal_prep_land_obs.py}
+EXSCRIPT=${GDASSNOWPREPPY:-${HOMEgfs}/scripts/exglobal_prep_snow_obs.py}
 ${EXSCRIPT}
 status=$?
 [[ ${status} -ne 0 ]] && (echo "FATAL ERROR: Error executing ${EXSCRIPT}, ABORT!"; exit "${status}")

diff --git a/jobs/JGLOBAL_LAND_ANALYSIS → jobs/JGLOBAL_SNOW_ANALYSIS b/jobs/JGLOBAL_LAND_ANALYSIS → jobs/JGLOBAL_SNOW_ANALYSIS
@@ -1,8 +1,8 @@
 #! /usr/bin/env bash
 
 source "${HOMEgfs}/ush/preamble.sh"
-export DATA=${DATA:-${DATAROOT}/${RUN}landanl_${cyc}}
-source "${HOMEgfs}/ush/jjob_header.sh" -e "landanl" -c "base landanl"
+export DATA=${DATA:-${DATAROOT}/${RUN}snowanl_${cyc}}
+source "${HOMEgfs}/ush/jjob_header.sh" -e "snowanl" -c "base snowanl"
 
 ##############################################
 # Set variables used in the script
@@ -18,17 +18,17 @@ GDUMP="gdas"
 # Begin JOB SPECIFIC work
 ##############################################
 # Generate COM variables from templates
-YMD=${PDY} HH=${cyc} generate_com -rx COM_OBS COM_LAND_ANALYSIS COM_CONF
+YMD=${PDY} HH=${cyc} generate_com -rx COM_OBS COM_SNOW_ANALYSIS COM_CONF
 
 RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} generate_com -rx \
     COM_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL
 
-mkdir -m 775 -p "${COM_LAND_ANALYSIS}" "${COM_CONF}"
+mkdir -m 775 -p "${COM_SNOW_ANALYSIS}" "${COM_CONF}"
 
 ###############################################################
 # Run relevant script
 
-EXSCRIPT=${LANDANLPY:-${HOMEgfs}/scripts/exglobal_land_analysis.py}
+EXSCRIPT=${SNOWANLPY:-${HOMEgfs}/scripts/exglobal_snow_analysis.py}
 ${EXSCRIPT}
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"

diff --git a/jobs/rocoto/preplandobs.sh → jobs/rocoto/prepsnowobs.sh b/jobs/rocoto/preplandobs.sh → jobs/rocoto/prepsnowobs.sh
@@ -8,7 +8,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
-export job="preplandobs"
+export job="prepsnowobs"
 export jobid="${job}.$$"
 
 ###############################################################
@@ -20,6 +20,6 @@ export PYTHONPATH
 
 ###############################################################
 # Execute the JJOB
-"${HOMEgfs}/jobs/JGLOBAL_PREP_LAND_OBS"
+"${HOMEgfs}/jobs/JGLOBAL_PREP_SNOW_OBS"
 status=$?
 exit "${status}"
diff --git a/jobs/rocoto/landanl.sh → jobs/rocoto/snowanl.sh b/jobs/rocoto/landanl.sh → jobs/rocoto/snowanl.sh
@@ -8,7 +8,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 status=$?
 [[ ${status} -ne 0 ]] && exit "${status}"
 
-export job="landanl"
+export job="snowanl"
 export jobid="${job}.$$"
 
 ###############################################################
@@ -19,6 +19,6 @@ export PYTHONPATH
 
 ###############################################################
 # Execute the JJOB
-"${HOMEgfs}/jobs/JGLOBAL_LAND_ANALYSIS"
+"${HOMEgfs}/jobs/JGLOBAL_SNOW_ANALYSIS"
 status=$?
 exit "${status}"
diff --git a/parm/config/gefs/config.base.emc.dyn b/parm/config/gefs/config.base.emc.dyn
@@ -248,7 +248,7 @@ export imp_physics=8
 export DO_JEDIATMVAR="NO"
 export DO_JEDIATMENS="NO"
 export DO_JEDIOCNVAR="NO"
-export DO_JEDILANDDA="NO"
+export DO_JEDISNOWDA="NO"
 export DO_MERGENSST="NO"
 
 # Hybrid related

diff --git a/parm/config/gefs/config.resources b/parm/config/gefs/config.resources
@@ -9,10 +9,10 @@ if (( $# != 1 )); then
     echo "Must specify an input task argument to set resource variables!"
     echo "argument can be any one of the following:"
     echo "stage_ic aerosol_init"
-    echo "prep preplandobs prepatmiodaobs"
+    echo "prep prepsnowobs prepatmiodaobs"
     echo "atmanlinit atmanlrun atmanlfinal"
     echo "atmensanlinit atmensanlrun atmensanlfinal"
-    echo "landanl"
+    echo "snowanl"
     echo "aeroanlinit aeroanlrun aeroanlfinal"
     echo "anal sfcanl analcalc analdiag fcst echgres"
     echo "upp atmos_products"

diff --git a/parm/config/gefs/yaml/defaults.yaml b/parm/config/gefs/yaml/defaults.yaml
@@ -2,6 +2,6 @@ base:
   DO_JEDIATMVAR: "NO"
   DO_JEDIATMENS: "NO"
   DO_JEDIOCNVAR: "NO"
-  DO_JEDILANDDA: "NO"
+  DO_JEDISNOWDA: "NO"
   DO_MERGENSST: "NO"
   FHMAX_GFS: 120
diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn
@@ -295,7 +295,7 @@ export imp_physics=8
 export DO_JEDIATMVAR="@DO_JEDIATMVAR@"
 export DO_JEDIATMENS="@DO_JEDIATMENS@"
 export DO_JEDIOCNVAR="@DO_JEDIOCNVAR@"
-export DO_JEDILANDDA="@DO_JEDILANDDA@"
+export DO_JEDISNOWDA="@DO_JEDISNOWDA@"
 export DO_MERGENSST="@DO_MERGENSST@"
 
 # Hybrid related

diff --git a/parm/config/gfs/config.com b/parm/config/gfs/config.com
@@ -52,7 +52,7 @@ declare -rx COM_CONF_TMPL=${COM_BASE}'/conf'
 declare -rx COM_ATMOS_INPUT_TMPL=${COM_BASE}'/model_data/atmos/input'
 declare -rx COM_ATMOS_RESTART_TMPL=${COM_BASE}'/model_data/atmos/restart'
 declare -rx COM_ATMOS_ANALYSIS_TMPL=${COM_BASE}'/analysis/atmos'
-declare -rx COM_LAND_ANALYSIS_TMPL=${COM_BASE}'/analysis/land'
+declare -rx COM_SNOW_ANALYSIS_TMPL=${COM_BASE}'/analysis/snow'
 declare -rx COM_ATMOS_HISTORY_TMPL=${COM_BASE}'/model_data/atmos/history'
 declare -rx COM_ATMOS_MASTER_TMPL=${COM_BASE}'/model_data/atmos/master'
 declare -rx COM_ATMOS_GRIB_TMPL=${COM_BASE}'/products/atmos/grib2'