Skip to content

Commit

Permalink
Merge branch 'develop' into feature/2mDA
Browse files Browse the repository at this point in the history
  • Loading branch information
@ClaraDraper-NOAA
ClaraDraper-NOAA committed Feb 5, 2024
2 parents f33689e + a898668 commit 3001f11
Show file tree
Hide file tree
Showing 124 changed files with 3,767 additions and 3,580 deletions.
0 modulefiles/gsi_discover → modulefiles/gsi_discover.intel
View file
File renamed without changes.
0 modulefiles/gsi_gaea.lua → modulefiles/gsi_gaea.intel.lua
View file
File renamed without changes.
0 modulefiles/gsi_hercules.lua → modulefiles/gsi_hercules.intel.lua
View file
File renamed without changes.
0 modulefiles/gsi_jet.lua → modulefiles/gsi_jet.intel.lua
View file
File renamed without changes.
0 modulefiles/gsi_orion.lua → modulefiles/gsi_orion.intel.lua
View file
File renamed without changes.
0 modulefiles/gsi_s4.lua → modulefiles/gsi_s4.intel.lua
View file
File renamed without changes.
0 modulefiles/gsi_wcoss2.lua → modulefiles/gsi_wcoss2.intel.lua
View file
File renamed without changes.
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
19 changes: 11 additions & 8 deletions src/enkf/letkf.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ subroutine letkf_update()
if (nproc == 0) print *,'using',nthreads,' openmp threads'

! define a few frequently used parameters
r_nanals=one/float(nanals)
r_nanalsm1=one/float(nanals-1)
r_nanals=one/real(nanals,r_kind)
r_nanalsm1=one/real(nanals-1,r_kind)
mincorrlength_factsq = mincorrlength_fact**2

kdobs=associated(kdtree_obs2)
Expand Down Expand Up @@ -541,31 +541,34 @@ subroutine letkf_update()
enddo
!$omp end parallel do

tmean=zero
tmin=zero
tmax=zero
tend = mpi_wtime()
call mpi_reduce(tend-tbegin,tmean,1,mpi_real8,mpi_sum,0,mpi_comm_world,ierr)
tmean = tmean/numproc
tmean = tmean/real(numproc,r_kind)
call mpi_reduce(tend-tbegin,tmin,1,mpi_real8,mpi_min,0,mpi_comm_world,ierr)
call mpi_reduce(tend-tbegin,tmax,1,mpi_real8,mpi_max,0,mpi_comm_world,ierr)
if (nproc .eq. 0) print *,'min/max/mean time to do letkf update ',tmin,tmax,tmean
t2 = t2/nthreads; t3 = t3/nthreads; t4 = t4/nthreads; t5 = t5/nthreads
if (nproc == 0) print *,'time to process analysis on gridpoint = ',t2,t3,t4,t5,' secs on task',nproc
call mpi_reduce(t2,tmean,1,mpi_real8,mpi_sum,0,mpi_comm_world,ierr)
tmean = tmean/numproc
tmean = tmean/real(numproc,r_kind)
call mpi_reduce(t2,tmin,1,mpi_real8,mpi_min,0,mpi_comm_world,ierr)
call mpi_reduce(t2,tmax,1,mpi_real8,mpi_max,0,mpi_comm_world,ierr)
if (nproc .eq. 0) print *,',min/max/mean t2 = ',tmin,tmax,tmean
call mpi_reduce(t3,tmean,1,mpi_real8,mpi_sum,0,mpi_comm_world,ierr)
tmean = tmean/numproc
tmean = tmean/real(numproc,r_kind)
call mpi_reduce(t3,tmin,1,mpi_real8,mpi_min,0,mpi_comm_world,ierr)
call mpi_reduce(t3,tmax,1,mpi_real8,mpi_max,0,mpi_comm_world,ierr)
if (nproc .eq. 0) print *,',min/max/mean t3 = ',tmin,tmax,tmean
call mpi_reduce(t4,tmean,1,mpi_real8,mpi_sum,0,mpi_comm_world,ierr)
tmean = tmean/numproc
tmean = tmean/real(numproc,r_kind)
call mpi_reduce(t4,tmin,1,mpi_real8,mpi_min,0,mpi_comm_world,ierr)
call mpi_reduce(t4,tmax,1,mpi_real8,mpi_max,0,mpi_comm_world,ierr)
if (nproc .eq. 0) print *,',min/max/mean t4 = ',tmin,tmax,tmean
call mpi_reduce(t5,tmean,1,mpi_real8,mpi_sum,0,mpi_comm_world,ierr)
tmean = tmean/numproc
tmean = tmean/real(numproc,r_kind)
call mpi_reduce(t5,tmin,1,mpi_real8,mpi_min,0,mpi_comm_world,ierr)
call mpi_reduce(t5,tmax,1,mpi_real8,mpi_max,0,mpi_comm_world,ierr)
if (nproc .eq. 0) print *,',min/max/mean t5 = ',tmin,tmax,tmean
Expand All @@ -590,7 +593,7 @@ subroutine letkf_update()
call mpi_reduce(nobslocal_max,nobslocal_maxall,1,mpi_integer,mpi_max,0,mpi_comm_world,ierr)
call mpi_reduce(nobslocal_min,nobslocal_minall,1,mpi_integer,mpi_min,0,mpi_comm_world,ierr)
call mpi_reduce(nobslocal_mean,nobslocal_meanall,1,mpi_integer,mpi_sum,0,mpi_comm_world,ierr)
if (nproc == 0) print *,'min/max/mean number of obs in local volume',nobslocal_minall,nobslocal_maxall,nint(nobslocal_meanall/float(numproc))
if (nproc == 0) print *,'min/max/mean number of obs in local volume',nobslocal_minall,nobslocal_maxall,nint(nobslocal_meanall/real(numproc,r_kind))
endif
call mpi_reduce(nobslocal_max,nobslocal_maxall,1,mpi_integer,mpi_max,0,mpi_comm_world,ierr)
call mpi_reduce(nobslocal_min,nobslocal_minall,1,mpi_integer,mpi_max,0,mpi_comm_world,ierr)
Expand Down
2 changes: 1 addition & 1 deletion src/gsi/adjtest.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module adjtest
use gsi_bundlemod, only: assignment(=)
use bias_predictors, only: predictors,allocate_preds,deallocate_preds, &
assignment(=)
use control2state_mod, only: control2state,c2sset,control2state_ad
use control2state_mod, only: control2state,control2state_ad

implicit none
private
Expand Down
1 change: 0 additions & 1 deletion src/gsi/apply_scaledepwgts.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ subroutine apply_scaledepwgts(m,grd_in,sp_in)
use general_specmod, only: spec_vars
use general_sub2grid_mod, only: sub2grid_info
use hybrid_ensemble_parameters, only: spc_multwgt,en_perts,nsclgrp,n_ens
use mpimod, only: mype
implicit none

! Declare passed variables
Expand Down
14 changes: 2 additions & 12 deletions src/gsi/balmod.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -689,13 +689,7 @@ subroutine balance(t,p,st,vp,fpsproj,fut2ps)

!! Strong balance constraint
!! Pass uvflag=.false.
if(lsqrtb) then
call strong_bk(st,vp,p,t,.false.)
else
if(tlnmc_option==1 .or. tlnmc_option==4) call strong_bk(st,vp,p,t,.false.)
endif


if(lsqrtb .or. tlnmc_option==1 .or. tlnmc_option==4) call strong_bk(st,vp,p,t,.false.)

return
end subroutine balance
Expand Down Expand Up @@ -777,11 +771,7 @@ subroutine tbalance(t,p,st,vp,fpsproj,fut2ps)

! Adjoint of strong balance constraint
! pass uvflag=.false.
if(lsqrtb) then
call strong_bk_ad(st,vp,p,t,.false.)
else
if(tlnmc_option==1 .or. tlnmc_option==4) call strong_bk_ad(st,vp,p,t,.false.)
endif
if(lsqrtb .or. tlnmc_option==1 .or. tlnmc_option==4) call strong_bk_ad(st,vp,p,t,.false.)

! REGIONAL BRANCH
if (regional) then
Expand Down
3 changes: 1 addition & 2 deletions src/gsi/berror.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -844,8 +844,7 @@ subroutine create_berror_vars_reg

! Grid constant for background error

allocate(be(ndeg), &
qvar3d(lat2,lon2,nsig))
allocate(be(ndeg),qvar3d(lat2,lon2,nsig))
if(nc3d>0)then
allocate(alv(llmin:llmax,ndeg,nsig,nc3d), &
dssv(lat2,lon2,nsig,nc3d))
Expand Down
Loading

0 comments on commit 3001f11

Please sign in to comment.