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

Refs: #2
XianwuXue-NOAA · Nov 30, 2020 · 5520fec · 5520fec
2 parents 4e0535c + 1451baf
commit 5520fec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/scripts/exgefs_atmos_enspost.sh b/scripts/exgefs_atmos_enspost.sh
@@ -173,7 +173,7 @@ while [[ $fh -le $FHOUR ]]; do
 			previncr=no
 			for mem in $memberlist; do
 				(( nmem = nmem + 1 ))
-				testfile=$COMIN/$COMPONENT/pgrb2$lr/ge${mem}.${cycle}.pgrb2$FXT\f$fh$EXT.idx
+				testfile=$COMIN/$COMPONENT/pgrb2$lr/ge${mem}.${cycle}.pgrb2${FXT}f$fh$EXT.idx
 				if [ -f $testfile ]; then
 					echo testfile=$testfile found
 					(( nfiles = nfiles + 1 ))
@@ -470,20 +470,20 @@ fi # test "$cycle" = "t00z"
 # part (1b): probabilistic forecasts ( PQPF, PQRF, PQFF, PQSF and PQIF )
 if [[ -z $ext_h ]]; then
 
-export CDATE=$PDY$cyc; 
-$ENSPQPF
-
-for file in pqpf pqrf pqff pqsf pqif; do
-    $CNVGRIB -g21 $DATA/$file $DATA/$file\_grb1
-    $WGRIB2 $DATA/$file -s >$DATA/$file\.idx
-    $GRBINDEX $DATA/$file\_grb1 $DATA/${file}i_grb1
-     if [ $SENDCOM = "YES" ];        then
-             mv $DATA/${file} $COMOUT/$COMPONENT/ensstat/ensstat_grb2${ext_h}.$cycle.$file
-             mv $DATA/${file}.idx $COMOUT/$COMPONENT/ensstat/ensstat_grb2${ext_h}.$cycle.${file}.idx
-             mv $DATA/${file}_grb1 $COMOUT/$COMPONENT/ensstat/ensstat${ext_h}.$cycle.$file
-             mv $DATA/${file}i_grb1 $COMOUT/$COMPONENT/ensstat/ensstat${ext_h}.$cycle.${file}i
-     fi # [ $SENDCOM = "YES" ]
-done # for file in pqpf pqrf pqff pqsf pqif
+	export CDATE=$PDY$cyc; 
+	$ENSPQPF
+
+	for file in pqpf pqrf pqff pqsf pqif; do
+		$CNVGRIB -g21 $DATA/$file $DATA/${file}_grb1
+		$WGRIB2 $DATA/$file -s >$DATA/${file}.idx
+		$GRBINDEX $DATA/${file}_grb1 $DATA/${file}i_grb1
+		if [ $SENDCOM = "YES" ];        then
+			mv $DATA/${file} $COMOUT/$COMPONENT/ensstat/ensstat_grb2${ext_h}.$cycle.$file
+			mv $DATA/${file}.idx $COMOUT/$COMPONENT/ensstat/ensstat_grb2${ext_h}.$cycle.${file}.idx
+			mv $DATA/${file}_grb1 $COMOUT/$COMPONENT/ensstat/ensstat${ext_h}.$cycle.$file
+			mv $DATA/${file}i_grb1 $COMOUT/$COMPONENT/ensstat/ensstat${ext_h}.$cycle.${file}i
+		fi # [ $SENDCOM = "YES" ]
+	done # for file in pqpf pqrf pqff pqsf pqif
 
 fi
 

diff --git a/sorc/global_enspqpf.fd/PQPF.f90 b/sorc/global_enspqpf.fd/PQPF.f90
@@ -184,7 +184,7 @@ program pqpf
   do n = 1, len         !### 16 (days) * 4 = 64 (6-hr)
     do l = 1, 5          !### 5 categorical
 
-    ! Part I: get ctl + 10  ensemble members precipitation data
+    ! Part I: get ctl + npert  ensemble members precipitation data
 
       icnt=0
       pp=0.0