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

Restore ufs_public_release branch and merge in mods from ufs_release_v1.0 #46

Merged
merged 10 commits into from
Jan 10, 2020
Merged

Restore ufs_public_release branch and merge in mods from ufs_release_v1.0 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2bade15
Update .gitmodules, add branch = ufs_release_1.0 for cmake
climbfuji Jan 6, 2020
0b23ed4
Update .gitmodules for testing, code review and merging
climbfuji Jan 6, 2020
54a2605
Update include/lib flags for sigio, sfcio, nemsio
climbfuji Jan 6, 2020
8664d23
Add REQUIRED attribute to find_package calls in CMakeLists.txt
climbfuji Jan 7, 2020
e08626a
Comment out LAPACK dependency in CMakeLists.txt
climbfuji Jan 7, 2020
c6c6bb4
Revert change to .gitmodules, update submodule pointer for cmake
climbfuji Jan 9, 2020
9bd8aed
Merge pull request #42 from climbfuji/dom_cleanup_work_20191206
fossell Jan 9, 2020
cc9ac99
sorc/ncep_post.fd/CMakeLists.txt: change GFSIO_INC to GFSIO_INC4
climbfuji Jan 9, 2020
0bdb81d
Merge pull request #43 from climbfuji/fix_gfsio_inc
fossell Jan 9, 2020
1fc8ba6
Merge pull request #44 from NOAA-EMC/ufs_public_release
fossell Jan 9, 2020
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
1 change: 1 addition & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "cmake"]
path = cmake
url = https://github.com/NOAA-EMC/CMakeModules.git
branch = ufs_release_1.0
40 changes: 20 additions & 20 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,25 @@ endif()
if(POLICY CMP0012)
cmake_policy(SET CMP0012 NEW)
endif()
find_package( MPI )
find_package( OpenMP )
find_package( Jasper )
find_package( LAPACK )
find_package( SIGIO )
find_package( PNG )
find_package( ZLIB )
find_package( W3NCO )
find_package( G2 )
find_package( G2TMPL )
find_package( BACIO )
find_package( IP )
find_package( SP )
find_package( SFCIO )
find_package( NEMSIO )
find_package( GFSIO )
find_package( W3EMC )
find_package( CRTM )
find_package( HDF5 COMPONENTS C Fortran HL )
find_package( NetCDF )
find_package(MPI REQUIRED)
find_package(OpenMP)
#find_package(LAPACK)
find_package(Jasper REQUIRED)
find_package(SIGIO REQUIRED)
find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
find_package(W3NCO REQUIRED)
find_package(G2 REQUIRED)
find_package(G2TMPL REQUIRED)
find_package(BACIO REQUIRED)
find_package(IP REQUIRED)
find_package(SP REQUIRED)
find_package(SFCIO REQUIRED)
find_package(NEMSIO REQUIRED)
find_package(GFSIO REQUIRED)
find_package(W3EMC REQUIRED)
find_package(CRTM REQUIRED)
find_package(HDF5 COMPONENTS C Fortran HL REQUIRED)
find_package(NetCDF REQUIRED)

add_subdirectory(sorc/ncep_post.fd)
2 changes: 1 addition & 1 deletion cmake
Open in desktop
Submodule cmake updated 20 files
+12 −15 Modules/FindBACIO.cmake
+12 −16 Modules/FindBUFR.cmake
+3 −6 Modules/FindCRTM.cmake
+0 −9 Modules/FindESMF.cmake
+9 −14 Modules/FindG2.cmake
+3 −4 Modules/FindG2C.cmake
+5 −9 Modules/FindG2TMPL.cmake
+1 −1 Modules/FindGEMPAK.cmake
+4 −11 Modules/FindGFSIO.cmake
+4 −5 Modules/FindGSICONTROL.cmake
+11 −18 Modules/FindIP.cmake
+6 −11 Modules/FindLANDSFCUTIL.cmake
+7 −15 Modules/FindNEMSIO.cmake
+6 −10 Modules/FindNEMSIOGFS.cmake
+2 −2 Modules/FindNetCDF.cmake
+8 −17 Modules/FindSFCIO.cmake
+8 −17 Modules/FindSIGIO.cmake
+11 −18 Modules/FindSP.cmake
+17 −25 Modules/FindW3EMC.cmake
+8 −13 Modules/FindW3NCO.cmake
4 changes: 2 additions & 2 deletions sorc/ncep_post.fd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ set_source_files_properties( ${EXE_C_SRC} PROPERTIES COMPILE_FLAGS ${CMAKE_C_FLA
set_target_properties( ${EXENAME} PROPERTIES LINK_FLAGS ${OpenMP_Fortran_FLAGS} )
add_dependencies(${EXENAME} ${LIBNAME})

include_directories( ${MPI_Fortran_MODULE_DIR} ${MPI_Fortran_INCLUDE_PATH} ${NETCDF_INCLUDES} ${SIGIO_INC} ${NEMSIO_INC} ${SFCIO_INC} ${W3EMC_INC4} ${G2_INC4} ${G2TMPL_INCd} ${GFSIO_INC} ${CRTM_INC} )
target_link_libraries(${EXENAME} ${LIBNAME} ${SP_LIB4} ${SIGIO_LIB} ${SFCIO_LIB} ${GFSIO_LIB4} ${NEMSIO_LIB} ${IP_LIB4} ${W3EMC_LIB4} ${W3NCO_LIB4} ${G2TMPL_LIBd} ${G2_LIB4} ${CRTM_LIB} ${BACIO_LIB4} ${PNG_LIBRARIES} ${JASPER_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${CMAKE_DL_LIBS} )
include_directories( ${MPI_Fortran_MODULE_DIR} ${MPI_Fortran_INCLUDE_PATH} ${NETCDF_INCLUDES} ${SIGIO_INC4} ${NEMSIO_INC} ${SFCIO_INC4} ${W3EMC_INC4} ${G2_INC4} ${G2TMPL_INCd} ${GFSIO_INC4} ${CRTM_INC} )
target_link_libraries(${EXENAME} ${LIBNAME} ${SP_LIB4} ${SIGIO_LIB4} ${SFCIO_LIB4} ${GFSIO_LIB4} ${NEMSIO_LIB} ${IP_LIB4} ${W3EMC_LIB4} ${W3NCO_LIB4} ${G2TMPL_LIBd} ${G2_LIB4} ${CRTM_LIB} ${BACIO_LIB4} ${PNG_LIBRARIES} ${JASPER_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${CMAKE_DL_LIBS} )

install(TARGETS ${EXENAME}
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
Expand Down