Merge branch 'feature/simplify_res' of github.com:DavidHuber-NOAA/glo…

…bal-workflow into feature/simplify_res
NOAA-EMC · Jul 25, 2024 · 60dcb0d · 60dcb0d
2 parents cf51599 + be4a76c
commit 60dcb0d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/parm/config/gfs/config.anal b/parm/config/gfs/config.anal
@@ -12,7 +12,7 @@ if [[ ${DONST} = "YES" ]]; then
   . ${EXPDIR}/config.nsst
 fi
 
-if [[ "${RUN}" = "gfs" ]] ; then
+if [[ "${RUN}" == "gfs" ]] ; then
   export USE_RADSTAT="NO" # This can be only used when bias correction is not-zero.
   export GENDIAG="NO"
   export SETUP='diag_rad=.false.,diag_pcp=.false.,diag_conv=.false.,diag_ozone=.false.,write_diag(3)=.false.,niter(2)=100,'

diff --git a/parm/config/gfs/config.eobs b/parm/config/gfs/config.eobs
@@ -15,7 +15,7 @@ export RERUN_EOMGGRP="YES"
 # GSI namelist options related to observer for EnKF
 export OBSINPUT_INVOBS="dmesh(1)=225.0,dmesh(2)=225.0,dmesh(3)=225.0,dmesh(4)=100.0"
 export OBSQC_INVOBS="tcp_width=60.0,tcp_ermin=2.0,tcp_ermax=12.0"
-if [ ${LEVS} = "128" ]; then
+if (( LEVS == 128 )); then
    export GRIDOPTS_INVOBS="nlayers(63)=1,nlayers(64)=1,"
    export SETUP_INVOBS="gpstop=55,nsig_ext=56,"
 fi

diff --git a/parm/config/gfs/config.resources.HERA b/parm/config/gfs/config.resources.HERA
@@ -5,8 +5,7 @@
 case ${step} in
   "anal")
     if [[ "${CASE}" == "C384" ]]; then
-      export ntasks_gdas=270
-      export ntasks_gfs=270
+      export ntasks=270
       export threads_per_task_anal=8
       export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     fi

diff --git a/parm/config/gfs/config.resources.JET b/parm/config/gfs/config.resources.JET
@@ -5,8 +5,7 @@
 case ${step} in
   "anal")
     if [[ "${CASE}" == "C384" ]]; then
-      export ntasks_gdas=270
-      export ntasks_gfs=270
+      export ntasks=270
       export threads_per_task=8
       export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     fi

diff --git a/ush/calcanl_gfs.py b/ush/calcanl_gfs.py
@@ -19,7 +19,7 @@
 def calcanl_gfs(DoIAU, l4DEnsVar, Write4Danl, ComOut, APrefix,
                 ComIn_Ges, GPrefix,
                 FixDir, atmges_ens_mean, RunDir, NThreads, NEMSGet, IAUHrs,
-                ExecCMD, ExecCMDMPI, ExecAnl, ExecChgresInc, Run, JEDI):
+                ExecCMD, ExecCMDMPI, ExecAnl, ExecChgresInc, run, JEDI):
     print('calcanl_gfs beginning at: ', datetime.datetime.utcnow())
 
     IAUHH = IAUHrs