Skip to content

Commit

Permalink
Merge remote-tracking branch 'develop/develop' into feature/toff_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@XuLu-NOAA
XuLu-NOAA committed Jan 26, 2024
2 parents 1f83192 + 12f8d3e commit cb8efab
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 57 deletions.
6 changes: 0 additions & 6 deletions regression/global_4denvar.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,17 +230,11 @@ $nln $datobs/${prefix_obs}.ompst8.${suffix} ./ompstcbufr
$nln $datobs/${prefix_obs}.ompslp.${suffix} ./ompslpbufr

$nln $datobs/${prefix_obs}.goesfv.${suffix} ./gsnd1bufr
$nln $datobs/${prefix_obs}.hrs3db.${suffix} ./hirs3bufr_db
$nln $datobs/${prefix_obs}.airsev.${suffix} ./airsbufr
$nln $datobs/${prefix_obs}.sevcsr.${suffix} ./seviribufr
$nln $datobs/${prefix_obs}.saphir.${suffix} ./saphirbufr
$nln $datobs/${prefix_obs}.avcsam.${suffix} ./avhambufr
$nln $datobs/${prefix_obs}.avcspm.${suffix} ./avhpmbufr
$nln $datobs/${prefix_obs}.1bhrs4.${suffix} ./hirs4bufr
$nln $datobs/${prefix_obs}.1bhrs2.${suffix} ./hirs2bufr
$nln $datobs/${prefix_obs}.1bhrs3.${suffix} ./hirs3bufr
$nln $datobs/${prefix_obs}.eshrs3.${suffix} ./hirs3bufrears
$nln $datobs/${prefix_obs}.hrs3db.${suffix} ./hirs3bufr_db
$nln $datobs/${prefix_obs}.mtiasi.${suffix} ./iasibufr
$nln $datobs/${prefix_obs}.esiasi.${suffix} ./iasibufrears
$nln $datobs/${prefix_obs}.iasidb.${suffix} ./iasibufr_db
Expand Down
4 changes: 0 additions & 4 deletions regression/hafs_3denvar_hybens.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,9 @@ fi
ln -sf $SATWND satwndbufr
ln -sf $SATWHR satwhrbufr
ln -sf $GSNDBF1 gsnd1bufr
ln -sf $B1HRS3 hirs3bufr
ln -sf $B1HRS4 hirs4bufr
ln -sf $B1AMUA amsuabufr
ln -sf $B1MHS mhsbufr
ln -sf $ESHRS3 hirs3bufrears
ln -sf $ESAMUA amsuabufrears
ln -sf $HRS3DB hirs3bufr_db
ln -sf $SBUVBF sbuvbufr
ln -sf $OMPSNPBF ompsnpbufr
ln -sf $OMPSTCBF ompstcbufr
Expand Down
4 changes: 0 additions & 4 deletions regression/hafs_4denvar_glbens.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,9 @@ fi
ln -sf $SATWND satwndbufr
ln -sf $SATWHR satwhrbufr
ln -sf $GSNDBF1 gsnd1bufr
ln -sf $B1HRS3 hirs3bufr
ln -sf $B1HRS4 hirs4bufr
ln -sf $B1AMUA amsuabufr
ln -sf $B1MHS mhsbufr
ln -sf $ESHRS3 hirs3bufrears
ln -sf $ESAMUA amsuabufrears
ln -sf $HRS3DB hirs3bufr_db
ln -sf $SBUVBF sbuvbufr
ln -sf $OMPSNPBF ompsnpbufr
ln -sf $OMPSTCBF ompstcbufr
Expand Down
1 change: 0 additions & 1 deletion regression/netcdf_fv3_regional.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ cp $fv3_netcdf_obs/ndas.t06z.radwnd.tm06.bufr_d ./radarbufr
cp $fv3_netcdf_obs/ndas.t06z.prepbufr.tm06 ./prepbufr
cp $fv3_netcdf_obs/ndas.t06z.1bamua.tm06.bufr_d ./amsuabufr
cp $fv3_netcdf_obs/ndas.t06z.1bmhs.tm06.bufr_d ./mhsbufr
cp $fv3_netcdf_obs/ndas.t06z.1bhrs4.tm06.bufr_d ./hirs4bufr
cp $fv3_netcdf_obs/ndas.t06z.goesfv.tm06.bufr_d ./gsnd1bufr
cp $fv3_netcdf_obs/ndas.t06z.airsev.tm06.bufr_d ./airsbufr
cp $fv3_netcdf_obs/ndas.t06z.satwnd.tm06.bufr_d ./satwndbufr
Expand Down
21 changes: 0 additions & 21 deletions regression/regression_namelists.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ OBS_INPUT::
sbuvbufr sbuv2 n16 sbuv8_n16 0.0 0 0
sbuvbufr sbuv2 n17 sbuv8_n17 0.0 0 0
sbuvbufr sbuv2 n18 sbuv8_n18 0.0 0 0
hirs3bufr hirs3 n17 hirs3_n17 0.0 1 0
hirs4bufr hirs4 metop-a hirs4_metop-a 0.0 1 1
gimgrbufr goes_img g11 imgr_g11 0.0 1 0
gimgrbufr goes_img g12 imgr_g12 0.0 1 0
airsbufr airs aqua airs_aqua 0.0 1 1
Expand Down Expand Up @@ -133,15 +131,13 @@ OBS_INPUT::
gomebufr gome metop-a gome_metop-a 0.0 2 0
omibufr omi aura omi_aura 0.0 2 0
sbuvbufr sbuv2 n19 sbuv8_n19 0.0 0 0
hirs4bufr hirs4 n19 hirs4_n19 0.0 1 1
amsuabufr amsua n19 amsua_n19 0.0 1 1
mhsbufr mhs n19 mhs_n19 0.0 1 1
tcvitl tcp null tcp 0.0 0 0
seviribufr seviri m08 seviri_m08 0.0 1 0
seviribufr seviri m09 seviri_m09 0.0 1 0
seviribufr seviri m10 seviri_m10 0.0 1 0
seviribufr seviri m11 seviri_m11 0.0 1 0
hirs4bufr hirs4 metop-b hirs4_metop-b 0.0 1 1
amsuabufr amsua metop-b amsua_metop-b 0.0 1 1
mhsbufr mhs metop-b mhs_metop-b 0.0 1 1
iasibufr iasi metop-b iasi_metop-b 0.0 1 1
Expand Down Expand Up @@ -391,12 +387,6 @@ OBS_INPUT::
sbuvbufr sbuv2 n16 sbuv8_n16 0.0 0 0
sbuvbufr sbuv2 n17 sbuv8_n17 0.0 0 0
sbuvbufr sbuv2 n18 sbuv8_n18 0.0 0 0
hirs3bufr hirs3 n16 hirs3_n16 0.0 1 0
hirs3bufr hirs3 n17 hirs3_n17 0.0 1 0
hirs4bufr hirs4 metop-a hirs4_metop-a 0.0 2 0
hirs4bufr hirs4 n18 hirs4_n18 0.0 1 0
hirs4bufr hirs4 n19 hirs4_n19 0.0 2 0
hirs4bufr hirs4 metop-b hirs4_metop-b 0.0 2 0
gimgrbufr goes_img g11 imgr_g11 0.0 1 0
gimgrbufr goes_img g12 imgr_g12 0.0 1 0
airsbufr airs aqua airs_aqua 0.0 2 0
Expand Down Expand Up @@ -627,8 +617,6 @@ OBS_INPUT::
sbuvbufr sbuv2 n16 sbuv8_n16 0.0 0 0
sbuvbufr sbuv2 n17 sbuv8_n17 0.0 0 0
sbuvbufr sbuv2 n18 sbuv8_n18 0.0 0 0
hirs3bufr hirs3 n17 hirs3_n17 0.0 1 0
hirs4bufr hirs4 metop-a hirs4_metop-a 0.0 1 1
gimgrbufr goes_img g11 imgr_g11 0.0 1 0
gimgrbufr goes_img g12 imgr_g12 0.0 1 0
airsbufr airs aqua airs_aqua 0.0 1 1
Expand Down Expand Up @@ -663,13 +651,11 @@ OBS_INPUT::
gomebufr gome metop-a gome_metop-a 0.0 2 0
omibufr omi aura omi_aura 0.0 2 0
sbuvbufr sbuv2 n19 sbuv8_n19 0.0 0 0
hirs4bufr hirs4 n19 hirs4_n19 0.0 1 1
amsuabufr amsua n19 amsua_n19 0.0 2 1
mhsbufr mhs n19 mhs_n19 0.0 3 1
seviribufr seviri m08 seviri_m08 0.0 1 0
seviribufr seviri m09 seviri_m09 0.0 1 0
seviribufr seviri m10 seviri_m10 0.0 1 0
hirs4bufr hirs4 metop-b hirs4_metop-b 0.0 1 0
amsuabufr amsua metop-b amsua_metop-b 0.0 2 0
mhsbufr mhs metop-b mhs_metop-b 0.0 3 0
iasibufr iasi metop-b iasi_metop-b 0.0 1 0
Expand Down Expand Up @@ -846,12 +832,6 @@ OBS_INPUT::
sbuvbufr sbuv2 n16 sbuv8_n16 0.0 0 0
sbuvbufr sbuv2 n17 sbuv8_n17 0.0 0 0
sbuvbufr sbuv2 n18 sbuv8_n18 0.0 0 0
hirs2bufr hirs2 n14 hirs2_n14 0.0 1 0
hirs3bufr hirs3 n16 hirs3_n16 0.0 1 0
hirs3bufr hirs3 n17 hirs3_n17 0.0 1 0
hirs4bufr hirs4 n18 hirs4_n18 0.0 1 0
hirs4bufr hirs4 metop-a hirs4_metop-a 0.0 1 0
hirs4bufr hirs4 metop-b hirs4_metop-b 0.0 1 0
gsndrbufr sndr g11 sndr_g11 0.0 1 0
gsndrbufr sndr g12 sndr_g12 0.0 1 0
gimgrbufr goes_img g11 imgr_g11 0.0 1 0
Expand Down Expand Up @@ -883,7 +863,6 @@ OBS_INPUT::
iasibufr iasi metop-b iasi_metop-b 0.0 1 0
omibufr omi aura omi_aura 0.0 1 0
sbuvbufr sbuv2 n19 sbuv8_n19 0.0 1 0
hirs4bufr hirs4 n19 hirs4_n19 0.0 1 0
amsuabufr amsua n19 amsua_n19 0.0 1 0
mhsbufr mhs n19 mhs_n19 0.0 1 0
tcvitl tcp null tcp 0.0 0 0
Expand Down
21 changes: 0 additions & 21 deletions regression/regression_namelists_db.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ OBS_INPUT::
sbuvbufr_ sbuv2 n16 sbuv8_n16 0.0 0 0
sbuvbufr_ sbuv2 n17 sbuv8_n17 0.0 0 0
sbuvbufr_ sbuv2 n18 sbuv8_n18 0.0 0 0
hirs3bufr_ hirs3 n17 hirs3_n17 0.0 1 0
hirs4bufr_skip hirs4 metop-a hirs4_metop-a 0.0 1 1
gimgrbufr_ goes_img g11 imgr_g11 0.0 1 0
gimgrbufr_ goes_img g12 imgr_g12 0.0 1 0
airsbufr_ airs aqua airs_aqua 0.0 1 1
Expand Down Expand Up @@ -125,15 +123,13 @@ OBS_INPUT::
gomebufr gome metop-a gome_metop-a 0.0 2 0
omibufr omi aura omi_aura 0.0 2 0
sbuvbufr sbuv2 n19 sbuv8_n19 0.0 0 0
hirs4bufr hirs4 n19 hirs4_n19 0.0 1 1
amsuabufr amsua n19 amsua_n19 0.0 1 1
mhsbufr mhs n19 mhs_n19 0.0 1 1
tcvitl tcp null tcp 0.0 0 0
seviribufr seviri m08 seviri_m08 0.0 1 0
seviribufr seviri m09 seviri_m09 0.0 1 0
seviribufr seviri m10 seviri_m10 0.0 1 0
seviribufr seviri m11 seviri_m11 0.0 1 0
hirs4bufr hirs4 metop-b hirs4_metop-b 0.0 1 1
amsuabufr amsua metop-b amsua_metop-b 0.0 1 1
mhsbufr mhs metop-b mhs_metop-b 0.0 1 1
iasibufr iasi metop-b iasi_metop-b 0.0 1 1
Expand Down Expand Up @@ -372,12 +368,6 @@ OBS_INPUT::
sbuvbufr sbuv2 n16 sbuv8_n16 0.0 0 0
sbuvbufr sbuv2 n17 sbuv8_n17 0.0 0 0
sbuvbufr sbuv2 n18 sbuv8_n18 0.0 0 0
hirs3bufr hirs3 n16 hirs3_n16 0.0 1 0
hirs3bufr hirs3 n17 hirs3_n17 0.0 1 0
hirs4bufr hirs4 metop-a hirs4_metop-a 0.0 2 0
hirs4bufr hirs4 n18 hirs4_n18 0.0 1 0
hirs4bufr hirs4 n19 hirs4_n19 0.0 2 0
hirs4bufr hirs4 metop-b hirs4_metop-b 0.0 2 0
gimgrbufr goes_img g11 imgr_g11 0.0 1 0
gimgrbufr goes_img g12 imgr_g12 0.0 1 0
airsbufr airs aqua airs_aqua 0.0 2 0
Expand Down Expand Up @@ -611,8 +601,6 @@ OBS_INPUT::
sbuvbufr sbuv2 n16 sbuv8_n16 0.0 0 0
sbuvbufr sbuv2 n17 sbuv8_n17 0.0 0 0
sbuvbufr sbuv2 n18 sbuv8_n18 0.0 0 0
hirs3bufr hirs3 n17 hirs3_n17 0.0 1 0
hirs4bufr hirs4 metop-a hirs4_metop-a 0.0 1 1
gimgrbufr goes_img g11 imgr_g11 0.0 1 0
gimgrbufr goes_img g12 imgr_g12 0.0 1 0
airsbufr airs aqua airs_aqua 0.0 1 1
Expand Down Expand Up @@ -647,13 +635,11 @@ OBS_INPUT::
gomebufr gome metop-a gome_metop-a 0.0 2 0
omibufr omi aura omi_aura 0.0 2 0
sbuvbufr sbuv2 n19 sbuv8_n19 0.0 0 0
hirs4bufr hirs4 n19 hirs4_n19 0.0 1 1
amsuabufr amsua n19 amsua_n19 0.0 2 1
mhsbufr mhs n19 mhs_n19 0.0 3 1
seviribufr seviri m08 seviri_m08 0.0 1 0
seviribufr seviri m09 seviri_m09 0.0 1 0
seviribufr seviri m10 seviri_m10 0.0 1 0
hirs4bufr hirs4 metop-b hirs4_metop-b 0.0 1 0
amsuabufr amsua metop-b amsua_metop-b 0.0 2 0
mhsbufr mhs metop-b mhs_metop-b 0.0 3 0
iasibufr iasi metop-b iasi_metop-b 0.0 1 0
Expand Down Expand Up @@ -831,12 +817,6 @@ OBS_INPUT::
sbuvbufr sbuv2 n16 sbuv8_n16 0.0 0 0
sbuvbufr sbuv2 n17 sbuv8_n17 0.0 0 0
sbuvbufr sbuv2 n18 sbuv8_n18 0.0 0 0
hirs2bufr hirs2 n14 hirs2_n14 0.0 1 0
hirs3bufr hirs3 n16 hirs3_n16 0.0 1 0
hirs3bufr hirs3 n17 hirs3_n17 0.0 1 0
hirs4bufr hirs4 n18 hirs4_n18 0.0 1 0
hirs4bufr hirs4 metop-a hirs4_metop-a 0.0 1 0
hirs4bufr hirs4 metop-b hirs4_metop-b 0.0 1 0
gsndrbufr sndr g11 sndr_g11 0.0 1 0
gsndrbufr sndr g12 sndr_g12 0.0 1 0
gimgrbufr goes_img g11 imgr_g11 0.0 1 0
Expand Down Expand Up @@ -868,7 +848,6 @@ OBS_INPUT::
iasibufr iasi metop-b iasi_metop-b 0.0 1 0
omibufr omi aura omi_aura 0.0 1 0
sbuvbufr sbuv2 n19 sbuv8_n19 0.0 1 0
hirs4bufr hirs4 n19 hirs4_n19 0.0 1 0
amsuabufr amsua n19 amsua_n19 0.0 1 0
mhsbufr mhs n19 mhs_n19 0.0 1 0
tcvitl tcp null tcp 0.0 0 0
Expand Down
11 changes: 11 additions & 0 deletions src/gsi/gsi_rfv3io_mod.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ module gsi_rfv3io_mod
vgsiname = [character(len=max_varname_length) :: &
'u','v','w','tsen','delp','q','oz','ql','qi','qr','qs','qg','qnr','dbz','fed','ps','delzinc', &
aeronames_cmaq_fv3,'pm25at','pm25ac','pm25co','pm2_5','amassi','amassj','amassk',aeronames_smoke_fv3]

integer(i_kind) ,parameter:: nnonnegtracer=7
character(len=max_varname_length), dimension(nnonnegtracer), parameter :: &
vnames_nonnegativetracers = [character(len=max_varname_length) :: &
"sphum","o3mr","liq_wat","ice_wat","rainwat","snowwat","graupel"]
character(len=max_varname_length),dimension(:),allocatable:: name_metvars2d
character(len=max_varname_length),dimension(:),allocatable:: name_metvars3d
character(len=max_varname_length),dimension(:),allocatable:: name_chemvars3d
Expand Down Expand Up @@ -4676,6 +4681,9 @@ subroutine gsi_fv3ncdf_write(grd_ionouv,cstate_nouv,add_saved,filenamein,fv3file
call fv3_ll_to_h(work_a(:,:),work_b(:,:),nloncase,nlatcase,nlon_regional,nlat_regional,grid_reverse_flag)
endif
endif
if (ifindstrloc(vnames_nonnegativetracers,trim(varname))> 0) then
where (work_b <0.0_r_kind) work_b=0.0_r_kind
endif
if(fv3_io_layout_y > 1) then
do nio=0,fv3_io_layout_y-1
countloc=(/nxcase,ny_layout_len(nio),1/)
Expand Down Expand Up @@ -4835,6 +4843,9 @@ subroutine gsi_fv3ncdf_write_v1(grd_ionouv,cstate_nouv,add_saved,filenamein,fv3f
else
call fv3_ll_to_h(work_a(:,:),work_b(:,:),nloncase,nlatcase,nlon_regional,nlat_regional,grid_reverse_flag)
endif
if (ifindstrloc(vnames_nonnegativetracers,trim(varname))> 0) then
where (work_b <0.0_r_kind) work_b=0.0_r_kind
endif
call check( nf90_put_var(gfile_loc,VarId,work_b,start=startloc,count=countloc) )
enddo !ilevtot
call check(nf90_close(gfile_loc))
Expand Down

0 comments on commit cb8efab

Please sign in to comment.