PR Low resolution ecflow and JET changes into global-workflow develop

ecflow/ecf/include/emc_cdate.h

@@ -0,0 +1,15 @@
+############################################################
+# NOT for NCO code delivery
+# PDY for EMC only dump job
+############################################################
+datedir=${DATAROOT}/emc_ecflow_pdy.date.$$.$RANDOM
+mkdir -p "$datedir"
+pushd "$datedir"
+setpdy.sh
+. ./PDY
+set -u
+export CDATE="$PDY$cyc"
+set +u
+popd
+rm -rf "$datedir"
+

ecflow/ecf/include/envir-p3.h

@@ -2,21 +2,23 @@
 export job=${job:-$LSB_JOBNAME} #Can't use $job in filenames!
 export jobid=${jobid:-$job.$LSB_JOBID}
 
-export RUN_ENVIR=${RUN_ENVIR:-nco}
+#### export RUN_ENVIR=${RUN_ENVIR:-nco}
+export RUN_ENVIR=emc
+
 export envir=%ENVIR%
 export SENDDBN=${SENDDBN:-%SENDDBN:YES%}
 export SENDDBN_NTC=${SENDDBN_NTC:-%SENDDBN_NTC:YES%}
-FILESYSTEMROOT=/gpfs/%FILESYSTEM:dell1%
 
-module load prod_envir/%prod_envir_ver% prod_util/%prod_util_ver% EnvVars/%EnvVars_ver%
+#### FILESYSTEMROOT=/gpfs/%FILESYSTEM:dell1%
+FILESYSTEMROOT=PTMP_ECFR
 
-if [ -n "%PARATEST:%" ]; then export PARATEST=${PARATEST:-%PARATEST:%}; fi
+module load prod_envir/1.1.0 prod_util/1.1.4 EnvVars/1.0.3
 
 case $envir in
   prod)
     export DATAROOT=${DATAROOT:-${FILESYSTEMROOT}/nco/ops/tmpnwprd}
     if [ "$SENDDBN" == "YES" ]; then
-       export DBNROOT=/iodprod_dell/dbnet_siphon
+       export DBNROOT=${UTILROOT}/fakedbn
     else
        export DBNROOT=${UTILROOT}/fakedbn
     fi
@@ -25,11 +27,7 @@ case $envir in
     export envir=para
     export DATAROOT=${DATAROOT:-${FILESYSTEMROOT}/nco/ops/tmpnwprd}
     if [ "$SENDDBN" == "YES" ]; then
-       if [ "$PARATEST" == "YES" ]; then
-         export DBNROOT=${UTILROOT}/fakedbn
-       else
-         export DBNROOT=${UTILROOT}/para_dbn
-       fi
+       export DBNROOT=${UTILROOT}/para_dbn
        SENDDBN_NTC=NO
     else
        export DBNROOT=${UTILROOT}/fakedbn
@@ -45,7 +43,8 @@ case $envir in
     ;;
 esac
 
-export COMROOT=${FILESYSTEMROOT}/nco/ops/com
+export ECF_PORT=31867
+export COMROOT=${FILESYSTEMROOT}/com/gfs/prod
 export GESROOT=${FILESYSTEMROOT}/nco/ops/nwges
 export COREROOT=${FILESYSTEMROOT}/ptmp/production.core/$jobid
 export NWROOT=/gpfs/dell1/nco/ops/nw${envir}
@@ -54,7 +53,9 @@ export SENDCOM=${SENDCOM:-YES}
 export KEEPDATA=${KEEPDATA:-%KEEPDATA:NO%}
 export TMPDIR=${TMPDIR:-${DATAROOT:?}}
 
+if [ -n "%PARATEST:%" ]; then export PARATEST=${PARATEST:-%PARATEST:%}; fi
 if [ -n "%PDY:%" ]; then export PDY=${PDY:-%PDY:%}; fi
+if [ -n "%PDY:%" ]; then export CDATE=${PDY}%CYC%; fi
 if [ -n "%COMPATH:%" ]; then export COMPATH=${COMPATH:-%COMPATH:%}; fi
 if [ -n "%MAILTO:%" ]; then export MAILTO=${MAILTO:-%MAILTO:%}; fi
 if [ -n "%DBNLOG:%" ]; then export DBNLOG=${DBNLOG:-%DBNLOG:%}; fi

ecflow/ecf/include/envir-p1-old.h → ecflow/ecf/include/envir-p35.h

@@ -1,28 +1,32 @@
-# envir-p1.h
+# envir-p35.h
 export job=${job:-$LSB_JOBNAME} #Can't use $job in filenames!
 export jobid=${jobid:-$job.$LSB_JOBID}
 
-export RUN_ENVIR=${RUN_ENVIR:-nco}
+#### export RUN_ENVIR=${RUN_ENVIR:-nco}
+export RUN_ENVIR=emc
+
 export envir=%ENVIR%
 export SENDDBN=${SENDDBN:-%SENDDBN:YES%}
 export SENDDBN_NTC=${SENDDBN_NTC:-%SENDDBN_NTC:YES%}
 
-module load prod_envir prod_util
+#### FILESYSTEMROOT=/gpfs/%FILESYSTEM:dell4%
+FILESYSTEMROOT=PTMP_ECFR
+
+module load ips/%ips_ver:18.0.1.163%
+module load prod_envir/%prod_envir_ver% prod_util/%prod_util_ver% EnvVars/%EnvVars_ver%
 
 case $envir in
   prod)
-    export jlogfile=${jlogfile:-${COMROOT}/logs/jlogfiles/jlogfile.${jobid}}
-    export DATAROOT=${DATAROOT:-/tmpnwprd1}
+    export DATAROOT=${DATAROOT:-${FILESYSTEMROOT}/nco/ops/tmpnwprd}
     if [ "$SENDDBN" == "YES" ]; then
-       export DBNROOT=/iodprod/dbnet_siphon  # previously set in .bash_profile
+       export DBNROOT=${UTILROOT}/fakedbn
     else
        export DBNROOT=${UTILROOT}/fakedbn
     fi
     ;;
   eval)
     export envir=para
-    export jlogfile=${jlogfile:-${COMROOT}/logs/${envir}/jlogfile}
-    export DATAROOT=${DATAROOT:-/tmpnwprd2}
+    export DATAROOT=${DATAROOT:-${FILESYSTEMROOT}/nco/ops/tmpnwprd}
     if [ "$SENDDBN" == "YES" ]; then
        export DBNROOT=${UTILROOT}/para_dbn
        SENDDBN_NTC=NO
@@ -31,8 +35,7 @@ case $envir in
     fi
     ;;
   para|test)
-    export jlogfile=${jlogfile:-${COMROOT}/logs/${envir}/jlogfile}
-    export DATAROOT=${DATAROOT:-/tmpnwprd2}
+    export DATAROOT=${DATAROOT:-${FILESYSTEMROOT}/nco/ops/tmpnwprd}
     export DBNROOT=${UTILROOT}/fakedbn
     ;;
   *)
@@ -41,17 +44,17 @@ case $envir in
     ;;
 esac
 
-export NWROOT=/nw${envir}
-export COMROOT=/com
-export PCOMROOT=/pcom/${envir}
+export COMROOT=${FILESYSTEMROOT}/com/gfs/prod
+export GESROOT=${FILESYSTEMROOT}/nco/ops/nwges
+export COREROOT=${FILESYSTEMROOT}/ptmp/production.core/$jobid
+export NWROOT=/gpfs/dell4/nco/ops/nw${envir}
 export SENDECF=${SENDECF:-YES}
 export SENDCOM=${SENDCOM:-YES}
 export KEEPDATA=${KEEPDATA:-%KEEPDATA:NO%}
+export TMPDIR=${TMPDIR:-${DATAROOT:?}}
 
-# The following two lines are deprecated (only in the "old" header)
-export DCOMROOT=/dcom/us007003  # previously set to /dcom in .bash_profile
-export UTILROOT=/nwprod/util
-
+if [ -n "%PARATEST:%" ]; then export PARATEST=${PARATEST:-%PARATEST:%}; fi
 if [ -n "%PDY:%" ]; then export PDY=${PDY:-%PDY:%}; fi
+if [ -n "%COMPATH:%" ]; then export COMPATH=${COMPATH:-%COMPATH:%}; fi
 if [ -n "%MAILTO:%" ]; then export MAILTO=${MAILTO:-%MAILTO:%}; fi
 if [ -n "%DBNLOG:%" ]; then export DBNLOG=${DBNLOG:-%DBNLOG:%}; fi

ecflow/ecf/include/head.h

@@ -1,4 +1,4 @@
-set -xe  # print commands as they are executed and enable signal trapping
+set -x  # print commands as they are executed and enable signal trapping
 
 export PS4='+ $SECONDS + ' 
 
@@ -22,10 +22,22 @@ else
     # WCOSS Phase 3 (Dell PowerEdge)
     . /usrx/local/prod/lmod/lmod/init/sh
     . /gpfs/dell1/nco/ops/nwprod/versions/ecflow_p3.ver
+    module purge
+#    export EnvVars_ver=1.0.3
+#    export ips_ver=18.0.1.163
+    export ecflow_ver=4.7.1
     module load ips/$ips_ver
     module load EnvVars/$EnvVars_ver
     module load ecflow/$ecflow_ver
+
     POST_OUT=/var/lsf/ecflow_post_in.$USER.$LSB_BATCH_JID
+#    LSB_BATCH_POST_OUT_DIR=/gpfs/dell3/stmp/$USER
+#    mkdir -p $LSB_BATCH_POST_OUT_DIR
+#    POST_OUT=$LSB_BATCH_POST_OUT_DIR/ecflow_post_in.$USER.$LSB_BATCH_JID
+#    touch $POST_OUT
+
+    export ECF_PORT=31867
+
 fi
 ecflow_client --init=${ECF_RID}
 
@@ -38,6 +50,8 @@ ECF_TRYNO=${ECF_TRYNO}
 ECF_RID=${ECF_RID}
 ENDFILE
 
+# more $POST_OUT
+
 # Define error handler
 ERROR() {
   set +ex

ecflow/ecf/include/model_ver.h

@@ -1,2 +1,8 @@
-. ${NWROOT:?}/versions/${model:?}.ver
-eval export HOME${model}=${NWROOT}/${model}.\${${model}_ver:?}
+#### . ${NWROOT:?}/versions/${model:?}.ver
+#### eval export HOME${model}=${NWROOT}/${model}.\${${model}_ver:?}
+
+. ECF_ROOT_ECFR/ecf_gfsv16_low/ecflow/ecf/versions/${model:?}.ver
+export HOMEgfs=ECF_ROOT_ECFR/ecf_gfsv16_low
+export HOMEobsproc_global=/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/obsproc/gfsv16b/obsproc_global_RB-3.4.0
+export HOMEobsproc_network=/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/obsproc/gfsv16b/obsproc_global_RB-3.4.0
+export HOMEobsproc_prep=/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/obsproc/gfsv16b/obsproc_prep_RB-5.4.0

ecflow/ecf/include/tail.h

@@ -1,3 +1,12 @@
-ecflow_client --complete  # Notify ecFlow of a normal end
+#### ecflow module work around
+#module load ecflow/4.7.1
+export ECF_NAME=%ECF_NAME%
+export ECF_PORT=%ECF_PORT%
+#export ECF_PORT=31867
+export ECF_PASS=%ECF_PASS%
+export ECF_TRYNO=%ECF_TRYNO%
+export ECF_RID=$LSB_JOBID
+/gpfs/dell1/nco/ops/nwprod/ecflow.v4.7.1.0/intel/bin/ecflow_client --complete  # Notify ecFlow of a normal end
+#ecflow_client --complete  # Notify ecFlow of a normal end
 trap 0                    # Remove all traps
 exit 0                    # End the shell

ecflow/ecf/scripts/cycle_end.ecf

@@ -0,0 +1,48 @@
+#! /bin/sh
+set -x
+
+. /usrx/local/prod/lmod/lmod/init/sh
+module load prod_envir/1.0.2 prod_util/1.1.0 ips/18.0.1.163 ecflow/4.7.1
+POST_OUT=/var/lsf/ecflow_post_in.$$
+
+export cyc=%CYC%
+export cycle=t${cyc}z
+export DATAROOT=%DATAROOT%		# Used in emc_cdate.h
+
+if [ -n "%PDY:%" ]; then export PDY=${PDY:-%PDY:%}; fi
+%include <emc_cdate.h>
+
+export ECF_NAME=%ECF_NAME%
+export ECF_HOST=%ECF_LOGHOST%
+export ECF_PORT=%ECF_PORT%
+export ECF_PASS=%ECF_PASS%
+export ECF_TRYNO=%ECF_TRYNO%
+export ECF_RID=$$
+
+if [ $cyc == 00 ]; then cyc_to_wait="06"; fi
+if [ $cyc == 06 ]; then cyc_to_wait="12"; fi
+if [ $cyc == 12 ]; then cyc_to_wait="18"; fi
+if [ $cyc == 18 ]; then cyc_to_wait="00"; fi
+if [ $cyc == 00 ]; then prev_cyc="18"; fi
+if [ $cyc == 06 ]; then prev_cyc="00"; fi
+if [ $cyc == 12 ]; then prev_cyc="06"; fi
+if [ $cyc == 18 ]; then prev_cyc="12"; fi
+
+ecflow_client --alter change variable PDY $PDYp1 /prod${cyc}_lowres
+ecflow_client --msg="***EMC parallel $PDY$cyc is done successfully cycle $PDYp1$cyc is in quote next***"
+ecflow_client --complete
+ecflow_client --requeue=force /prod${cyc}_lowres
+ecflow_client --requeue=force /prod${prev_cyc}_lowres/cycle_end
+
+if [ $cyc == 18 ]; then
+  cd %COM%/gfs/prod
+  find . -type f|grep -v "logs"|grep -v "\.sh"|grep -v "RESTART" | grep -v "sfluxgrb" | grep -v $PDYp1 | grep -v $PDY |grep -v "jlogfile"|grep -v "vrfyarch"|grep -v "tt.sh"|grep -v "atmanl"|grep -v "sfcanl"| awk '{print "rm -f ",$1}' &> tt_auto.sh
+  chmod 700 tt_auto.sh
+  sh tt_auto.sh;mv tt_auto.sh tt_auto-${PDY}.old
+fi
+
+%include <tail.h>
+%manual
+
+%end
+

ecflow/ecf/scripts/gdas/atmos/analysis/jgdas_atmos_analysis.ecf

@@ -4,7 +4,7 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 1:00
-#BSUB -n 1000
+#BSUB -n 84
 #BSUB -R affinity[core(7)]
 #BSUB -R span[ptile=4]
 #BSUB -cwd /tmp
@@ -14,8 +14,8 @@
 
 set -x
 
-export NODES=250
-export ntasks=1000
+export NODES=21
+export ntasks=84
 export ptile=4
 export threads=7
 
@@ -40,6 +40,7 @@ module load grib_util/${grib_util_ver}
 
 module list
 
+#%include <ecf_client.h>
 #############################################################
 # WCOSS environment settings
 #############################################################