GitHub Issue #126. Add use of high resolution Raob data.

NOAA-EMC · Apr 13, 2021 · d6816c0 · d6816c0
1 parent 02d5ce6
commit d6816c0
Show file tree

Hide file tree

Showing 59 changed files with 1,719 additions and 99 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/modulefiles/modulefile.ProdGSI.hera b/modulefiles/modulefile.ProdGSI.hera
@@ -1,4 +1,4 @@
-#%Module######################################################################
+#%Module
 # NOAA-EMC/GSI
 #_____________________________________________________
 #proc ModulesHelp { } {
@@ -8,7 +8,7 @@
 ##}
 #module-whatis " NOAA-EMC/GSI whatis description"
 
-setenv CRTM_FIX /scratch2/NCEPDEV/nwprod/NCEPLIBS/fix/crtm_v2.3.0
+# setenv CRTM_FIX /scratch2/NCEPDEV/nwprod/NCEPLIBS/fix/crtm_v2.3.0
 
 # Load cmake
 module use -a /contrib/cmake/modulefiles

diff --git a/regression/regression_var.sh b/regression/regression_var.sh
@@ -131,7 +131,7 @@ case $machine in
 
    #  On Hera, there are no scrubbers to remove old contents from stmp* directories.
    #  After completion of regression tests, will remove the regression test subdirecories
-   export clean=".true."
+   export clean=".false."
    ;;
    WCOSS_C)
    if [ -d /gpfs/hps3/emc/global/noscrub/$LOGNAME ]; then

diff --git a/src/gsi/cplr_gfs_ensmod.f90 b/src/gsi/cplr_gfs_ensmod.f90
@@ -822,6 +822,10 @@ 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-")')
 
+   do k=1,nsig
+      call fillpoles_sv_(temp3(:,:,k,k3u),temp3(:,:,k,k3v),nlon,nlat,clons,slons)
+   end do
+
 !   convert T to Tv:    postpone this calculation
 !  temp3(:,:,:,k3t)=temp3(:,:,:,k3t)*(one+fv*temp3(:,:,:,k3q))
 

diff --git a/src/gsi/getcount_bufr.f90 b/src/gsi/getcount_bufr.f90
@@ -33,7 +33,7 @@ subroutine  getcount_bufr(inpfile,nmsg,nsub)
 
    lunit=get_lun()
    nsub=0;nmsg=0
-   call closbf(lunit)
+!  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