Merge branch 'NOAA-EMC:develop' into feature/enkf_q2

modulefiles/gsi_hera.gnu.lua

@@ -20,6 +20,6 @@ load(pathJoin("prod_util", prod_util_ver))
 
 pushenv("MKLROOT", "/apps/oneapi/mkl/2022.0.2")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20221128")
+pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20230601")
 
 whatis("Description: GSI environment on Hera with GNU Compilers")

modulefiles/gsi_hera.intel.lua

@@ -26,6 +26,6 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20221128")
+pushenv("GSI_BINARY_SOURCE_DIR", "/scratch1/NCEPDEV/global/glopara/fix/gsi/20230601")
 
 whatis("Description: GSI environment on Hera with Intel Compilers")

modulefiles/gsi_jet.lua

@@ -27,6 +27,6 @@ pushenv("CFLAGS", "-axSSE4.2,AVX,CORE-AVX2")
 pushenv("FFLAGS", "-axSSE4.2,AVX,CORE-AVX2")
 
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/mnt/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/gsi/20221128")
+pushenv("GSI_BINARY_SOURCE_DIR", "/mnt/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/gsi/20230601")
 
 whatis("Description: GSI environment on Jet with Intel Compilers")

modulefiles/gsi_orion.lua

@@ -23,6 +23,6 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20221128")
+pushenv("GSI_BINARY_SOURCE_DIR", "/work/noaa/global/glopara/fix/gsi/20230601")
 
 whatis("Description: GSI environment on Orion with Intel Compilers")

modulefiles/gsi_s4.lua

@@ -23,6 +23,6 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-march=ivybridge")
 pushenv("FFLAGS", "-march=ivybridge")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/data/prod/glopara/fix/gsi/20221128")
+pushenv("GSI_BINARY_SOURCE_DIR", "/data/prod/glopara/fix/gsi/20230601")
 
 whatis("Description: GSI environment on S4 with Intel Compilers")

modulefiles/gsi_wcoss2.lua

@@ -20,6 +20,6 @@ load(pathJoin("prod_util", prod_util_ver))
 
 load("gsi_common")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20221128")
+pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20230601")
 
 whatis("Description: GSI environment on WCOSS2")

src/enkf/controlvec.f90

@@ -131,7 +131,7 @@ subroutine init_controlvec()
       cvars3d(nc3d) = trim(adjustl(var))
       clevels(nc3d) = ilev + clevels(nc3d-1)
    else 
-      if (nproc .eq. 0) print *,'Error: only ', nlevs, ' and ', nlevs+1,' number of levels is supported in current version, got ',ilev
+      if (nproc .eq. 0) print *,'Error controlvec: only ', nlevs, ' and ', nlevs+1,' number of levels is supported in current version, got ',ilev
       call stop2(503)
    endif
 enddo
@@ -212,7 +212,10 @@ subroutine read_control()
 ! read in whole control vector on i/o procs - keep in memory 
 ! (needed in write_ensemble)
 allocate(grdin(npts,ncdim,nbackgrounds,nanals_per_iotask))
-allocate(qsat(npts,nlevs,nbackgrounds,nanals_per_iotask))
+! if only updating the sfc fields, qsat will not be calculated in readgriddata
+! only allocate if needed.
+q_ind = getindex(cvars3d, 'q')
+if (q_ind > 0)  allocate(qsat(npts,nlevs,nbackgrounds,nanals_per_iotask))
 if (paranc) then
    if (nproc == 0) t1 = mpi_wtime()
    call readgriddata_pnc(cvars3d,cvars2d,nc3d,nc2d,clevels,ncdim,nbackgrounds, &
@@ -225,7 +228,8 @@ subroutine read_control()
            fgfileprefixes,fgsfcfileprefixes,reducedgrid,grdin,qsat)
    end if
    !print *,'min/max qsat',nanal,'=',minval(qsat),maxval(qsat)
-   if (use_qsatensmean) then
+   q_ind = getindex(cvars3d, 'q')
+   if (use_qsatensmean .and. q_ind>0 ) then
        allocate(qsatmean(npts,nlevs,nbackgrounds))
        allocate(qsat_tmp(npts))
        ! compute ensemble mean qsat
@@ -257,7 +261,6 @@ subroutine read_control()
    !   print *,'min/max qsatmean proc',nproc,'=',&
    !            minval(qsatmean(:,:,nbackgrounds/2+1)),maxval(qsatmean(:,:,nbackgrounds/2+1))
    !endif
-   q_ind = getindex(cvars3d, 'q')
    if (pseudo_rh .and. q_ind > 0) then
       if (use_qsatensmean) then
          do ne=1,nanals_per_iotask

src/enkf/gridinfo_gfs.f90

@@ -66,7 +66,7 @@ module gridinfo
 ! supported variable names in anavinfo
 character(len=max_varname_length),public, dimension(13) :: vars3d_supported = (/'u   ', 'v   ', 'tv  ', 'q   ', 'oz  ', 'cw  ', 'tsen', 'prse', &
                                                                                 'ql  ', 'qi  ', 'qr  ', 'qs  ', 'qg  '/) 
-character(len=max_varname_length),public, dimension(3)  :: vars2d_supported = (/'ps ', 'pst', 'sst' /)
+character(len=max_varname_length),public, dimension(13)  :: vars2d_supported = (/'ps ', 'pst', 'sst', 't2m', 'q2m', 'st1', 'st2', 'st3', 'st4', 'sl1', 'sl2', 'sl3', 'sl4' /)
 ! supported variable names in anavinfo
 contains
 

src/enkf/gridio_fv3reg.f90

@@ -694,7 +694,7 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
 
     ps_ind  = getindex(vars2d, 'ps')  ! Ps (2D)
 
-
+    clip=tiny(clip)
     !----------------------------------------------------------------------
     if (nbackgrounds > 1) then
        write(6,*)'gridio/writegriddata: writing multiple backgrounds not yet supported'
@@ -853,10 +853,8 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
               varstrname = 'sphum'
               call fv3lamfile%get_idfn(varstrname,file_id,fv3filename)
               call read_fv3_restart_data3d(varstrname,fv3filename,file_id,qworkvar3d)
-              if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                clip = tiny(qworkvar3d(1,1,1))
-                where (qworkvar3d < clip) qworkvar3d = clip
-              end if
+              !enforce lower positive bound (clip) to replace negative hydrometers
+              if ( cliptracers ) where (qworkvar3d < clip) qworkvar3d = clip
               tvworkvar3d=tsenworkvar3d*(one+fv*qworkvar3d)
               tvworkvar3d=tvworkvar3d+workinc3d
               if(q_ind > 0) then
@@ -870,10 +868,8 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
                    enddo
                  enddo
                  qworkvar3d=qworkvar3d+workinc3d   
-                 if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                   clip = tiny(qworkvar3d(1,1,1))
-                   where (qworkvar3d < clip) qworkvar3d = clip
-                 end if
+                 !enforce lower positive bound (clip) to replace negative q 
+                 if ( cliptracers ) where (qworkvar3d < clip) qworkvar3d = clip
               endif
               tsenworkvar3d=tvworkvar3d/(one+fv*qworkvar3d)
               varstrname = 'T'
@@ -940,10 +936,7 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
                 enddo
              enddo
              workvar3d=workvar3d+workinc3d
-             if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                 clip = tiny(workvar3d(1,1,1))
-                 where (workvar3d < clip) workvar3d = clip
-             end if
+             if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
              call write_fv3_restart_data3d(varstrname,fv3filename,file_id,workvar3d)
 
           endif
@@ -963,10 +956,7 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
                 enddo
               enddo
               workvar3d=workvar3d+workinc3d
-              if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                 clip = tiny(workvar3d(1,1,1))
-                 where (workvar3d < clip) workvar3d = clip
-              end if
+              if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
               call write_fv3_restart_data3d(varstrname,fv3filename,file_id,workvar3d)
 
           endif
@@ -986,10 +976,7 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
                enddo
              enddo
              workvar3d=workvar3d+workinc3d
-             if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                 clip = tiny(workvar3d(1,1,1))
-                 where (workvar3d < clip) workvar3d = clip
-             end if
+             if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
              call write_fv3_restart_data3d(varstrname,fv3filename,file_id,workvar3d)
 
           endif
@@ -1009,10 +996,7 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
                enddo
              enddo
              workvar3d=workvar3d+workinc3d
-             if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                 clip = tiny(workvar3d(1,1,1))
-                 where (workvar3d < clip) workvar3d = clip
-             end if
+             if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
              call write_fv3_restart_data3d(varstrname,fv3filename,file_id,workvar3d)
 
           endif
@@ -1032,10 +1016,7 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
                 enddo
              enddo
              workvar3d=workvar3d+workinc3d
-             if (  cliptracers ) then ! set cliptracers to remove negative hydrometers
-                 clip = tiny(workvar3d(1,1,1))
-                 where (workvar3d < clip) workvar3d = clip
-             end if
+             if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
              call write_fv3_restart_data3d(varstrname,fv3filename,file_id,workvar3d)
 
           endif
@@ -1054,10 +1035,7 @@ subroutine writegriddata(nanal1,nanal2,vars3d,vars2d,n3d,n2d,levels,ndim,vargrid
                enddo
              enddo
              workvar3d=workvar3d+workinc3d
-             if (  cliptracers ) then ! set cliptracers to remove negative hydrometers
-                 clip = tiny(workvar3d(1,1,1))
-                 where (workvar3d < clip) workvar3d = clip
-             end if
+             if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
              call write_fv3_restart_data3d(varstrname,fv3filename,file_id,workvar3d)
 
           endif
@@ -1896,7 +1874,7 @@ subroutine writegriddata_pnc(vars3d,vars2d,n3d,n2d,levels,ndim,vargrid,no_inflat
 
     ps_ind  = getindex(vars2d, 'ps')  ! Ps (2D)
 
-
+    clip=tiny(clip)
     allocate(my_neb(4))
     !----------------------------------------------------------------------
     if (nbackgrounds > 1) then
@@ -2181,10 +2159,7 @@ subroutine writegriddata_pnc(vars3d,vars2d,n3d,n2d,levels,ndim,vargrid,no_inflat
                 enddo
 
                 if(iope ==0 ) then
-                  if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                    clip = tiny(qworkvar3d(1,1,1))
-                    where (qworkvar3d < clip) qworkvar3d = clip
-                  end if
+                  if ( cliptracers ) where (qworkvar3d < clip) qworkvar3d = clip
                   tvworkvar3d=tsenworkvar3d*(one+fv*qworkvar3d)
                   tvworkvar3d=tvworkvar3d+workinc3d
                   if(q_ind > 0) then
@@ -2198,10 +2173,7 @@ subroutine writegriddata_pnc(vars3d,vars2d,n3d,n2d,levels,ndim,vargrid,no_inflat
                        enddo
                      enddo
                      qworkvar3d=qworkvar3d+workinc3d   
-                     if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                       clip = tiny(qworkvar3d(1,1,1))
-                       where (qworkvar3d < clip) qworkvar3d = clip
-                     end if
+                     if ( cliptracers ) where (qworkvar3d < clip) qworkvar3d = clip
                   endif
                   tsenworkvar3d=tvworkvar3d/(one+fv*qworkvar3d)
                 endif
@@ -2297,10 +2269,7 @@ subroutine writegriddata_pnc(vars3d,vars2d,n3d,n2d,levels,ndim,vargrid,no_inflat
                    enddo
                 enddo
                 workvar3d=workvar3d+workinc3d
-                if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                     clip = tiny(workvar3d(1,1,1))
-                     where (workvar3d < clip) workvar3d = clip
-                end if
+                if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
               endif
               do k=1,nlevs
                  call mpi_scatterv(workvar3d(:,:,k),recvcounts2d,displs2d,mpi_real4,&
@@ -2331,10 +2300,7 @@ subroutine writegriddata_pnc(vars3d,vars2d,n3d,n2d,levels,ndim,vargrid,no_inflat
                    enddo
                 enddo
                 workvar3d=workvar3d+workinc3d
-                 if (  cliptracers ) then ! set cliptracers to remove negative hydrometers
-                     clip = tiny(workvar3d(1,1,1))
-                     where (workvar3d < clip) workvar3d = clip
-                 end if
+                 if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
               endif
               do k=1,nlevs
                  call mpi_scatterv(workvar3d(:,:,k),recvcounts2d,displs2d,mpi_real4,&
@@ -2365,10 +2331,7 @@ subroutine writegriddata_pnc(vars3d,vars2d,n3d,n2d,levels,ndim,vargrid,no_inflat
                    enddo
                 enddo
                 workvar3d=workvar3d+workinc3d
-                 if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                     clip = tiny(workvar3d(1,1,1))
-                     where (workvar3d < clip) workvar3d = clip
-                 end if
+                 if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
               endif
               do k=1,nlevs
                  call mpi_scatterv(workvar3d(:,:,k),recvcounts2d,displs2d,mpi_real4,&
@@ -2399,10 +2362,7 @@ subroutine writegriddata_pnc(vars3d,vars2d,n3d,n2d,levels,ndim,vargrid,no_inflat
                    enddo
                 enddo
                 workvar3d=workvar3d+workinc3d
-                 if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                     clip = tiny(workvar3d(1,1,1))
-                     where (workvar3d < clip) workvar3d = clip
-                 end if
+                 if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
               endif
               do k=1,nlevs
                  call mpi_scatterv(workvar3d(:,:,k),recvcounts2d,displs2d,mpi_real4,&
@@ -2433,10 +2393,7 @@ subroutine writegriddata_pnc(vars3d,vars2d,n3d,n2d,levels,ndim,vargrid,no_inflat
                    enddo
                 enddo
                 workvar3d=workvar3d+workinc3d
-                if (  cliptracers ) then ! set cliptracers to remove negative hydrometers
-                     clip = tiny(workvar3d(1,1,1))
-                     where (workvar3d < clip) workvar3d = clip
-                end if
+                if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
               endif
               do k=1,nlevs
                  call mpi_scatterv(workvar3d(:,:,k),recvcounts2d,displs2d,mpi_real4,&
@@ -2466,10 +2423,7 @@ subroutine writegriddata_pnc(vars3d,vars2d,n3d,n2d,levels,ndim,vargrid,no_inflat
                    enddo
                 enddo
                 workvar3d=workvar3d+workinc3d
-                if ( cliptracers ) then ! set cliptracers to remove negative hydrometers
-                     clip = tiny(workvar3d(1,1,1))
-                     where (workvar3d < clip) workvar3d = clip
-                end if
+                if ( cliptracers ) where (workvar3d < clip) workvar3d = clip
               endif
               do k=1,nlevs
                  call mpi_scatterv(workvar3d(:,:,k),recvcounts2d,displs2d,mpi_real4,&