Issue #65 - Sync merge branch 'operations' into release/gfsv15.3.1 af…

…ter v15.3.0 commit
NOAA-EMC · Jun 2, 2020 · 4a4b3fb · 4a4b3fb
2 parents bd5a99d + 23f25b7
commit 4a4b3fb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/jobs/JGFS_POSTSND b/jobs/JGFS_POSTSND
@@ -53,7 +53,7 @@ setpdy.sh
 ##############################
 # Define COM Directories
 ##############################
-export COMIN=$COMROOT/${NET}/prod/${RUN}.${PDY}/${cyc} #AJWR 17 Apr 2020: $envir->prod; removed COMIN as default because of ver file hard set
+export COMIN=${COMIN:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}}
 export COMOUT=${COMOUT:-$COMROOT/${NET}/${envir}/${RUN}.${PDY}/${cyc}}
 export pcom=${pcom:-${COMOUT}/wmo}
 export COMAWP=${COMAWP:-${COMOUT}/gempak}

diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
@@ -20,7 +20,7 @@ if [ $machine = "THEIA" ]; then
 
 elif [ $machine = "WCOSS_C" -o $machine = "WCOSS_DELL_P3" ]; then
 
-    export ACCOUNT="FV3GFS-T2O"
+    export ACCOUNT="GFS-DEV"
     export QUEUE="dev"
     export QUEUE_ARCH="dev_transfer"
 
@@ -149,8 +149,9 @@ export HOMEgsi="$HOMEgfs"
 export FIXgsi="$HOMEgfs/fix/fix_gsi"
 export HOMEfv3gfs="$HOMEgfs/sorc/fv3gfs.fd"
 export HOMEpost="$HOMEgfs"
-export HOMEobsproc_prep="$BASE_GIT/obsproc/obsproc_prep_RB-5.2.0"
-export HOMEobsproc_network="$BASE_GIT/obsproc/obsproc_global_RB-3.2.0"
+export HOMEobsproc_prep="$BASE_GIT/obsproc/obsproc_prep.v5.2.0"
+export HOMEobsproc_network="$BASE_GIT/obsproc/obsproc_global.v3.2.6"
+export HOMEobsproc_global=$HOMEobsproc_network
 export BASE_VERIF="$BASE_SVN/verif/global/tags/vsdb"
 
 # CONVENIENT utility scripts and other environment parameters

diff --git a/parm/config/config.prep b/parm/config/config.prep
@@ -23,4 +23,6 @@ export EXECRELO=${HOMERELO}/exec
 export FIXRELO=${HOMERELO}/fix/fix_am
 export USHRELO=${HOMERELO}/ush
 
+export dictionaries_ver=v3.3.0
+
 echo "END: config.prep"
diff --git a/parm/config/config.resources b/parm/config/config.resources
@@ -96,11 +96,11 @@ elif [ $step = "eobs" -o $step = "eomg" ]; then
 
     export wtime_eobs="00:30:00"
     export wtime_eomg="01:00:00"
-    export npe_eobs=140
-    export nth_eobs=2
+    export npe_eobs=308
+    export nth_eobs=1
     export npe_node_eobs=12
     if [[ "$machine" = "WCOSS_DELL_P3" ]]; then
-        export npe_node_eobs=14
+        export npe_node_eobs=28
     fi
     if [[ "$machine" == "WCOSS_C" ]]; then
         export memory_eobs="3072M"

diff --git a/parm/transfer_rdhpcs_gdas.list b/parm/transfer_rdhpcs_gdas.list
@@ -17,6 +17,7 @@
 #  B  bytes, relative size of the path in relation to the other paths in the list
 #  D  delete, delete extraneous files from destination directories (takes no arg)
 #  E  encrypt, enables data encryption [two cores should be allocated] (takes no arg)
+#  W  whole files, copy whole files rather than use delta-xfer algorithm (takes no arg)  (v2.2.3+)
 #  T  two-way syncronization will update both sides with latest changes (takes no arg)
 #  Z  compress data as it is sent, accepts optional compression level argument (1-9)
 # Rules higher in the list take precedence over lower ones.  By default, all files in a
@@ -28,6 +29,7 @@ com/gfs/_ENVIR_/gdas._PDYm1_/ _REMOTEPATH_/com/gfs/_ENVIR_/gdas._PDYm1_/
 + /??/gdas.t??z*tcvitals*
 + /??/gdas.*bufr*
 + /??/gdas.t??z.abias_pc
++ /??/gdas.t??z.abias_air
 + /??/gdas.t??z.abias
 + /??/gdas.t??z.sfcf*.nemsio
 + /??/gdas.t??z.engicegrb
@@ -48,6 +50,7 @@ com/gfs/_ENVIR_/gdas._PDY_/ _REMOTEPATH_/com/gfs/_ENVIR_/gdas._PDY_/
 + /??/gdas.t??z*tcvitals*
 + /??/gdas.*bufr*
 + /??/gdas.t??z.abias_pc
++ /??/gdas.t??z.abias_air
 + /??/gdas.t??z.abias
 + /??/gdas.t??z.sfcf*.nemsio
 + /??/gdas.t??z.engicegrb