Skip to content

Commit

Permalink
Add Hercules support (#1733)
Browse files Browse the repository at this point in the history
* Update several RT files to add Hercules support. Add hercules intel lua file.

* Update rt.sh

* Use dusan's formatting in ufs_common. Change hdf5 version.

* Update rt_utils.sh

* Remove git diff syntax from rt_utils.sh

* Add regnerated cdeps_share files; add DCPRGNU and DCPRINTEL flags to CMEPS and CDEPS CMakeliststo allow for GNU builds; remove the Intel compiler directive in the current cdeps_share files.

* turn off control_wam_debug for intel as well

move CPRGNU CPP flag to apply to all gnu versions (fixes hera failures)

* Add Hercules as a machine in pull_request_template.md
  • Loading branch information
ulmononian authored Sep 20, 2023
1 parent d37ff7c commit e053209
Show file tree
Hide file tree
Showing 32 changed files with 11,856 additions and 3,826 deletions.
1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
- RDHPCS
- [ ] Hera
- [ ] Orion
- [ ] Hercules
- [ ] Jet
- [ ] Gaea
- [ ] Cheyenne
Expand Down
5 changes: 5 additions & 0 deletions CDEPS-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# CDEPS compiler flags
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
#Set CPP defintions for the ufs/cdeps_share target library
list(APPEND CDEPS_SHARE_DEFS "CPRGNU")
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
endif()
Expand All @@ -11,6 +13,8 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
#Set CPP defintions for the ufs/cdeps_share target library
list(APPEND CDEPS_SHARE_DEFS "CPRINTEL")
else()
message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
endif()
Expand All @@ -23,6 +27,7 @@ add_library(share OBJECT ${cdeps_share_files} ${ufs_cdeps_share_files})
set_target_properties(share PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
target_include_directories(share PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ufs/cdeps_share)
target_include_directories(share PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
target_compile_definitions(share PRIVATE ${CDEPS_SHARE_DEFS})
target_link_libraries(share PRIVATE esmf)

# CDEPS/streams
Expand Down
Loading

0 comments on commit e053209

Please sign in to comment.