Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/toff_fix' into feature/h…
Browse files Browse the repository at this point in the history 
…afsv2_phase3
  • Loading branch information
@BinLiu-NOAA
BinLiu-NOAA committed Jan 26, 2024
2 parents 496139e + 863b9b9 commit b58c20d
Show file tree
Hide file tree
Showing 116 changed files with 3,773 additions and 3,584 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
2 changes: 1 addition & 1 deletion src/enkf/controlvec.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ subroutine read_control()
! read ensemble members on IO tasks
implicit none
real(r_double) :: t1,t2
integer(i_kind) :: nb,nlev,ne
integer(i_kind) :: nb,ne
integer(i_kind) :: q_ind
integer(i_kind) :: ierr

Expand Down
2 changes: 1 addition & 1 deletion src/enkf/enkf.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module enkf
! NH, tropics and SH, and in the horizontal, vertical and time dimensions,
! using the namelist parameters corrlengthnh, corrlengthtr, corrlengthsh,
! lnsigcutoffnh, lnsigcutofftr, lnsigcutoffsh (lnsigcutoffsatnh,
! lnsigcutoffsattr, lnsigcutoffsatsh for satellite obs, similar for ps obs)
! lnsigcutoffsattr, lnsigcutoffsatsh for satellite obs, similar for ps and fed obs)
! obtimelnh, obtimeltr, obtimelsh. The length scales should be given in km for the
! horizontal, hours for time, and 'scale heights' (units of -log(p/pref)) in the
! vertical. The function used for localization (function taper)
Expand Down
3 changes: 3 additions & 0 deletions src/enkf/enkf_obs_sensitivity.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ module enkf_obs_sensitivity
use params, only: efsoi_flag,latbound,nlevs,nanals,datestring, &
lnsigcutoffsatnh,lnsigcutoffsattr,lnsigcutoffsatsh, &
lnsigcutoffpsnh,lnsigcutoffpstr,lnsigcutoffpssh, &
lnsigcutofffednh,lnsigcutofffedtr,lnsigcutofffedsh, &
lnsigcutoffnh,lnsigcutofftr,lnsigcutoffsh, &
corrlengthnh,corrlengthtr,corrlengthsh, &
obtimelnh,obtimeltr,obtimelsh,letkf_flag, &
Expand Down Expand Up @@ -292,6 +293,8 @@ subroutine read_ob_sens
lnsigl(nob) = latval(deglat,lnsigcutoffsatnh,lnsigcutoffsattr,lnsigcutoffsatsh)
else if (obtype(nob)(1:3) == ' ps') then
lnsigl(nob) = latval(deglat,lnsigcutoffpsnh,lnsigcutoffpstr,lnsigcutoffpssh)
else if (obtype(nob)(1:3) == 'fed') then
lnsigl(nob) = latval(deglat,lnsigcutofffednh,lnsigcutofffedtr,lnsigcutofffedsh)
else
lnsigl(nob)=latval(deglat,lnsigcutoffnh,lnsigcutofftr,lnsigcutoffsh)
end if
Expand Down
7 changes: 7 additions & 0 deletions src/enkf/enkf_obsmod.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ module enkf_obsmod
lnsigcutoffnh, lnsigcutoffsh, lnsigcutofftr, corrlengthnh,&
corrlengthtr, corrlengthsh, obtimelnh, obtimeltr, obtimelsh,&
lnsigcutoffsatnh, lnsigcutoffsatsh, lnsigcutoffsattr,&
lnsigcutofffednh, lnsigcutofffedsh, lnsigcutofffedtr,&
corrlengthfednh, corrlengthfedtr, corrlengthfedsh, &
varqc, huber, zhuberleft, zhuberright, modelspace_vloc, &
lnsigcutoffpsnh, lnsigcutoffpssh, lnsigcutoffpstr, neigv, &
lnsigcutoffrdrnh, lnsigcutoffrdrsh, lnsigcutoffrdrtr,&
Expand Down Expand Up @@ -276,6 +278,8 @@ subroutine readobs()
lnsigl(nob) = latval(deglat,lnsigcutoffsatnh,lnsigcutoffsattr,lnsigcutoffsatsh)
else if (obtype(nob)(1:3) == ' ps') then
lnsigl(nob) = latval(deglat,lnsigcutoffpsnh,lnsigcutoffpstr,lnsigcutoffpssh)
else if (obtype(nob)(1:3) == 'fed') then
lnsigl(nob) = latval(deglat,lnsigcutofffednh,lnsigcutofffedtr,lnsigcutofffedsh)
else if ( (obtype(nob)(1:3) == 'dbz' .or. obtype(nob)(1:3) == ' rw') .and. l_use_enkf_directZDA ) then
lnsigl(nob) = latval(deglat,lnsigcutoffrdrnh,lnsigcutoffrdrtr,lnsigcutoffrdrsh)
else
Expand All @@ -293,6 +297,9 @@ subroutine readobs()
if ( (obtype(nob)(1:3) == 'dbz' .or. obtype(nob)(1:3) == ' rw') .and. l_use_enkf_directZDA ) then
corrlengthsq(nob)=latval(deglat,corrlengthrdrnh,corrlengthrdrtr,corrlengthrdrsh)**2
end if
if (obtype(nob)(1:3) == 'fed') then
corrlengthsq(nob)=latval(deglat,corrlengthfednh,corrlengthfedtr,corrlengthfedsh)**2
end if
obtimel(nob)=latval(deglat,obtimelnh,obtimeltr,obtimelsh)
end do

Expand Down
Loading

0 comments on commit b58c20d

Please sign in to comment.