Skip to content

Sync develop into main #1150

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
sdrabenh merged 5 commits into from
Aug 29, 2025
Merged

Sync develop into main #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54425e4
Updated introductory comments in GEOS_SurfaceGridComp.rc
gmao-rreichle Jul 10, 2025
f4cdac6
Merge pull request #1133 from GEOS-ESM/feature/rreichle/GEOS_SurfaceG…
sdrabenh Jul 11, 2025
4720446
v11: Support for GCC 15
mathomp4 Jul 31, 2025
2939658
Cleaner
mathomp4 Jul 31, 2025
75599de
Merge pull request #1138 from GEOS-ESM/feature/v11-gcc15-support
sdrabenh Aug 25, 2025
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
11 changes: 10 additions & 1 deletion 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 @@ -22,7 +22,16 @@ if (CMAKE_Fortran_COMPILER_ID MATCHES Intel AND CMAKE_BUILD_TYPE MATCHES Aggress
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})
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
# 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})
endif()
endif ()

# Note For unknown reasons, BACM_1M_Interface takes 20 minutes to compile at O3
Expand Down
14 changes: 5 additions & 9 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/GEOS_SurfaceGridComp.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@
# #
# Resource file for surface parameters, *jointly* used by the GCM and GEOSldas. #
# #
# Different default values for the GCM and GEOSldas are supported as follows: #
# #
# - Lines that are NOT commented out can be used to specify GCM defaults as #
# needed, because they are ignored by GEOSldas. #
# #
# - The string "GEOSldas=>" identifies the GEOSldas default. #
# #
# This works because this resource file is processed by the GEOSldas #
# script "ldas_setup". #
# Different default values for the GCM and GEOSldas are supported because #
# because this resource file is processed by setup scripts (gcm_setup, #
# fvsetup, ldas_setup). #
# The setup scripts uncomment the appropriate default values by removing the #
# the appropriate '# GEOS[xxxx]=>' strings. #
# #
# NOTE: For the GCM, there must NOT be white space between the resource #
# parameter name and the colon. #
Expand Down