Issue 694: Upgrade/refactoring for U and V write-out sub for FV3REG GSI failure …

regression/global_4denvar.sh

@@ -55,14 +55,15 @@ cycg=`echo $gdate | cut -c9-10`
 dumpobs=gdas
 prefix_obs=${dumpobs}.t${cyca}z
 prefix_ges=gdas.t${cycg}z
-prefix_ens=gdas.t${cycg}z
+prefix_ens=enkfgdas.t${cycg}z
 suffix=tm00.bufr_d
 
 dumpges=gdas
 COMROOTgfs=$casesdir/gfs/prod
-datobs=$COMROOTgfs/$dumpobs.$PDYa/${cyca}/atmos
-datges=$COMROOTgfs/$dumpges.$PDYg/${cycg}/atmos
-datens=$COMROOTgfs/enkfgdas.$PDYg/${cycg}/atmos
+datobs=$COMROOTgfs/$dumpobs.$PDYa/${cyca}/obs
+dathis=$COMROOTgfs/$dumpges.$PDYg/${cycg}/model_data/atmos/history
+datanl=$COMROOTgfs/gdas.$PDYg/${cycg}/analysis/atmos
+datens=$COMROOTgfs/enkfgdas.$PDYg/${cycg}
 
 
 # Set up $tmpdir
@@ -265,28 +266,28 @@ $nln $datobs/${prefix_obs}.esatms.${suffix}        ./atmsbufrears
 ## $nln $datobs/${prefix_obs}.amsr2.tm00.bufr_d    ./amsr2bufr
 
 # Copy bias correction, atmospheric and surface files
-$nln $datges/${prefix_ges}.abias                      ./satbias_in
-$nln $datges/${prefix_ges}.abias_pc                   ./satbias_pc
-$nln $datges/${prefix_ges}.abias_air                  ./aircftbias_in
-$nln $datges/${prefix_ges}.radstat                    ./radstat.gdas
-
-$nln $datges/${prefix_ges}.sfcf003.nc         ./sfcf03
-$nln $datges/${prefix_ges}.sfcf004.nc         ./sfcf04
-$nln $datges/${prefix_ges}.sfcf005.nc         ./sfcf05
-$nln $datges/${prefix_ges}.sfcf006.nc         ./sfcf06
-$nln $datges/${prefix_ges}.sfcf007.nc         ./sfcf07
-$nln $datges/${prefix_ges}.sfcf008.nc         ./sfcf08
-$nln $datges/${prefix_ges}.sfcf009.nc         ./sfcf09
-
-$nln $datges/${prefix_ges}.atmf003.nc         ./sigf03
-$nln $datges/${prefix_ges}.atmf004.nc         ./sigf04
-$nln $datges/${prefix_ges}.atmf005.nc         ./sigf05
-$nln $datges/${prefix_ges}.atmf006.nc         ./sigf06
-$nln $datges/${prefix_ges}.atmf007.nc         ./sigf07
-$nln $datges/${prefix_ges}.atmf008.nc         ./sigf08
-$nln $datges/${prefix_ges}.atmf009.nc         ./sigf09
-
-$nln $datens/${prefix_ens}.sfcf006.ensmean.nc         ./sfcf06_anlgrid
+$nln $datanl/${prefix_ges}.abias                      ./satbias_in
+$nln $datanl/${prefix_ges}.abias_pc                   ./satbias_pc
+$nln $datanl/${prefix_ges}.abias_air                  ./aircftbias_in
+$nln $datanl/${prefix_ges}.radstat                    ./radstat.gdas
+
+$nln $dathis/${prefix_ges}.sfcf003.nc         ./sfcf03
+$nln $dathis/${prefix_ges}.sfcf004.nc         ./sfcf04
+$nln $dathis/${prefix_ges}.sfcf005.nc         ./sfcf05
+$nln $dathis/${prefix_ges}.sfcf006.nc         ./sfcf06
+$nln $dathis/${prefix_ges}.sfcf007.nc         ./sfcf07
+$nln $dathis/${prefix_ges}.sfcf008.nc         ./sfcf08
+$nln $dathis/${prefix_ges}.sfcf009.nc         ./sfcf09
+
+$nln $dathis/${prefix_ges}.atmf003.nc         ./sigf03
+$nln $dathis/${prefix_ges}.atmf004.nc         ./sigf04
+$nln $dathis/${prefix_ges}.atmf005.nc         ./sigf05
+$nln $dathis/${prefix_ges}.atmf006.nc         ./sigf06
+$nln $dathis/${prefix_ges}.atmf007.nc         ./sigf07
+$nln $dathis/${prefix_ges}.atmf008.nc         ./sigf08
+$nln $dathis/${prefix_ges}.atmf009.nc         ./sigf09
+
+$nln $datens/ensstat/model_data/atmos/history/${prefix_ens}.sfcf006.ensmean.nc         ./sfcf06_anlgrid
 
 export ENS_PATH='./ensemble_data/'
 mkdir -p ${ENS_PATH}
@@ -296,7 +297,7 @@ for fh in $flist; do
     imem=1
     while [[ $imem -le $NMEM_ENKF ]]; do
 	member="mem"`printf %03i $imem`
-	$nln $datens/$member/$sigens ${ENS_PATH}sigf${fh}_ens_${member}
+	$nln $datens/$member/model_data/atmos/history/$sigens ${ENS_PATH}sigf${fh}_ens_${member}
 	(( imem = $imem + 1 ))
     done
 done

regression/global_enkf.sh

@@ -51,17 +51,14 @@ cyca=`echo $global_adate | cut -c9-10`
 PDYg=`echo $gdate | cut -c1-8`
 cycg=`echo $gdate | cut -c9-10`
 
-dumpobs=gdas
-prefix_obs=${dumpobs}.t${cyca}z
-prefix_ges=gdas.t${cycg}z
-prefix_ens=gdas.t${cycg}z
+prefix_obs=enkfgdas.t${cyca}z
+prefix_ens=enkfgdas.t${cycg}z
 suffix=tm00.bufr_d
 
 dumpges=gdas
 COMROOTgfs=$casesdir/gfs/prod
-datobs=$COMROOTgfs/enkfgdas.$PDYa/${cyca}/atmos
-datges=$COMROOTgfs/$dumpges.$PDYg/${cycg}/atmos
-datens=$COMROOTgfs/enkfgdas.$PDYg/${cycg}/atmos
+datobs=$COMROOTgfs/enkfgdas.$PDYa/${cyca}/ensstat/analysis/atmos
+datens=$COMROOTgfs/enkfgdas.$PDYg/${cycg}
 
 
 # Set up $tmpdir
@@ -166,19 +163,19 @@ nfhrs=`echo $IAUFHRS_ENKF | sed 's/,/ /g'`
 for fhr in $nfhrs; do
     for imem in $(seq 1 $NMEM_ENKF); do
 	memchar="mem"$(printf %03i $imem)
-	$nln $datens/$memchar/${prefix_ens}.atmf00${fhr}.nc sfg_${global_adate}_fhr0${fhr}_${memchar}
+	$nln $datens/$memchar/model_data/atmos/history/${prefix_ens}.atmf00${fhr}.nc sfg_${global_adate}_fhr0${fhr}_${memchar}
         if [ $cnvw_option = ".true." ]; then
-            $nln $datens/$memchar/${prefix_ens}sfcf00${fhr}.nc sfgsfc_${global_adate}_fhr0${fhr}_${memchar}
+            $nln $datens/$memchar/model_data/atmos/history/${prefix_ens}sfcf00${fhr}.nc sfgsfc_${global_adate}_fhr0${fhr}_${memchar}
         fi
 	(( imem = $imem + 1 ))
     done
-    $nln $datens/${prefix_ens}.atmf00${fhr}.ensmean.nc sfg_${global_adate}_fhr0${fhr}_ensmean
+    $nln $datens/ensstat/model_data/atmos/history/${prefix_ens}.atmf00${fhr}.ensmean.nc sfg_${global_adate}_fhr0${fhr}_ensmean
     if [ $cnvw_option = ".true." ]; then
         $nln $datens/${prefix_ens}.sfcf00${fhr}.ensmean.nc sfgsfc_${global_adate}_fhr0${fhr}_ensmean
     fi
 done
 
-$nln $datobs/${prefix_obs}.abias_int ./satbias_in
+$nln $datobs/${prefix_obs}.abias_int.ensmean ./satbias_in
 
 
 cd $tmpdir

regression/regression_driver.sh

@@ -36,10 +36,12 @@ for jn in `seq ${RSTART} ${REND}`; do
       export scripts=${scripts_updat:-$scripts}
       export fixgsi=${fixgsi_updat:-$fixgsi}
       export modulefiles=${modulefiles_updat:-$modulefiles}
+      export ush=${ush_update:-$ush}
    else
       export scripts=${scripts_contrl:-$scripts}
       export fixgsi=${fixgsi_contrl:-$fixgsi}
       export modulefiles=${modulefiles_contrl:-$modulefiles}
+      export ush=${ush_cntrl:-$ush}
    fi
    rm -f ${job[$jn]}.out
 

regression/regression_namelists.sh

@@ -181,7 +181,7 @@ OBS_INPUT::
    sstviirs       viirs-m     j1          viirs-m_j1          0.0     4     0
    abibufr        abi         g18         abi_g18             0.0     1     0
    ahibufr        ahi         himawari9   ahi_himawari9       0.0     1     0
-   atmsbufr       atms        n21         atms_n21            0.0     1     1
+   atmsbufr       atms        n21         atms_n21            0.0     1     0
    crisfsbufr     cris-fsr    n21         cris-fsr_n21        0.0     1     0
    sstviirs       viirs-m     j2          viirs-m_j2          0.0     4     0
    ompsnpbufr     ompsnp      n21         ompsnp_n21          0.0     0     0

regression/regression_param.sh

@@ -87,17 +87,17 @@ case $regtest in
     rrfs_3denvar_glbens)
 
         if [[ "$machine" = "Hera" ]]; then
-           topts[1]="0:15:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
+           topts[1]="0:15:00" ; popts[1]="5/4/"  ; ropts[1]="/1"
+           topts[2]="0:15:00" ; popts[2]="10/4/"  ; ropts[2]="/1"
         elif [[ "$machine" = "Orion" ]]; then
-           topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
+           topts[1]="0:15:00" ; popts[1]="10/2/" ; ropts[1]="/1"
            topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/2"
         elif [[ "$machine" = "Hercules" ]]; then
            topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/2"
+           topts[2]="0:15:00" ; popts[2]="10/4/" ; ropts[2]="/2"
         elif [[ "$machine" = "Jet" ]]; then
-           topts[1]="0:15:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
+           topts[1]="0:15:00" ; popts[1]="5/5/"  ; ropts[1]="/1"
+           topts[2]="0:15:00" ; popts[2]="10/4/"  ; ropts[2]="/1"
         elif [[ "$machine" = "Gaea" ]]; then
            topts[1]="0:15:00" ; popts[1]="18/1/"  ; ropts[1]="/1"
            topts[2]="0:15:00" ; popts[2]="18/2/"  ; ropts[2]="/1"
@@ -117,17 +117,17 @@ case $regtest in
     hafs_3denvar_hybens)
 
         if [[ "$machine" = "Hera" ]]; then
-           topts[1]="0:15:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
+           topts[1]="0:15:00" ; popts[1]="5/4/"  ; ropts[1]="/1"
+           topts[2]="0:15:00" ; popts[2]="10/4/"  ; ropts[2]="/1"
         elif [[ "$machine" = "Orion" ]]; then
-           topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/2"
+           topts[1]="0:15:00" ; popts[1]="5/4/" ; ropts[1]="/1"
+           topts[2]="0:15:00" ; popts[2]="10/4/" ; ropts[2]="/2"
         elif [[ "$machine" = "Hercules" ]]; then
            topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/2"
+           topts[2]="0:15:00" ; popts[2]="5/8/" ; ropts[2]="/1"
         elif [[ "$machine" = "Jet" ]]; then
-           topts[1]="0:15:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
+           topts[1]="0:15:00" ; popts[1]="5/4/"  ; ropts[1]="/1"
+           topts[2]="0:15:00" ; popts[2]="10/4/"  ; ropts[2]="/1"
         elif [[ "$machine" = "Gaea" ]]; then
            topts[1]="0:15:00" ; popts[1]="18/1/"  ; ropts[1]="/1"
            topts[2]="0:15:00" ; popts[2]="18/2/"  ; ropts[2]="/1"
@@ -146,17 +146,17 @@ case $regtest in
 
     hafs_4denvar_glbens)
         if [[ "$machine" = "Hera" ]]; then
-           topts[1]="0:15:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
+           topts[1]="0:15:00" ; popts[1]="5/4/"  ; ropts[1]="/1"
+           topts[2]="0:15:00" ; popts[2]="10/4/"  ; ropts[2]="/1"
         elif [[ "$machine" = "Orion" ]]; then
-           topts[1]="0:20:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
+           topts[1]="0:20:00" ; popts[1]="5/4/"  ; ropts[1]="/1"
            topts[2]="0:20:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
         elif [[ "$machine" = "Hercules" ]]; then
            topts[1]="0:20:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
-           topts[2]="0:20:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
+           topts[2]="0:20:00" ; popts[2]="10/4/"  ; ropts[2]="/1"
         elif [[ "$machine" = "Jet" ]]; then
-           topts[1]="0:15:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
+           topts[1]="0:15:00" ; popts[1]="5/4/"  ; ropts[1]="/1"
+           topts[2]="0:15:00" ; popts[2]="10/4/"  ; ropts[2]="/1"
         elif [[ "$machine" = "Gaea" ]]; then
            topts[1]="0:15:00" ; popts[1]="18/1/"  ; ropts[1]="/1"
            topts[2]="0:15:00" ; popts[2]="18/2/"  ; ropts[2]="/1"
@@ -300,10 +300,10 @@ if [[ "$machine" = "Hera" ]]; then
    export APRUN="srun"
 elif [[ "$machine" = "Orion" ]]; then
    export OMP_STACKSIZE=2048M
-   export APRUN="srun -n \$ntasks --cpus-per-task=\$threads"
+   export APRUN="srun -n \$ntasks --mem=0  --cpus-per-task=\$threads"
 elif [[ "$machine" = "Hercules" ]]; then
    export OMP_STACKSIZE=2048M
-   export APRUN="srun -n \$ntasks --cpus-per-task=\$threads"
+   export APRUN="srun  -n \$ntasks --mem=0  --cpus-per-task=\$threads"
 elif [[ "$machine" = "Jet" ]]; then
    export OMP_STACKSIZE=1024M
    export MPI_BUFS_PER_PROC=256

regression/regression_var.sh

@@ -190,7 +190,7 @@ export savdir="$ptmp"
 export JCAP="62"
 
 # Case Study analysis dates
-export global_adate="2022110900"
+export global_adate="2024022300"
 export rtma_adate="2020022420"
 export fv3_netcdf_adate="2017030100"
 export rrfs_3denvar_glbens_adate="2021072518"

src/gsi/clw_mod.f90

@@ -2019,7 +2019,7 @@ subroutine gmi_37pol_diff(tb37v,tb37h,tsim37v,tsim37h,clw,ierrret)
 
      clw = one - (tb37v-tb37h)/(tsim37v-tsim37h)
      clw=max(zero,clw)
-     if(tb37h > tb37v)  then
+     if ((tb37h > tb37v) .or. (tb37h > 500_r_kind )) then
         ierrret = 1
         clw= r1000
      endif