Merge pull request #1150 from GEOS-ESM/develop

Sync develop into main

Author: sdrabenh

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt

@@ -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

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/GEOS_SurfaceGridComp.rc

@@ -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.                                           #