Skip to content

v11: Updates for GCC 15 and Moist #1176

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

v11: Updates for GCC 15 and Moist #1176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,21 @@ endif ()

if (CMAKE_Fortran_COMPILER_ID MATCHES GNU AND CMAKE_BUILD_TYPE MATCHES Release)
string (REPLACE "${FOPT3}" "${FOPT2}" CMAKE_Fortran_FLAGS_RELEASE ${CMAKE_Fortran_FLAGS_RELEASE})
# There is some odd interaction between GCC 15 and the GF code. FPEs
# that do not occur with GCC 14 or earlier. For now, we compile GF

# GCC 15+ workaround for some moist sources
# There is some odd interaction between GCC 15 and some moist code. FPEs
# that do not occur with GCC 14 or earlier. For now, we compile some
# codes with -O1 which seems to avoid the bad instruction. Tests show
# not much of a speed difference with GCC 14
if (${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 15)
message (STATUS "[GCC15+] Setting GF Code to use -O1 for GCC 15")
set_source_files_properties(ConvPar_GF2020.F90 PROPERTIES COMPILE_OPTIONS ${FOPT1})
set_source_files_properties(ConvPar_GF_GEOS5.F90 PROPERTIES COMPILE_OPTIONS ${FOPT1})
if (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 15)
message(STATUS "[GCC15+] Setting GF Code to use -O1 for GCC 15")
set(degrade_o1_sources
ConvPar_GF2020.F90
ConvPar_GF_GEOS5.F90
aer_actv_single_moment.F90
)
set_source_files_properties(${degrade_o1_sources}
PROPERTIES COMPILE_OPTIONS "${FOPT1}")
endif()
endif ()

Expand Down