Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to spack-stack 1.8.0 and BUFR 12.1.0 #791

Closed
wants to merge 5 commits into from
Closed

Upgrade to spack-stack 1.8.0 and BUFR 12.1.0 #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e490795
Update to spack-stack 1.8.0
DavidHuber-NOAA Sep 6, 2024
772bf31
Merge remote-tracking branch 'origin/develop' into feature/ss_180
DavidHuber-NOAA Sep 6, 2024
cec8f98
Update to newer SS-1.8.0
DavidHuber-NOAA Sep 9, 2024
cb02b23
Update ci library versions
DavidHuber-NOAA Sep 13, 2024
7db266d
Remove sp from CMakeLists
DavidHuber-NOAA Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ci/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ spack:
specs:
- [email protected]
- [email protected]
- bufr@11.7.0
- bufr@12.1.0
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
Expand Down
6 changes: 2 additions & 4 deletions modulefiles/gsi_common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ 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 bufr_ver=os.getenv("bufr_ver") or "12.1.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"
local ip_ver=os.getenv("ip_ver") or "4.3.0"
local ip_ver=os.getenv("ip_ver") or "5.0.0"
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"
Expand All @@ -24,7 +23,6 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_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))
Expand Down
6 changes: 3 additions & 3 deletions modulefiles/gsi_hera.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
help([[
]])

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", '/scratch1/NCEPDEV/global/David.Huber/SPACK/ss_1.8.0/envs/gsi-addon/install/modulefiles/Core')
RussTreadon-NOAA marked this conversation as resolved.
Show resolved Hide resolved

local python_ver=os.getenv("python_ver") or "3.11.6"
local python_ver=os.getenv("python_ver") or "3.11.7"
local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
local cmake_ver=os.getenv("cmake_ver") or "3.27.9"
local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"

load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
4 changes: 2 additions & 2 deletions src/enkf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ find_package(sigio REQUIRED)
find_package(sfcio REQUIRED)
find_package(nemsio REQUIRED)
find_package(ncio REQUIRED)
find_package(sp REQUIRED)
find_package(ip REQUIRED)
find_package(w3emc REQUIRED)
if(ENKF_MODE MATCHES "^(WRF|NMMB|FV3REG)$")
find_package(wrf_io REQUIRED)
Expand Down Expand Up @@ -112,7 +112,7 @@ target_link_libraries(enkf_fortran_obj PUBLIC sfcio::sfcio)
target_link_libraries(enkf_fortran_obj PUBLIC nemsio::nemsio)
target_link_libraries(enkf_fortran_obj PUBLIC ncio::ncio)
target_link_libraries(enkf_fortran_obj PUBLIC w3emc::w3emc_d)
target_link_libraries(enkf_fortran_obj PUBLIC sp::sp_d)
target_link_libraries(enkf_fortran_obj PUBLIC ip::ip_d)
if(OpenMP_Fortran_FOUND)
target_link_libraries(enkf_fortran_obj PRIVATE OpenMP::OpenMP_Fortran)
endif()
Expand Down
5 changes: 2 additions & 3 deletions src/gsi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ find_package(sfcio REQUIRED)
find_package(nemsio REQUIRED)
find_package(ncio REQUIRED)
find_package(ncdiag REQUIRED)
find_package(sp REQUIRED)
find_package(ip REQUIRED)
find_package(w3emc REQUIRED)
find_package(bufr REQUIRED)
Expand Down Expand Up @@ -154,8 +153,8 @@ target_link_libraries(gsi_fortran_obj PUBLIC sfcio::sfcio)
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 ip::ip_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)
Expand Down
2 changes: 1 addition & 1 deletion src/gsi/oneobmod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),&
Expand Down
8 changes: 4 additions & 4 deletions src/gsi/read_prepbufr.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) glcd, vtcd
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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading