v11: Updaates for GCC 15 and Moist

Author: mathomp4

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt

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