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.

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

Add Hercules support #1733

Merged
Merged
Show file tree
Hide file tree
Changes from 78 commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
cd472a1
Update several RT files to add Hercules support. Add hercules intel l…
May 2, 2023
227d7b0
Update rt.sh
ulmononian May 2, 2023
551ae08
Change batch to windfall in another location; fix lake model section …
May 2, 2023
078e834
Change ufs_common to spack versions. Reformat later.
May 2, 2023
752dd3d
Fix semicolon issue in detect_machine.sh
May 2, 2023
65bb5b2
Use dusan's formatting in ufs_common. Change hdf5 version.
May 2, 2023
afe7bae
Update rt.sh.
May 2, 2023
0f65fc6
Fix MACHINE_ID in hercules fv3_slurm.IN.
May 2, 2023
4d249c8
Update rt_utils.sh
ulmononian May 2, 2023
1bb8ffc
Update rt_utils.sh
ulmononian May 2, 2023
2cfd6ac
Add pmi2 setting to Hercules fv3_slurm srun command.
May 3, 2023
2f5363d
Merge branch 'feature/add_hercules' of https://github.com/ulmononian/…
May 3, 2023
02e669e
Update rt_utils.sh
May 3, 2023
8e3d988
Another mystery change to rt_utils.sh
May 3, 2023
0856a9b
Update Hercules lua file mapl/esmf versions; update rt.sh.
May 11, 2023
4093c47
Update Hercules' ecflow section in rt.sh.
ulmononian May 16, 2023
c83d0e3
Add gcc load to Hercules section of rt.sh.
Jun 1, 2023
b9e8f2c
Bring Hercules PR branch up to date w/ WM develop (hash 5d47ea8).
Jun 1, 2023
8ee45de
Remove git diff syntax from rt_utils.sh
Jun 1, 2023
8cfc400
Fix slurm/pmi2 issue on hercules (for now).
ulmononian Jun 7, 2023
46c8c1d
Merge branch 'ufs-community:develop' into feature/add_hercules
ulmononian Jun 7, 2023
47857a3
Bring ufs_common and hercules lua file current for spack-stack 1.4.0 …
Jun 7, 2023
74d3cd8
Fix unified-env version (need to use v2)
ulmononian Jun 9, 2023
f3d4d15
Add Hercules to nccmp section of run_test.sh.
ulmononian Jun 12, 2023
9972ce1
Fix Hercules compile conf file; add gnu modulefile; update gocart.
Jun 14, 2023
506768d
Bring hercules branch up to develop.
ulmononian Jul 7, 2023
5a335b7
Update bl.py
zach1221 Jul 7, 2023
72b2907
Update rt.py
zach1221 Jul 7, 2023
9601172
Update rt_auto_jenkins.py
zach1221 Jul 7, 2023
91e7c95
Update start_rt_auto_jenkins.sh
zach1221 Jul 7, 2023
c8751ae
Update rt.sh
zach1221 Jul 7, 2023
146a9f9
Update opnReqTest
zach1221 Jul 7, 2023
72700a3
Update ufs_hercules.gnu.lua
zach1221 Jul 7, 2023
2cedbda
Update ufs_hercules.intel.lua
zach1221 Jul 7, 2023
52eadc4
Update ufs_hercules.gnu.lua
zach1221 Jul 11, 2023
c284371
Update ufs_hercules.intel.lua
zach1221 Jul 11, 2023
edf4918
Update rt.sh ecflow installation
zach1221 Jul 12, 2023
4fc137b
Update rt.sh
zach1221 Jul 12, 2023
d109282
Update rt.sh
zach1221 Jul 12, 2023
4076fc4
Update ufs_hercules.intel.lua
zach1221 Jul 13, 2023
fa8be37
Update ufs_hercules.gnu.lua
zach1221 Jul 13, 2023
b48ca14
Merge pull request #9 from ulmononian/Hercules_role-epic3
ulmononian Jul 13, 2023
e45b526
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
Jul 13, 2023
1247ceb
Remove --mpi=pmi2 from fv3_slurm.IN_hercules since MSU admins fixed t…
Jul 13, 2023
e2be04b
Update stack path & intel compiler version
ulmononian Jul 17, 2023
8e2218a
Update stack path for hercules gnu modulefile
ulmononian Jul 17, 2023
a2cf029
Update compile_slurm.IN_hercules
ulmononian Jul 18, 2023
18a0047
Update fv3_slurm.IN_hercules
ulmononian Jul 18, 2023
9da0fdf
Bring up to date w/ develop hash 7e9063d.
Aug 25, 2023
1c74644
Merge branch 'ufs-community:develop' into feature/add_hercules
ulmononian Aug 28, 2023
0d6c21f
Add mpirun option for GNU on Hercules.
Aug 28, 2023
e178e9f
Merge branch 'ufs-community:develop' into feature/add_hercules
ulmononian Aug 29, 2023
2eb6e8c
Include ufs_common module loads in Hercules lua files to account for …
Aug 29, 2023
f3b5c41
Fix permissions of rt.sh.
Aug 31, 2023
31b11cd
Fix dprefix for Hercules.
Aug 31, 2023
60a1aa0
Change == to .eq. for CDEPS shr_infnan_mod.F90.
Aug 31, 2023
d7f33ef
Merge branch 'ufs-community:develop' into feature/add_hercules
ulmononian Aug 31, 2023
8179245
Merge branch 'ufs-community:develop' into feature/add_hercules
ulmononian Sep 5, 2023
d93f849
Add additional path to hercules lua files.
Sep 5, 2023
77545bd
Update CMake flags for GNU versions >10 to fix compile failures w/ CD…
Sep 5, 2023
4677f4e
Merge branch 'ufs-community:develop' into feature/add_hercules
ulmononian Sep 6, 2023
117f998
Revert .eq. to == in CDEPS-interface/ufs/cdeps_share/shr_infnan_mod.F…
Sep 6, 2023
c16f21b
Remove bad python/ecflow paths from hercules section in opnReqTest
ulmononian Sep 6, 2023
d277259
Merge branch 'ufs-community:develop' into feature/add_hercules
ulmononian Sep 11, 2023
c4f3c9b
Add regnerated cdeps_share files; add DCPRGNU and DCPRINTEL flags to …
Sep 14, 2023
d6aa640
Merge branch 'ufs-community:develop' into feature/add_hercules
ulmononian Sep 14, 2023
43b7e87
Add cmake configs for Hercules to keep pnetcdf build flags consistent…
Sep 15, 2023
79a6a17
Add Hercules to GNU section of rt.conf. Turn off control_wam_debug_gnu.
Sep 15, 2023
15be8b0
Add Hercules to GNU section of rt.conf. Turn off control_wam_debug_gnu.
Sep 15, 2023
5c3de9d
Fix control_wam_debug OFF setting for Hercules (gnu not intel).
Sep 15, 2023
5c8087b
Update the GNU/Intel CPP flags in CDEPS & CMEPS CMakelists.txt files.
Sep 18, 2023
97b9f1e
Merge branch 'ufs-community:develop' into feature/add_hercules
ulmononian Sep 18, 2023
71ab976
Update CDEPS-interface/CMakeLists.txt
ulmononian Sep 18, 2023
d620366
Further refine CMEPS/CDEPS CMakelists flag settings.
Sep 18, 2023
184a91e
Merge branch 'feature/add_hercules' of https://github.com/ulmononian/…
Sep 18, 2023
f5db609
One more fix to CDEPS cmakelists.
Sep 18, 2023
efe71d8
Update hercules' DISKNM
ulmononian Sep 18, 2023
1c77693
turn off control_wam_debug for intel as well
ulmononian Sep 18, 2023
c72148f
Update bl.py
ulmononian Sep 18, 2023
06a0db3
Update opnReqTest
ulmononian Sep 18, 2023
f79f152
Ensure two gocart parm files are in sync with develop.
Sep 18, 2023
80a2995
add cpld_control ORT: passed
zach1221 Sep 19, 2023
ad7a971
cpld_control ORT with GNU logs: passed
zach1221 Sep 19, 2023
a2dbe7e
Update CDEPS CMakeLists.txt
ulmononian Sep 19, 2023
15719c6
Update CMEPS CMakeLists.txt
ulmononian Sep 19, 2023
2a52dbc
remove extra space from cmeps cmakelists
ulmononian Sep 19, 2023
15c7fde
add new ORT cpld_control logs following cmake updates: passed
zach1221 Sep 20, 2023
83e9033
add hera RT log: passed
FernandoAndrade-NOAA Sep 20, 2023
904f551
add jet RT log: passed
FernandoAndrade-NOAA Sep 20, 2023
86e100b
add hercules RT logs: passed
zach1221 Sep 20, 2023
91a91ef
add orion RT logs: passed
zach1221 Sep 20, 2023
6caba4b
WCOSS2 RT Log
BrianCurtis-NOAA Sep 20, 2023
43c4e57
Acorn RT Log
BrianCurtis-NOAA Sep 20, 2023
092342d
add gaea RT logs: passed
zach1221 Sep 20, 2023
c53b5cb
Add Hercules as a machine in pull_request_template.md
ulmononian Sep 20, 2023
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
5 changes: 5 additions & 0 deletions CDEPS-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
#Set CPP defintions for the ufs/cdeps_share target library
list(APPEND CDEPS_SHARE_DEFS "CPRGNU")
endif()
set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
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