updates to get RRTMG compiling with ifort

jdshutter · May 11, 2019 · 60d7605 · 60d7605
1 parent 4dcda73
commit 60d7605
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(GEOS_Chem VERSION 12.0.0 LANGUAGES Fortran C CXX)
 
+# Set policies
+cmake_policy(SET CMP0054 NEW)
+
 # Add our module path and include our helpers
 list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/CMakeScripts)
 include(GC-Helpers)

diff --git a/CMakeScripts/GC-ConfigureClassicBuild.cmake b/CMakeScripts/GC-ConfigureClassicBuild.cmake
@@ -149,7 +149,7 @@ set_dynamic_option(MECH
     DEFAULT "${RUNDIR_MECH}"
     LOG GENERAL_OPTIONS_LOG
     SELECT_EXACTLY 1
-    OPTIONS "Standard" "Tropchem" "SOA_SVPOA" "benchmark"
+    OPTIONS "Standard" "Tropchem" "benchmark" "RRTMG"
 )
 
 if(${MECH} STREQUAL "Tropchem")
@@ -158,8 +158,13 @@ endif()
 
 
 # Build RRTMG?
+if("${MECH}" STREQUAL "RRTMG")
+    set(RRTMG_DEFAULT "TRUE")
+else()
+    set(RRTMG_DEFAULT "FALSE")
+endif()
 set_dynamic_option(RRTMG 
-    DEFAULT "FALSE"
+    DEFAULT ${RRTMG_DEFAULT}
     LOG GENERAL_OPTIONS_LOG
     SELECT_EXACTLY 1
     OPTIONS "TRUE" "FALSE"

diff --git a/GeosCore/CMakeLists.txt b/GeosCore/CMakeLists.txt
@@ -106,7 +106,7 @@ add_library(GeosCore STATIC
 
 	# TODO: when to omit these?
 	# exchange_mod.F
-	# rrtmg_rad_transfer_mod.F
+	$<$<STREQUAL:${MECH},RRTMG>:rrtmg_rad_transfer_mod.F>
 	# tomas_mod.F
 )
 target_link_libraries(GeosCore

diff --git a/KPP/CMakeLists.txt b/KPP/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Add the correct subdirectory based on ${MECH}
-if("${MECH}" STREQUAL "Standard" OR "${MECH}" STREQUAL "benchmark")
+if("${MECH}" STREQUAL "Standard")
     add_subdirectory(Standard)    
+elseif("${MECH}" STREQUAL "benchmark")
+    add_subdirectory(Standard)
+elseif("${MECH}" STREQUAL "RRTMG")
+    add_subdirectory(Tropchem)
 elseif("${MECH}" STREQUAL "Tropchem")
     add_subdirectory(Tropchem)
 else()