- updated versions in Externals.cfg to match sorc/checkout.sh

- no longer check out or compile fv3gfs_emc.fd
- added jet partitions to env/Jet.env to determine npe_node_max
- corrected setting of nwat for GSD suites in config.fcst
- create aero_done file after aeroic task completes
- set COMINsyn path to /lfs4/HFIP/hfv3gfs/glopara/com/gfs/prod/syndat
- set HOMEens_tracker to $HOMEgfs/sorc/ens_tracker.v1.1.15.2/
- change build_fv3.sh to compile fv3gfs_ccpp.fd
- updated GSD forecastonly python script
- updated modules in tracker to match workflow
- added netcdf and tracker files to GSD archive script

Externals.cfg

@@ -1,42 +1,50 @@
 # External sub-modules of global-workflow
 
-[FV3GFS]
-tag = GFS.v16.0.1
-local_path = sorc/fv3gfs.fd
-repo_url = https://github.com/ufs-community/ufs-weather-model.git
+#JKH[FV3GFS]
+#JKHtag = orion_gfs.v16
+#JKHlocal_path = sorc/fv3gfs_emc.fd
+#JKHrepo_url = https://github.com/ufs-community/ufs-weather-model.git
+#JKHprotocol = git
+#JKHrequired = True
+
+[CCPPFV3GFS]
+hash = 27a8a07
+local_path = sorc/fv3gfs_ccpp.fd
+repo_url = https://github.com/NOAA-GSD/ufs-weather-model.git
 protocol = git
 required = True
 
 [GSI]
-tag = gfsda.v16.0.0
+tag = release/gfsda.v16.0.0
 local_path = sorc/gsi.fd
-repo_url = ssh://vlab.ncep.noaa.gov:29418/ProdGSI
+repo_url = https://github.com/NOAA-EMC/GSI.git
 protocol = git
 required = True
 
 [GLDAS]
-tag = gldas_gfsv16_release.v1.0.0
+tag = gldas_gfsv16_release.v1.2.0
 local_path = sorc/gldas.fd
 repo_url = https://github.com/NOAA-EMC/GLDAS.git
 protocol = git
 required = True
 
 [EMC_post]
-tag = upp_gfsv16_release.v1.0.5
+tag = upp_gfsv16_release.v1.0.9
 local_path = sorc/gfs_post.fd
 repo_url = https://github.com/NOAA-EMC/EMC_post.git
 protocol = git
 required = True
 
 [UFS_UTILS]
-branch = release/ops-gfsv16
+#branch = release/ops-gfsv16
+branch = feature/orion
 local_path = sorc/ufs_utils.fd
 repo_url = https://github.com/NOAA-EMC/UFS_UTILS.git
 protocol = git
 required = True
 
 [EMC_verif-global]
-tag = verif_global_v1.6.0
+tag = verif_global_v1.8.1
 local_path = sorc/verif-global.fd
 repo_url = https://github.com/NOAA-EMC/EMC_verif-global.git
 protocol = git
@@ -49,5 +57,12 @@ repo_url = https://github.com/NOAA-EMC/EMC_gfs_wafs.git
 protocol = git
 required = False
 
+[aeroconv]
+hash = b830a6c
+local_path = sorc/aeroconv.fd
+repo_url = https://github.com/NCAR/aeroconv.git
+protocol = git
+required = True
+
 [externals_description]
 schema_version = 1.0.0

INFO

@@ -0,0 +1,2 @@
+17 June 2020
+    - created new branch, gsd-ccpp-jet, from 15Jun20 port2orion branch, ed6b279

env/JET.env

@@ -13,8 +13,11 @@ fi
 
 step=$1
 
-# Theia information
-export npe_node_max=24
+if [[ "$PARTITION_BATCH" = "xjet" ]]; then
+  export npe_node_max=24
+elif [[ "$PARTITION_BATCH" = "vjet" ]]; then 
+  export npe_node_max=16
+fi
 export launcher="srun --export=ALL"
 
 # Configure MPI environment
@@ -194,7 +197,7 @@ elif [ $step = "epos" ]; then
 
 elif [ $step = "fv3ic" ]; then
 
-    export NTHREADS_CHGRES=${nth_chgres:-$npe_node_max}
+    export NTHREADS_CHGRES=${nth_fv3ic:-$npe_node_max}
     [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
     export APRUN_CHGRES="time"
 

jobs/rocoto/aeroic.sh

@@ -70,6 +70,9 @@ yyyymmdd=`echo $CDATE | cut -c1-8`
 # Move output data
 echo "copying updated files to $FV3ICS_DIR...."
 cp -p $DATA/OUTPUT/gfs*nc $FV3ICS_DIR
+status=$?
+[[ $status -ne 0 ]] && exit $status
+touch ${FV3ICS_DIR}/aero_done
 
 ###############################################################
 # Force Exit out cleanly

jobs/rocoto/arch_gsd.sh

@@ -37,16 +37,31 @@ if [ $HPSSARCH = "YES" ]; then
 
   if [ $CDUMP = "gfs" ]; then
 
-      # archive nemsio files (gfs.t00z.atmfHHH.nemsio, gfs.t00z.sfcfHHH.nemsio, gfs.t00z.logfHHH.nemsio )
-      htar -P -cvf $ATARDIR/$CDATE/gfs_nemsio.tar gfs.*nemsio
-      status=$?
-      if [ $status -ne 0 ]; then
-        echo "HTAR $CDATE gfs_nemsio.tar failed"
-        exit $status
+      ## nemsio files ##
+      if [ -f *nemsio ]; then
+        # archive nemsio files (gfs.t00z.atmfHHH.nemsio, gfs.t00z.sfcfHHH.nemsio, gfs.t00z.logfHHH.nemsio )
+        htar -P -cvf $ATARDIR/$CDATE/gfs_nemsio.tar gfs.*nemsio
+        status=$?
+        if [ $status -ne 0 ]; then
+          echo "HTAR $CDATE gfs_nemsio.tar failed"
+          exit $status
+        fi
       fi
-
-      # archive GRIB2 files (gfs.t00z.pgrb2.0p25.fHHH, gfs.t00z.pgrb2.0p50.fHHH)
-      htar -P -cvf $ATARDIR/$CDATE/gfs_pgrb2.tar gfs.*pgrb2.0p25* gfs.*pgrb2.0p5*
+
+      ## netcdf files ##
+      if [ -f *nc ]; then
+        # archive netcdf files (gfs.t00z.atmfHHH.nc, gfs.t00z.sfcfHHH.nc, gfs.t00z.logfHHH.txt )
+        htar -P -cvf $ATARDIR/$CDATE/gfs_nc.tar gfs*.nc gfs.*log*.txt
+        status=$?
+        if [ $status -ne 0 ]; then
+          echo "HTAR $CDATE gfs_nc.tar failed"
+          exit $status
+        fi
+      fi
+
+      # archive GRIB2 files (gfs.t00z.pgrb2.0p25.fHHH, gfs.t00z.pgrb2.0p50.fHHH) 
+      # and tracker files (avno.t00z.cyclone.trackatcfunix, avnop.t00z.cyclone.trackatcfunix)
+      htar -P -cvf $ATARDIR/$CDATE/gfs_pgrb2.tar gfs.*pgrb2.0p25* gfs.*pgrb2.0p5* avno*
       status=$?
       if [ $status -ne 0 ]; then
         echo "HTAR $CDATE gfs_pgrb2.tar failed"

parm/config/config.fcst

@@ -149,6 +149,7 @@ elif [ $imp_physics -eq 6 ]; then # WSM6
     export nwat=6
 
 elif [ $imp_physics -eq 8 ]; then # Thompson
+    export nwat=6
     if [[ "$CCPP_SUITE" == "FV3_GSD_v0" || "$CCPP_SUITE" == "FV3_GSD_noah" ]] ; then
         export ncld=5
         export FIELD_TABLE="$HOMEgfs/parm/parm_fv3diag/field_table_gsd"
@@ -167,7 +168,6 @@ elif [ $imp_physics -eq 8 ]; then # Thompson
     else
         export ncld=2
         export FIELD_TABLE="$HOMEgfs/parm/parm_fv3diag/field_table_thompson${tbf}"
-        export nwat=6
     fi
 
 elif [ $imp_physics -eq 11 ]; then # GFDL

parm/config/config.vrfy

@@ -145,6 +145,11 @@ export HOMEens_tracker=$BASE_GIT/tracker/ens_tracker.${ens_tracker_ver}
 if [ $machine = "ORION" ] ; then
     export HOMEens_tracker=$BASE_GIT/tracker/TC_tracker.v1.1.15.2
 fi
+##  JKH
+if [ $machine = "JET" ] ; then                            
+    export ens_tracker_ver=v1.1.15.2
+    export HOMEens_tracker=$HOMEgfs/sorc/ens_tracker.${ens_tracker_ver}
+fi
 
 if [ "$VRFYTRAK" = "YES" ]; then
 
@@ -159,6 +164,9 @@ if [ "$VRFYTRAK" = "YES" ]; then
     if [ $machine = "HERA" ]; then
        export COMROOTp1="/scratch1/NCEPDEV/rstprod/com"
        export COMINsyn=${COMINsyn:-${COMROOTp1}/arch/prod/syndat}
+    elif [ $machine = "JET" ]; then
+       export COMINsyn=${COMINsyn:-/mnt/lfs4/HFIP/hfv3gfs/glopara/com/gfs/prod/syndat}
+#JKH   export COMINsyn=${COMINsyn:-/mnt/lfs4/HFIP/hwrf-data/hwrf-input/SYNDAT}
     else
        export COMINsyn=${COMINsyn:-${COMROOT}/gfs/prod/syndat}
     fi

sorc/build_fv3.sh

@@ -20,7 +20,7 @@ if [ $target = hera ]; then target=hera.intel ; fi
 if [ $target = jet ]; then target=jet.intel ; fi
 if [ $target = orion ]; then target=orion.intel ; fi
 
-cd fv3gfs.fd/
+cd fv3gfs_ccpp.fd/
 FV3=$( pwd -P )/FV3
 cd tests/
 #JKH./compile.sh "$FV3" "$target" "WW3=Y 32BIT=Y" 1

sorc/checkout.sh

@@ -4,25 +4,25 @@ set -xue
 topdir=$(pwd)
 echo $topdir
 
-echo fv3gfs checkout ...
-if [[ ! -d fv3gfs.fd ]] ; then
-    rm -f ${topdir}/checkout-fv3gfs.log
-    #git clone https://github.com/ufs-community/ufs-weather-model fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1
-    git clone https://github.com/DusanJovic-NOAA/ufs-weather-model fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1
-    cd fv3gfs.fd
+echo fv3gfs_emc checkout ...
+if [[ ! -d fv3gfs_emc.fd ]] ; then
+    rm -f ${topdir}/checkout-fv3gfs_emc.log
+    #git clone https://github.com/ufs-community/ufs-weather-model fv3gfs_emc.fd >> ${topdir}/checkout-fv3gfs_emc.log 2>&1
+    git clone https://github.com/DusanJovic-NOAA/ufs-weather-model fv3gfs_emc.fd >> ${topdir}/checkout-fv3gfs_emc.log 2>&1
+    cd fv3gfs_emc.fd
     git checkout orion_gfs.v16
     git submodule update --init --recursive
     cd ${topdir}
 else
-    echo 'Skip.  Directory fv3gfs.fd already exists.'
+    echo 'Skip.  Directory fv3gfs_emc.fd already exists.'
 fi
 
 echo fv3gfs_ccpp checkout ...
 if [[ ! -d fv3gfs_ccpp.fd ]] ; then
     rm -f ${topdir}/checkout-fv3gfs_ccpp.log
     git clone --recursive -b gsd/develop https://github.com/NOAA-GSD/ufs-weather-model  fv3gfs_ccpp.fd >> ${topdir}/checkout-fv3gfs_ccpp.log 2>&1
     cd fv3gfs_ccpp.fd
-#    git checkout 6671b15df63eb1c728670139b53d59d63cbbf946
+    git checkout 27a8a079baeb436873fc102128feef4ee6625d46
     git submodule sync
     git submodule update --init --recursive
     cd ${topdir}
@@ -102,11 +102,13 @@ else
 fi
 
 echo aeroconv checkout ...
-if [[ ! -d aeroconv ]] ; then
+if [[ ! -d aeroconv.fd ]] ; then
     rm -f ${topdir}/checkout-aero.log
-    git clone https://github.com/NCAR/aeroconv aeroconv >> ${topdir}/checkout-aero.log 2>&1
+    git clone https://github.com/NCAR/aeroconv aeroconv.fd >> ${topdir}/checkout-aero.log 2>&1
+    cd aeroconv.fd
+    git checkout b830a6c
 else
-    echo 'Skip.  Directory aeroconv already exists.'
+    echo 'Skip.  Directory aeroconv.fd already exists.'
 fi
 
 exit 0

sorc/ens_tracker.v1.1.15.2/jobs/JFV3_CYCLONE_TRACK_JP

@@ -50,9 +50,8 @@ export USHens_tracker=${USHens_tracker:-$HOMEens_tracker/ush}
 ##############################
 # Run setpdy and initialize PDY variables
 ##############################
-#setpdy.sh
-#. PDY
-export PDY=20200612
+setpdy.sh
+. PDY
 
 ##############################################
 # Define COM directories
@@ -90,13 +89,10 @@ elif [[ -d /work ]] ; then
 #  export COMINsyn=/work/noaa/global/kfriedma/glopara/git/tracker/syndat
   export COMINsyn=/work/noaa/global/Jiayi.Peng/syndat
 
-elif [[ -d /lfs3 ]] ; then
+elif [[ -d /lfs4 ]] ; then
   # We are on NOAA Jet
-#  export COMINgfs=${COMINgfs:-${COMROOTp1}/gfs/prod/gfs.${PDY}}
-#  export COMINsyn=${COMINsyn:-${COMROOTp1}/arch/prod/syndat}
-#  export COMINgfs=${COMINgfs:-/mnt/lfs3/projects/hwrfv3/Jiayi.Peng/data/gfs.${PDY}}
+  export COMINgfs=${COMINgfs:-${COMROOTp1}/gfs/prod/gfs.${PDY}}
   export COMINsyn=${COMINsyn:-/mnt/lfs4/HFIP/hwrf-data/hwrf-input/SYNDAT}
-  export COMINgfs=${COMINgfs:-/mnt/lfs4/HFIP/hwrfv3/Jiayi.Peng/data/gfs.20200612}
 else
   echo Job failed: unknown platform 1>&2
   err_exit "FAILED ${jobid} - ERROR IN unknown platform - ABNORMAL EXIT"

sorc/ens_tracker.v1.1.15.2/sorc/Module_ens_tracker.v1.1.15_for_Jet

@@ -24,3 +24,8 @@ module load ip/v3.0.1
 module load hdf5_parallel/1.10.6
 module load netcdf_parallel/4.7.4
 module load w3emc_para/v2.4.0
+
+setenv NCEPLIBS  /lfs4/HFIP/hfv3gfs/gwv/l0530/lib/
+module use -a /mnt/lfs4/HFIP/hfv3gfs/gwv/l0530/lib/modulefiles
+module load esmflocal/8_0_1
+module load netcdfp/4.7.4