Merge pull request #149 from jderber-NOAA/master

GitHub Issue #126. Add use of high resolution Raob data.
NOAA-EMC · May 18, 2021 · 66db434 · 66db434
2 parents dcb735a + 23ec8ef
commit 66db434
Show file tree

Hide file tree

Showing 60 changed files with 1,756 additions and 101 deletions.
diff --git a/cmake/Modules/FindBUFR.cmake b/cmake/Modules/FindBUFR.cmake
@@ -11,8 +11,8 @@ endif()
 
 set( NO_DEFAULT_PATH )
 if(NOT BUILD_BUFR )
-  if(DEFINED ENV{BUFR_LIBd} )
-    set(BUFR_LIBRARY $ENV{BUFR_LIBd} )
+  if(DEFINED ENV{BUFR_LIBd_DA} )
+    set(BUFR_LIBRARY $ENV{BUFR_LIBd_DA} )
     message("BUFR library ${BUFR_LIBRARY} set via Environment variable")
   else()
   find_library( BUFR_LIBRARY 

diff --git a/cmake/Modules/FindCORELIBS.cmake b/cmake/Modules/FindCORELIBS.cmake
@@ -102,8 +102,8 @@ else()
     set( w3nco "w3nco${libsuffix}")
 endif()
 if(NOT  BUILD_BUFR  )
-  if(DEFINED ENV{BUFR_LIBd} )
-    set(BUFR_LIBRARY $ENV{BUFR_LIBd} )
+  if(DEFINED ENV{BUFR_LIBd_DA} )
+    set(BUFR_LIBRARY $ENV{BUFR_LIBd_DA} )
   else()
   find_library( BUFR_LIBRARY 
     NAMES libbufr.a libbufr_d_64.a libbufr_i4r8.a libbufr_v${BUFR_VER}_d_64.a

diff --git a/src/gsi/cplr_gfs_ensmod.f90 b/src/gsi/cplr_gfs_ensmod.f90
@@ -822,6 +822,7 @@ subroutine parallel_read_nemsio_state_(en_full,m_cvars2d,m_cvars3d,nlon,nlat,nsi
    if (k3u==0.or.k3v==0.or.k3t==0.or.k3q==0.or.k3oz==0) &  
       write(6,'(" WARNING, problem with one of k3-")')
 
+
 !   convert T to Tv:    postpone this calculation
 !  temp3(:,:,:,k3t)=temp3(:,:,:,k3t)*(one+fv*temp3(:,:,:,k3q))
 

diff --git a/src/gsi/genqsat.f90 b/src/gsi/genqsat.f90
@@ -53,7 +53,7 @@ subroutine genqsat(qsat,tsen,prsl,lat2,lon2,nsig,ice,iderivative)
 !$$$
   use kinds, only: r_kind,i_kind
   use constants, only: xai,tmix,xb,omeps,eps,xbi,one,zero,&
-       xa,psat,ttp,half,one_tenth
+       xa,psat,ttp,half,one_tenth,qmin
   use derivsmod, only:  qgues,dqdt,dqdrh,dqdp
   use jfunc, only:  pseudo_q2
   use gridmod, only:  wrf_nmm_regional,wrf_mass_regional,nems_nmmb_regional,aeta2_ll,regional,cmaq_regional
@@ -161,6 +161,7 @@ subroutine genqsat(qsat,tsen,prsl,lat2,lon2,nsig,ice,iderivative)
            end if
            es2=min(es,esmax)
            qsat(i,j,k) = eps * es2 / (pw - omeps * es2)
+           qsat(i,j,k) = max(qmin,qsat(i,j,k))
 
            if(iderivative > 0)then
             if(es <= esmax .and. iderivative == 2)then

diff --git a/src/gsi/getcount_bufr.f90 b/src/gsi/getcount_bufr.f90
@@ -33,7 +33,6 @@ subroutine  getcount_bufr(inpfile,nmsg,nsub)
 
    lunit=get_lun()
    nsub=0;nmsg=0
-   call closbf(lunit)
    open(lunit,file=trim(inpfile),form='unformatted')
    call openbf(lunit,'IN',lunit)
    do while(ireadmg(lunit,subset,idate) >=0)

diff --git a/src/gsi/glbsoi.f90 b/src/gsi/glbsoi.f90
@@ -169,7 +169,7 @@ subroutine glbsoi
 ! Declare local variables
   logical laltmin
 
-  integer(i_kind) jiterlast
+  integer(i_kind) jiterlast,lunix,lunit
   real(r_kind) :: zgg,zxy
   character(len=12) :: clfile
   logical print_verbose
@@ -210,8 +210,17 @@ subroutine glbsoi
 ! Set cost function
   call create_jfunc
 
+  lunit=0
+  lunix=0
+  call isetprm('MXMSGL',400000)
+  call isetprm('MAXSS',250000)
+!  Initialize bufr read on all processors (so that exitbufr works, lunit and
+!  lunix are dummys)
+  call openbf(lunit,'FIRST',lunix)
 ! Read observations and scatter
   call observer_set
+!  release bufr memory
+  call exitbufr
 
 ! cloud analysis
   if(i_gsdcldanal_type==6 .or. i_gsdcldanal_type==3) then