Skip to content

Remove dependency on sfcio and use sigio only when nemsio is enabled #930

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

Merged
WenMeng-NOAA merged 4 commits into from
Apr 19, 2024
Merged

Remove dependency on sfcio and use sigio only when nemsio is enabled #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6aa5952
Remove sfcio and use sigio only when numsio is enabled
DusanJovic-NOAA Apr 15, 2024
89cff7f
Merge branch 'NOAA-EMC:develop' into remove_sfcio
DusanJovic-NOAA Apr 16, 2024
8849061
Remove sfcio from modulefiles/wcoss2.lua
DusanJovic-NOAA Apr 19, 2024
733f9cf
Compile GFSPOSTSIG.F only if nemsio is enabled
DusanJovic-NOAA Apr 19, 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
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion modulefiles/upp_common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}

Expand Down
2 changes: 0 additions & 2 deletions modulefiles/wcoss2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 3 additions & 5 deletions sorc/ncep_post.fd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down