Update to spack-stack on WCOSS2, including bufr 12.0.1

modulefiles/gsi_wcoss2.intel.lua

@@ -1,50 +1,22 @@
 help([[
 ]])
 
-local PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
-local intel_ver=os.getenv("intel_ver") or "19.1.3.304"
-local craype_ver=os.getenv("craype_ver") or "2.7.8"
-local cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
-local cmake_ver= os.getenv("cmake_ver") or "3.20.2"
-local python_ver=os.getenv("python_ver") or "3.8.6"
-local prod_util_ver=os.getenv("prod_util_ver") or "2.0.10"
-
-local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
-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.9.2"
-local sp_ver=os.getenv("sp_ver") or "2.3.3"
-local ip_ver=os.getenv("ip_ver") or "3.3.3"
-local sigio_ver=os.getenv("sigio_ver") or "2.3.2"
-local sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
-local nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
-local wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
-local ncio_ver=os.getenv("ncio_ver") or "1.1.2"
-local crtm_ver=os.getenv("crtm_ver") or "2.4.0.1"
-local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.1"
+prepend_path("MODULEPATH", "/apps/ops/test/spack-stack-1.6.0-nco/envs/nco-intel-19.1.3.304/install/modulefiles/Core")
 
-load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
-load(pathJoin("intel", intel_ver))
-load(pathJoin("craype", craype_ver))
-load(pathJoin("cray-mpich", cray_mpich_ver))
-load(pathJoin("cmake", cmake_ver))
-load(pathJoin("python", python_ver))
+local stack_python_ver=os.getenv("python_ver") or "3.10.13"
+local stack_intel_ver=os.getenv("stack_intel_ver") or "19.1.3.304"
+local stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.9"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+local prod_util_ver=os.getenv("prod_util_ver") or "2.0.10"
 
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
+load(pathJoin("stack-python", stack_python_ver))
+-- BUFR is 12.0.1 in this version of spack-stack
+pushenv("bufr_ver", "12.0.1")
+load("gsi_common")
 load(pathJoin("prod_util", prod_util_ver))
-
-load(pathJoin("netcdf", netcdf_ver))
-load(pathJoin("bufr", bufr_ver))
-load(pathJoin("bacio", bacio_ver))
-load(pathJoin("w3emc", w3emc_ver))
-load(pathJoin("sp", sp_ver))
-load(pathJoin("ip", ip_ver))
-load(pathJoin("sigio", sigio_ver))
-load(pathJoin("sfcio", sfcio_ver))
-load(pathJoin("nemsio", nemsio_ver))
-load(pathJoin("wrf_io", wrf_io_ver))
-load(pathJoin("ncio", ncio_ver))
-load(pathJoin("crtm", crtm_ver))
-load(pathJoin("ncdiag",ncdiag_ver))
+load(pathJoin("cmake", cmake_ver))
 
 pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20240208")
 

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)

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),&

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.8))') '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

ush/module-setup.sh

@@ -38,6 +38,7 @@ elif [[ $MACHINE_ID = s4* ]] ; then
 
 elif [[ $MACHINE_ID = wcoss2 ]]; then
     # We are on WCOSS2
+    export LMOD_TMOD_FIND_FIRST=yes
     module reset
 
 elif [[ $MACHINE_ID = stampede* ]] ; then