diff --git a/parm/config/config.anal b/parm/config/config.anal index adc893f266..5b045a7d56 100755 --- a/parm/config/config.anal +++ b/parm/config/config.anal @@ -48,7 +48,7 @@ export AMSR2BF=${AMSR2BF:-/dev/null} export ABIBF="/dev/null" if [[ "$CDATE" -ge "2019022800" ]] ; then export ABIBF="$DMPDIR/${CDUMP}x.${PDY}/${cyc}/${CDUMP}.t${cyc}z.gsrcsr.tm00.bufr_d" - if [[ "$CDATE" -ge "2019111000" ]]; then + if [[ "$CDATE" -ge "2019111000" && "$CDATE" -le "2020052612" ]]; then export ABIBF="$DMPDIR/${CDUMP}y.${PDY}/${cyc}/${CDUMP}.t${cyc}z.gsrcsr.tm00.bufr_d" fi fi @@ -82,16 +82,18 @@ if [[ "$CDATE" -ge "2019110706" && "$CDATE" -lt "2020040718" ]]; then export OBERROR=$FIXgsi/gfsv16_historical/prepobs_errtable.global.2019110706 fi +# Assimilate 135 (T) & 235 (uv) Canadian AMDAR observations +if [[ "$CDATE" -ge "2020040718" && "$CDATE" -lt "2020052612" ]]; then + export CONVINFO=$FIXgsi/gfsv16_historical/global_convinfo.txt.2020040718 +fi + # NOTE: -# As of 2020040718, gfsv16_historical/global_convinfo.txt.2020040718 is +# As of 2020052612, gfsv16_historical/global_convinfo.txt.2020052612 is # identical to ../global_convinfo.txt. Thus, the logic below is not -# needed at this time. A similar comment applies to ../prepobs_errtable.global -# and gfsv16_historical/prepobs_errtable.global.2019110706 - -# Assimilate 135 (T) & 235 (uv) Canadian AMDAR observations -##if [[ "$CDATE" -ge "2020040718" && "$CDATE" -lt "YYYYMMDDHH" ]]; then_break -## export CONVINFO=$FIXgsi/gfsv16_historical/global_convinfo.txt.2020040718 -## export OBERROR=$FIXgsi/gfsv16_historical/prepobs_errtable.global.2020040718 +# needed at this time. +# Assimilate COSMIC-2 GPS +##if [[ "$CDATE" -ge "2020052612" && "$CDATE" -lt "YYYYMMDDHH" ]]; then +## export CONVINFO=$FIXgsi/gfsv16_historical/global_convinfo.txt.2020052612 ##fi @@ -117,7 +119,7 @@ fi # needed at this time # # Turn off assmilation of all Metop-A MHS -## if [[ "$CDATE" -ge "2020022012" && "$CDATE" -lt "YYYYMMDDHH" ]]; then_break +## if [[ "$CDATE" -ge "2020022012" && "$CDATE" -lt "YYYYMMDDHH" ]]; then ## export SATINFO=$FIXgsi/gfsv16_historical/global_satinfo.txt.2020022012 ## fi diff --git a/parm/config/config.awips b/parm/config/config.awips index c5a8d45caa..76a9c21536 100755 --- a/parm/config/config.awips +++ b/parm/config/config.awips @@ -12,6 +12,6 @@ export AWIPS20SH=$HOMEgfs/jobs/JGFS_AWIPS_20KM_1P0DEG export AWIPSG2SH=$HOMEgfs/jobs/JGFS_AWIPS_G2 # No. of concurrent awips jobs -export NAWIPSGRP=21 +export NAWIPSGRP=42 echo "END: config.awips" diff --git a/parm/config/config.fcst b/parm/config/config.fcst index e5d8e5eb64..a26729bd08 100755 --- a/parm/config/config.fcst +++ b/parm/config/config.fcst @@ -59,7 +59,7 @@ export do_tofd=".true." export launch_level=$(echo "$LEVS/2.35" |bc) # Sponge layer settings for L127 -if [ $LEVS = "128" ]; then +if [ $LEVS = "128" -a "$CDUMP" = "gdas" ]; then export tau=5.0 export rf_cutoff=1.0e3 export d2_bg_k1=0.20 @@ -79,7 +79,7 @@ if [ $lsm -eq 2 ]; then export lheatstrg=".false." export landice=".false." else - export lheatstrg=".true." + export lheatstrg=".false." export landice=".true." fi diff --git a/parm/config/config.fv3 b/parm/config/config.fv3 index f8fbbfce16..8aaaee3d8e 100755 --- a/parm/config/config.fv3 +++ b/parm/config/config.fv3 @@ -41,8 +41,8 @@ case $case_in in export layout_y=4 export layout_x_gfs=2 export layout_y_gfs=4 - export npe_wav=70 - export npe_wav_gfs=70 + export npe_wav=14 + export npe_wav_gfs=14 export nth_fv3=1 export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=1 @@ -57,8 +57,8 @@ case $case_in in export layout_y=4 export layout_x_gfs=4 export layout_y_gfs=4 - export npe_wav=70 - export npe_wav_gfs=70 + export npe_wav=14 + export npe_wav_gfs=14 export nth_fv3=1 export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=1 @@ -73,8 +73,8 @@ case $case_in in export layout_y=6 export layout_x_gfs=4 export layout_y_gfs=6 - export npe_wav=70 - export npe_wav_gfs=70 + export npe_wav=21 + export npe_wav_gfs=21 export nth_fv3=2 export cdmbgwd="0.23,1.5,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=1 @@ -89,8 +89,8 @@ case $case_in in export layout_y=8 export layout_x_gfs=6 export layout_y_gfs=6 - export npe_wav=270 - export npe_wav_gfs=270 + export npe_wav=35 + export npe_wav_gfs=35 export nth_fv3=1 export cdmbgwd="1.1,0.72,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=1 @@ -105,8 +105,8 @@ case $case_in in export layout_y=8 export layout_x_gfs=16 export layout_y_gfs=12 - export npe_wav=280 - export npe_wav_gfs=280 + export npe_wav=70 + export npe_wav_gfs=70 export nth_fv3=4 export cdmbgwd="4.0,0.15,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=2 @@ -121,8 +121,8 @@ case $case_in in export layout_y=16 export layout_x_gfs=8 export layout_y_gfs=16 - export npe_wav=270 - export npe_wav_gfs=270 + export npe_wav=140 + export npe_wav_gfs=140 export nth_fv3=4 export cdmbgwd="4.0,0.10,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=4 @@ -137,8 +137,8 @@ case $case_in in export layout_y=32 export layout_x_gfs=16 export layout_y_gfs=32 - export npe_wav=270 - export npe_wav_gfs=270 + export npe_wav=140 + export npe_wav_gfs=140 export nth_fv3=4 export cdmbgwd="4.0,0.05,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=4 diff --git a/parm/config/config.prep b/parm/config/config.prep index 15c58c6121..71479e9b9d 100755 --- a/parm/config/config.prep +++ b/parm/config/config.prep @@ -48,7 +48,7 @@ fi # needed at this time # Set observation errors for type 135 (T) & 235 (uv) Canadian AMDAR observations -##if [[ "$CDATE" -ge "2020040718" && "$CDATE" -lt "YYYMMDDHH" ]]; then_break +##if [[ "$CDATE" -ge "2020040718" && "$CDATE" -lt "YYYMMDDHH" ]]; then ## export PRVT=$EXPDIR/prepobs_errtable.global ##fi diff --git a/parm/config/config.waveprep b/parm/config/config.waveprep index ad57a78b1a..19353c2440 100755 --- a/parm/config/config.waveprep +++ b/parm/config/config.waveprep @@ -36,6 +36,9 @@ export WAV_CUR_HF_DT=${WAV_CUR_HF_DT:-3} export WAV_CUR_HF_FH=${WAV_CUR_HF_FH:-72} export WAV_CUR_CDO_SMOOTH="NO" +# Location of CDO module +export CDO_ROOT=${CDO_ROOT:-/gpfs/dell1/nco/ops/nwprod/rtofs_shared/rtofs_cdo.v1.6.0} + if [ "${WW3ICEINP}" = "YES" ]; then export WAVICEFILE=${CDUMP}.t${cyc}z.seaice.5min.grib2 fi diff --git a/scripts/exwave_prep.sh b/scripts/exwave_prep.sh index b37c3c0c63..cdb08b4dc6 100755 --- a/scripts/exwave_prep.sh +++ b/scripts/exwave_prep.sh @@ -746,8 +746,8 @@ for file in $files do echo $file - cat -s $file >> cur.${WAVECUR_FID} -# rm -f $file + cat $file >> cur.${WAVECUR_FID} + rm -f $file done cp -f cur.${WAVECUR_FID} ${COMOUT}/rundata/${COMPONENTwave}.${WAVECUR_FID}.$cycle.cur diff --git a/sorc/checkout.sh b/sorc/checkout.sh index c672f195f4..90670de550 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -9,7 +9,7 @@ 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 cd fv3gfs.fd - git checkout GFS.v16.0.3 + git checkout GFS.v16.0.4 git submodule update --init --recursive cd ${topdir} else diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh index e7af4f122d..8dd812453a 100755 --- a/ush/hpssarch_gen.sh +++ b/ush/hpssarch_gen.sh @@ -70,8 +70,8 @@ if [ $type = "gfs" ]; then echo "${dirname}trak.gfso.atcfunix.altg.${PDY}${cyc} " >>gfsa.txt echo "${dirname}storms.gfso.atcf_gen.${PDY}${cyc} " >>gfsa.txt echo "${dirname}storms.gfso.atcf_gen.altg.${PDY}${cyc} " >>gfsa.txt - echo "${dirname}nawips/gfs_${PDY}${cyc}.sfc " >>gfsa.txt - echo "${dirname}nawips/gfs_${PDY}${cyc}.snd " >>gfsa.txt + echo "${dirname}gempak/gfs_${PDY}${cyc}.sfc " >>gfsa.txt + echo "${dirname}gempak/gfs_${PDY}${cyc}.snd " >>gfsa.txt echo "${dirname}bufr.t${cyc}z " >>gfsa.txt echo "./logs/${CDATE}/gfs*.log " >>gfsa.txt diff --git a/ush/wave_prnc_cur.sh b/ush/wave_prnc_cur.sh index 14e9b272a3..d05255bc6a 100755 --- a/ush/wave_prnc_cur.sh +++ b/ush/wave_prnc_cur.sh @@ -57,7 +57,7 @@ else fi # Cleanup -#### #rm -f cur_temp[123].nc cur_5min_??.nc cur_glo_uv_${PDY}_${fext}${fh3}.nc weights.nc +rm -f cur_temp[123].nc cur_5min_??.nc cur_glo_uv_${PDY}_${fext}${fh3}.nc weights.nc if [ ${fhr} -gt ${WAVHINDH} ] then