remove UFS-DA atm var and ens components using non-python g-w (NOAA-E…

…MC#1313)
RussTreadon-NOAA · Mar 1, 2023 · 88ba6d2 · 88ba6d2
1 parent e3b71f0
commit 88ba6d2
Show file tree

Hide file tree

Showing 36 changed files with 73 additions and 1,386 deletions.
diff --git a/env/CONTAINER.env b/env/CONTAINER.env
@@ -4,8 +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 "atmanalrun atmensanalrun"
-    echo "aeroanlrun"
+    echo "atmanlrun atmensanlrun aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"

diff --git a/env/HERA.env b/env/HERA.env
@@ -4,7 +4,6 @@ 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 "atmanalrun atmensanalrun"
     echo "atmanlrun atmensanlrun aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
@@ -49,30 +48,6 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}
 
-elif [[ "${step}" = "atmanalrun" ]]; then
-
-    export CFP_MP=${CFP_MP:-"YES"}
-    export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-
-    nth_max=$((npe_node_max / npe_node_atmanalrun))
-
-    export NTHREADS_ATMANAL=${nth_atmanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
-    export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
-
-elif [[ "${step}" = "atmensanalrun" ]]; then
-
-    export CFP_MP=${CFP_MP:-"YES"}
-    export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-
-    nth_max=$((npe_node_max / npe_node_atmensanalrun))
-
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
-    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
-
 elif [[ "${step}" = "atmanlrun" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"

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 "atmanalrun atmensanalrun"
+    echo "atmanlrun atmensanlrun aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
@@ -43,21 +43,29 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}
 
-elif [[ "${step}" = "atmanalrun" ]]; then
+elif [[ "${step}" = "atmanlrun" ]]; then
 
-    nth_max=$((npe_node_max / npe_node_atmanalrun))
+    nth_max=$((npe_node_max / npe_node_atmanlrun))
 
-    export NTHREADS_ATMANAL=${nth_atmanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
-    export APRUN_ATMANAL="${launcher} ${npe_atmanalrun}"
+    export NTHREADS_ATMANL=${nth_atmanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMANL} -gt ${nth_max} ]] && export NTHREADS_ATMANL=${nth_max}
+    export APRUN_ATMANL="${launcher} ${npe_atmanlrun}"
 
-elif [[ "${step}" = "atmensanalrun" ]]; then
+elif [[ "${step}" = "atmensanlrun" ]]; then
 
-    nth_max=$((npe_node_max / npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanlrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
-    export APRUN_ATMENSANAL="${launcher} ${npe_atmensanalrun}"
+    export NTHREADS_ATMENSANL=${nth_atmensanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANL=${nth_max}
+    export APRUN_ATMENSANL="${launcher} ${npe_atmensanlrun}"
+
+elif [[ "${step}" = "aeroanlrun" ]]; then
+
+    nth_max=$((npe_node_max / npe_node_aeroanlrun))
+
+    export NTHREADS_AEROANL=${nth_aeroanlrun:-${nth_max}}
+    [[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
+    export APRUN_AEROANL="${launcher} ${npe_aeroanlrun}"
 
 elif [[ "${step}" = "anal" ]]; then
 

diff --git a/env/ORION.env b/env/ORION.env
@@ -4,8 +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 "atmanalrun atmensanalrun"
-    echo "aeroanlrun"
+    echo "atmanlrun atmensanlrun aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
@@ -49,29 +48,29 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}
 
-elif [[ "${step}" = "atmanalrun" ]]; then
+elif [[ "${step}" = "atmanlrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$((npe_node_max / npe_node_atmanalrun))
+    nth_max=$((npe_node_max / npe_node_atmanlrun))
 
-    export NTHREADS_ATMANAL=${nth_atmanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
-    export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
+    export NTHREADS_ATMANL=${nth_atmanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMANL} -gt ${nth_max} ]] && export NTHREADS_ATMANL=${nth_max}
+    export APRUN_ATMANL="${launcher} -n ${npe_atmanlrun}"
 
-elif [[ "${step}" = "atmensanalrun" ]]; then
+elif [[ "${step}" = "atmensanlrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$((npe_node_max / npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanlrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
-    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
+    export NTHREADS_ATMENSANL=${nth_atmensanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANL=${nth_max}
+    export APRUN_ATMENSANL="${launcher} -n ${npe_atmensanlrun}"
 
 elif [[ "${step}" = "aeroanlrun" ]]; then
 

diff --git a/env/S4.env b/env/S4.env
@@ -4,8 +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 "atmanalrun atmensanalrun"
-    echo "aeroanlrun"
+    echo "atmanlrun atmensanlrun aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen efcs epos"
     echo "postsnd awips gempak"
@@ -47,29 +46,29 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}
 
-elif [[ "${step}" = "atmanalrun" ]]; then
+elif [[ "${step}" = "atmanlrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$((npe_node_max / npe_node_atmanalrun))
+    nth_max=$((npe_node_max / npe_node_atmanlrun))
 
-    export NTHREADS_ATMANAL=${nth_atmanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
-    export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
+    export NTHREADS_ATMANL=${nth_atmanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMANL} -gt ${nth_max} ]] && export NTHREADS_ATMANL=${nth_max}
+    export APRUN_ATMANL="${launcher} -n ${npe_atmanlrun}"
 
-elif [[ "${step}" = "atmensanalrun" ]]; then
+elif [[ "${step}" = "atmensanlrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$((npe_node_max / npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanlrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
-    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
+    export NTHREADS_ATMENSANL=${nth_atmensanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANL=${nth_max}
+    export APRUN_ATMENSANL="${launcher} -n ${npe_atmensanlrun}"
 
 elif [[ "${step}" = "aeroanlrun" ]]; then
 

diff --git a/env/WCOSS2.env b/env/WCOSS2.env
@@ -4,8 +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 "atmanalrun atmensanalrun"
-    echo "aeroanlrun"
+    echo "atmanlrun atmensanlrun aeroanlrun"
     echo "anal sfcanl fcst post vrfy metp"
     echo "eobs eupd ecen esfc efcs epos"
     echo "postsnd awips gempak"
@@ -36,29 +35,29 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
     export wavempexec="${launcher} -np"
     export wave_mpmd=${mpmd_opt}
 
-elif [[ "${step}" = "atmanalrun" ]]; then
+elif [[ "${step}" = "atmanlrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
-    nth_max=$((npe_node_max / npe_node_atmanalrun))
+    nth_max=$((npe_node_max / npe_node_atmanlrun))
 
-    export NTHREADS_ATMANAL=${nth_atmanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
-    export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
+    export NTHREADS_ATMANL=${nth_atmanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMANL} -gt ${nth_max} ]] && export NTHREADS_ATMANL=${nth_max}
+    export APRUN_ATMANL="${launcher} -n ${npe_atmanlrun}"
 
-elif [[ "${step}" = "atmensanalrun" ]]; then
+elif [[ "${step}" = "atmensanlrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
     export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
-    nth_max=$((npe_node_max / npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanlrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
-    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
-    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
+    export NTHREADS_ATMENSANL=${nth_atmensanlrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANL=${nth_max}
+    export APRUN_ATMENSANL="${launcher} -n ${npe_atmensanlrun}"
 
 elif [[ "${step}" = "aeroanlrun" ]]; then
 

diff --git a/jobs/JGDAS_GLOBAL_ATMOS_ANALYSIS_POST b/jobs/JGDAS_GLOBAL_ATMOS_ANALYSIS_POST
diff --git a/jobs/JGDAS_GLOBAL_ATMOS_ANALYSIS_PREP b/jobs/JGDAS_GLOBAL_ATMOS_ANALYSIS_PREP