Merge branch 'NOAA-EMC:develop' into CrIS-VIIRS_bug

wx20jjung · Feb 26, 2024 · 76f22b1 · 76f22b1
2 parents b52a4dd + 7c4a571
commit 76f22b1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/src/enkf/gridinfo_fv3reg.f90 b/src/enkf/gridinfo_fv3reg.f90
@@ -79,6 +79,8 @@ module gridinfo
 character(len=max_varname_length),public, dimension(3) :: &
   vars2d_supported = [character(len=max_varname_length) :: &
     'ps', 'pst', 'sst']
+character(len=max_varname_length),public, dimension(8)  :: &
+  vars2d_landonly = (/'', '', '', '', '', '', '', '' /)
 real(r_single), allocatable, dimension(:) :: ak,bk,eta1_ll,eta2_ll
 integer (i_kind),public,allocatable,dimension(:,:):: nxlocgroup,nylocgroup
 integer(i_kind):: numproc_io_sub

diff --git a/src/enkf/gridinfo_nmmb.f90 b/src/enkf/gridinfo_nmmb.f90
@@ -25,6 +25,8 @@ module gridinfo
                                                                                 'cw', 'prse', 'ql', 'qr', 'qi',    &
                                                                                 'qli', 'dbz', 'w'/)
 character(len=max_varname_length),public, dimension(2) :: vars2d_supported = (/ 'ps', 'sst' /)
+character(len=max_varname_length),public, dimension(8) :: vars2d_landonly = (/'', '', '', '', '', '', '', '' /)
+
 contains
 
 subroutine getgridinfo(fileprefix, reducedgrid)

diff --git a/src/enkf/gridinfo_wrf.f90 b/src/enkf/gridinfo_wrf.f90
@@ -77,6 +77,8 @@ module gridinfo
   ! supported variable names in anavinfo
   character(len=max_varname_length),public, dimension(19) :: vars3d_supported = (/'u   ', 'v   ', 'tv  ', 'q   ', 'w   ', 'cw  ', 'ph  ', 'ql  ', 'qr  ', 'qs  ', 'qg  ', 'qi  ', 'qni ', 'qnr ', 'qnc ', 'dbz ', 'oz  ', 'tsen', 'prse' /)
   character(len=max_varname_length),public, dimension(2)  :: vars2d_supported = (/ 'ps ', 'sst' /)
+  character(len=max_varname_length),public, dimension(8)  :: vars2d_landonly = (/'', '', '', '', '', '', '', '' /)
+
 
 contains
 

diff --git a/src/gsi/cplr_get_fv3_regional_ensperts.f90 b/src/gsi/cplr_get_fv3_regional_ensperts.f90
@@ -430,7 +430,7 @@ subroutine get_fv3_regional_ensperts_run(this,en_perts,nelen,ps_bar)
            if(.not.l_use_dbz_directDA .and.      if_model_dbz .and. .not.if_model_fed) i_caseflag=2
 
            ! only if_model_fed is true
-           if(.not.l_use_dbz_directDA .and. .not.if_model_dbz .and. .not.if_model_fed) i_caseflag=3
+           if(.not.l_use_dbz_directDA .and. .not.if_model_dbz .and.      if_model_fed) i_caseflag=3
 
            ! l_use_dbz_directDA=.true. and if_model_fed=.true.
            if(l_use_dbz_directDA      .and. .not.if_model_dbz .and.      if_model_fed) i_caseflag=4

diff --git a/src/gsi/gsi_rfv3io_mod.f90 b/src/gsi/gsi_rfv3io_mod.f90
@@ -2239,6 +2239,7 @@ subroutine gsi_fv3ncdf2d_read(fv3filenamegin,it,ges_z,ges_t2m,ges_q2m,ges_howv)
        do k=ndimensions+1,nvariables
           iret=nf90_inquire_variable(gfile_loc,k,name,len)
           if(trim(name)=='PHIS'   .or. trim(name)=='phis'  ) then
+             sfc_var_exist(k_orog) = .true.
              iret=nf90_inquire_variable(gfile_loc,k,ndims=ndim)
              if(fv3_io_layout_y > 1) then
                 do nio=0,fv3_io_layout_y-1