Remove sp from CMakeLists

NOAA-EMC · Sep 13, 2024 · 7db266d · 7db266d
1 parent cb02b23
commit 7db266d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/modulefiles/gsi_common.lua b/modulefiles/gsi_common.lua
@@ -5,10 +5,9 @@ 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 "12.0.1"
+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 "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"
@@ -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))

diff --git a/src/enkf/CMakeLists.txt b/src/enkf/CMakeLists.txt
@@ -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)
@@ -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()

diff --git a/src/gsi/CMakeLists.txt b/src/gsi/CMakeLists.txt
@@ -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)
@@ -154,7 +153,7 @@ 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 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")