Local changes for BUFR 12.1

DavidHuber-NOAA · Aug 7, 2024 · 848b661 · 848b661
1 parent 04896a7
commit 848b661
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/modulefiles/gsi_common.lua b/modulefiles/gsi_common.lua
@@ -5,7 +5,6 @@ Load common modules to build GSI on all machines
 local netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
 local netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
 
-local bufr_ver=os.getenv("bufr_ver") or "11.7.0"
 local bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 local w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
 local sp_ver=os.getenv("sp_ver") or "2.5.0"
@@ -21,7 +20,21 @@ local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2"
 load(pathJoin("netcdf-c", netcdf_c_ver))
 load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 
-load(pathJoin("bufr", bufr_ver))
+prepend_path("PATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/bin", ":")
+prepend_path("LD_LIBRARY_PATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/lib64", ":")
+prepend_path("DYLD_LIBRARY_PATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/lib64", ":")
+prepend_path("CPATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/include", ":")
+prepend_path("CMAKE_PREFIX_PATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/.", ":")
+prepend_path("PATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/bin", ":")
+prepend_path("CMAKE_PREFIX_PATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/.", ":")
+prepend_path("PYTHONPATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/lib/python3.11/site-packages", ":")
+setenv("BUFR_LIB4", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/lib64/libbufr_4.a")
+setenv("BUFR_INC4", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/include/bufr_4")
+prepend_path("PYTHONPATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/lib64/python3.11/site-packages", ":")
+prepend_path("PYTHONPATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/lib64/python3.11/site-packages", ":")
+prepend_path("PYTHONPATH", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install/lib64/python3.11/site-packages", ":")
+setenv("bufr_ROOT", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install")
+setenv("BUFR_ROOT", "/work/noaa/global/dhuber/LIBS/bufr_12.1.0_hercules_keep/install")
 load(pathJoin("bacio", bacio_ver))
 load(pathJoin("w3emc", w3emc_ver))
 load(pathJoin("sp", sp_ver))

diff --git a/src/gsi/CMakeLists.txt b/src/gsi/CMakeLists.txt
@@ -155,7 +155,7 @@ target_link_libraries(gsi_fortran_obj PUBLIC nemsio::nemsio)
 target_link_libraries(gsi_fortran_obj PUBLIC ncio::ncio)
 target_link_libraries(gsi_fortran_obj PUBLIC w3emc::w3emc_d)
 target_link_libraries(gsi_fortran_obj PUBLIC sp::sp_d)
-target_link_libraries(gsi_fortran_obj PUBLIC bufr::bufr_d)
+target_link_libraries(gsi_fortran_obj PUBLIC bufr::bufr_4)
 target_link_libraries(gsi_fortran_obj PUBLIC crtm::crtm)
 if(GSI_MODE MATCHES "Regional")
   target_link_libraries(gsi_fortran_obj PUBLIC wrf_io::wrf_io)

diff --git a/src/gsi/oneobmod.F90 b/src/gsi/oneobmod.F90
@@ -173,7 +173,7 @@ subroutine oneobmakebufr
     real(r_kind),dimension(1,1):: poe,qoe,toe,woe
     real(r_kind),dimension(1):: xob,yob,dhr
     real(r_kind),dimension(1,1):: pob    
-    real(r_double) vtcd
+    integer(i_kind) vtcd
     integer(i_kind) n,k,iret
     real(r_kind) hdr(10),obs(13,255),qms(10,255),err(10,255),cld2seq(2,1), &
                  cldseq(3,10),owave(1,255),maxtmint(2,255),cldceilh(1,255),&

diff --git a/src/gsi/read_prepbufr.f90 b/src/gsi/read_prepbufr.f90
@@ -358,7 +358,7 @@ subroutine read_prepbufr(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
   real(r_kind) :: windsensht
 
   real(r_double) rstation_id,qcmark_huge
-  real(r_double) vtcd,glcd !virtual temp program code and GLERL program code
+  integer(i_kind) vtcd,glcd !virtual temp program code and GLERL program code
   real(r_double),dimension(8):: hdr,hdrtsb
   real(r_double),dimension(3,255):: hdr3
   real(r_double),dimension(8,255):: drfdat,qcmark,obserr,var_jb
@@ -880,10 +880,10 @@ subroutine read_prepbufr(nread,ndata,nodata,infile,obstype,lunout,twindin,sis,&
   else
      !warn that GLERL adjustment is not available.
      print*, "WARNING: GLERL program code not in this file."
-     glcd=-999._r_double
+     glcd=-999
   endif
 
-  if(print_verbose) write(6,'(1x,A,A,A,2(A,1x,F8.3))') 'read_prepbufr:',        &
+  if(print_verbose) write(6,'(1x,A,A,A,2(A,1x,I8))') 'read_prepbufr:',        &
      trim(adjustl(obstype)),':', '  vtcd= ',vtcd,'  glcd= ',glcd
 
   call init_rjlists
@@ -3363,7 +3363,7 @@ subroutine sonde_ext(obsdat,tpc,qcmark,obserr,drfdat,levsio,kx,vtcd)
 
 ! !INPUT PARAMETERS:
   integer(i_kind)                                  , intent(in   ) ::kx
-  real(r_double)                                   , intent(in   ) ::vtcd
+  integer(i_kind)                                  , intent(in   ) ::vtcd
 
 ! !INPUT/OUTPUT PARAMETERS:
   integer(i_kind)                                  , intent(inout) ::levsio