diff --git a/CMakeLists.txt b/CMakeLists.txt index dd59b532b..05c389c16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,9 +87,8 @@ endif() if(BUILD_POSTEXEC) if(BUILD_WITH_NEMSIO) find_package(nemsio REQUIRED) + find_package(sigio REQUIRED) endif() - find_package(sfcio REQUIRED) - find_package(sigio REQUIRED) find_package(sp REQUIRED) find_package(w3emc REQUIRED) if(BUILD_WITH_WRFIO) diff --git a/modulefiles/upp_common.lua b/modulefiles/upp_common.lua index e012f5652..c8e529e2f 100644 --- a/modulefiles/upp_common.lua +++ b/modulefiles/upp_common.lua @@ -19,7 +19,6 @@ local ufs_modules = { {["w3emc"] = "2.10.0"}, {["nemsio"] = "2.5.4"}, {["sigio"] = "2.3.2"}, - {["sfcio"] = "1.4.1"}, {["wrf-io"] = "1.2.0"}, } diff --git a/modulefiles/wcoss2.lua b/modulefiles/wcoss2.lua index ce9dc5c72..eccb1d6df 100644 --- a/modulefiles/wcoss2.lua +++ b/modulefiles/wcoss2.lua @@ -40,11 +40,9 @@ load(pathJoin("w3emc", w3emc_ver)) nemsio_ver=os.getenv("nemsio_ver") or "2.5.2" sigio_ver=os.getenv("sigio_ver") or "2.3.2" -sfcio_ver=os.getenv("sfcio_ver") or "1.4.1" wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0" load(pathJoin("nemsio", nemsio_ver)) load(pathJoin("sigio", sigio_ver)) -load(pathJoin("sfcio", sfcio_ver)) load(pathJoin("wrf_io", wrf_io_ver)) setenv("CC","cc") diff --git a/sorc/ncep_post.fd/CMakeLists.txt b/sorc/ncep_post.fd/CMakeLists.txt index 3dbcc79ce..a0ff8bad2 100644 --- a/sorc/ncep_post.fd/CMakeLists.txt +++ b/sorc/ncep_post.fd/CMakeLists.txt @@ -149,7 +149,6 @@ endif() list(APPEND LIB_SRC ${GTG_LIB_SRC}) list(APPEND EXE_SRC - GFSPOSTSIG.F INITPOST.F INITPOST_NETCDF.f WRFPOST.F @@ -171,6 +170,7 @@ if(BUILD_WITH_NEMSIO) list(APPEND EXE_SRC ASSIGNNEMSIOVAR.f GETNEMSNDSCATTER.f + GFSPOSTSIG.F INITPOST_GFS_NEMS_MPIIO.f INITPOST_NEMS.f) endif() @@ -239,9 +239,7 @@ if(BUILD_POSTEXEC) target_link_libraries(${EXENAME} PRIVATE ${LIBNAME} w3emc::w3emc_4 - sp::sp_4 - sfcio::sfcio - sigio::sigio) + sp::sp_4) set_target_properties(${EXENAME} PROPERTIES LINKER_LANGUAGE Fortran) if(IFI_FOUND) target_link_libraries(${EXENAME} PRIVATE IFI) @@ -251,7 +249,7 @@ if(BUILD_POSTEXEC) set_target_properties(nemsio::nemsio PROPERTIES INTERFACE_LINK_LIBRARIES "w3emc::w3emc_4;bacio::bacio_4") target_link_libraries(${EXENAME} PRIVATE - nemsio::nemsio) + nemsio::nemsio sigio::sigio) target_compile_definitions(${EXENAME} PRIVATE BUILD_WITH_NEMSIO) endif() if(wrf_io_FOUND)