Merge remote-tracking branch 'dingchen/hotfix/pqpf' into hotfix/pqpf

DingchenHou-NOAA · Nov 27, 2020 · 3ec5ea7 · 3ec5ea7
2 parents b6e55aa + 6c32ae9
commit 3ec5ea7
Show file tree

Hide file tree

Showing 434 changed files with 245 additions and 9,989 deletions.
diff --git a/jobs/.gitignore b/jobs/.gitignore
@@ -0,0 +1,7 @@
+# Ignore the j-job scripts for developer use
+JGEFS_CHEM_POST_CLEANUP
+JGEFS_EXTRACTVARS
+JGEFS_POST_GENESIS
+JGEFS_POST_TRACK
+JGEFS_POST_TRACK_GFS
+JGEFS_RF_PREP
diff --git a/jobs/JGEFS_ATMOS_ENSPOST b/jobs/JGEFS_ATMOS_ENSPOST
@@ -72,7 +72,7 @@ export PARMgefs=${PARMgefs:-$HOMEgefs/parm}
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/$cyc}
+export COMIN=${COMIN:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/$cyc}
 export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/$cyc}
 
 #############################

diff --git a/modulefiles/gefs/.gitignore b/modulefiles/gefs/.gitignore
@@ -0,0 +1,2 @@
+# Ignore the modulefiles for developer use
+global_enspqpf.*
diff --git a/rocoto/bin/cray/avg_gempak_vgf.sh b/rocoto/bin/cray/avg_gempak_vgf.sh
diff --git a/rocoto/bin/cray/cqpf.sh b/rocoto/bin/cray/cqpf.sh
diff --git a/rocoto/bin/cray/extractvars.sh b/rocoto/bin/cray/extractvars.sh
@@ -43,5 +43,5 @@ ulimit -a
 
 
 # CALL executable job script here
-$SOURCEDIR/rocoto/bin/sh/JGEFS_EXTRACTVARS
+$SOURCEDIR/jobs/JGEFS_EXTRACTVARS
 
diff --git a/rocoto/bin/cray/post_genesis.sh b/rocoto/bin/cray/post_genesis.sh
@@ -37,4 +37,4 @@ export FORECAST_SEGMENT=lr
 #export RUN_ENVIR=${RUN_ENVIR:-dev}
 
 # CALL executable job script here
-$SOURCEDIR/rocoto/bin/sh/JGEFS_POST_GENESIS
+$SOURCEDIR/jobs/JGEFS_POST_GENESIS
diff --git a/rocoto/bin/cray/post_track.sh b/rocoto/bin/cray/post_track.sh
@@ -38,4 +38,4 @@ ulimit -a
 #export gefsmpexec_mpmd="  aprun -b -j1 -n21 -N7 -d1 -cc depth  cfp mpmd_cmdfile"
 
 # CALL executable job script here
-$SOURCEDIR/rocoto/bin/sh/JGEFS_POST_TRACK
+$SOURCEDIR/jobs/JGEFS_POST_TRACK
diff --git a/rocoto/bin/cray/rf_prep.sh b/rocoto/bin/cray/rf_prep.sh
@@ -18,5 +18,5 @@ ulimit -a
 #. $GEFS_ROCOTO/parm/gefs_dev.parm
 
 # CALL executable job script here
-$SOURCEDIR/rocoto/bin/sh/JGEFS_RF_PREP
+$SOURCEDIR/jobs/JGEFS_RF_PREP
 
diff --git a/rocoto/bin/gefs_dev/gempak/fix/g2varswmo2.tbl.orig0827 b/rocoto/bin/gefs_dev/gempak/fix/g2varswmo2.tbl.orig0827
diff --git a/rocoto/bin/gefs_dev/gempak/fix/g2varswmo2.tbl.test b/rocoto/bin/gefs_dev/gempak/fix/g2varswmo2.tbl.test
diff --git a/rocoto/bin/gefs_dev/gempak/fix/g2varswmo2.tbl.test2 b/rocoto/bin/gefs_dev/gempak/fix/g2varswmo2.tbl.test2
diff --git a/rocoto/bin/gefs_dev/gempak/fix/gefs_avg_vgf_00 b/rocoto/bin/gefs_dev/gempak/fix/gefs_avg_vgf_00
diff --git a/rocoto/bin/gefs_dev/gempak/fix/gefs_avg_vgf_12 b/rocoto/bin/gefs_dev/gempak/fix/gefs_avg_vgf_12
diff --git a/rocoto/bin/gefs_dev/gempak/ush/gefs_avg_gempak_vgf.sh b/rocoto/bin/gefs_dev/gempak/ush/gefs_avg_gempak_vgf.sh
diff --git a/rocoto/bin/gefs_dev/jobs/JGEFS_ATMOS_AVG_GEMPAK_VGF b/rocoto/bin/gefs_dev/jobs/JGEFS_ATMOS_AVG_GEMPAK_VGF