From cb39a72c9a9eb2723e144dfc0721e2ecb280f917 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 10 Aug 2022 13:21:03 -0400 Subject: [PATCH 1/2] Support for reorganized Radiation --- GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt b/GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt index 23033710b..2c84ab94f 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt @@ -6,20 +6,21 @@ set (alldirs GEOSsurface_GridComp GEOSturbulence_GridComp GEOSgwd_GridComp - GEOSradiation_GridComp ) if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_PhysicsGridComp.F90) + esma_add_subdirectory(GEOSradiation_GridComp) + esma_add_library (${this} SRCS GEOS_PhysicsGridComp.F90 - SUBCOMPONENTS ${alldirs} + SUBCOMPONENTS ${alldirs} GEOS_RadiationGridComp DEPENDENCIES MAPL GMAO_mpeu GMAO_stoch esmf) else () - esma_add_subdirectories (${alldirs}) + esma_add_subdirectories (${alldirs} GEOSradiation_GridComp) endif() From 3eb6eeb65490697c5b009dd9a12c660bcffd5223 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Aug 2022 10:02:17 -0400 Subject: [PATCH 2/2] Fix CMake --- GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt b/GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt index 2c84ab94f..01dce0212 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt @@ -15,8 +15,8 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_PhysicsGridComp.F90) esma_add_library (${this} SRCS GEOS_PhysicsGridComp.F90 - SUBCOMPONENTS ${alldirs} GEOS_RadiationGridComp - DEPENDENCIES MAPL GMAO_mpeu GMAO_stoch esmf) + SUBCOMPONENTS ${alldirs} + DEPENDENCIES MAPL GMAO_mpeu GMAO_stoch esmf GEOS_RadiationGridComp) else ()