Implementation of TOMAS in GCHP

CHANGELOG.md

@@ -8,6 +8,9 @@ This file documents all notable changes to the GCHP wrapper repository since ver
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased 14.1.0]
+### Added
+- Added capability for TOMAS simulations in GCHP
+
 ### Changed
 - Updated GEOS-Chem submodule to 14.1.0
 - Updated HEMCO submodule to 3.6.0

src/GCHP_GridComp/GEOSChem_GridComp/CMakeLists.txt

@@ -7,14 +7,16 @@ set(USE_REAL8 ON CACHE BOOL
 set(RRTMG OFF CACHE BOOL
   "Switch to build RRTMG as a component of GEOS-Chem"
 )
+set(TOMAS OFF CACHE BOOL
+  "Switch to build TOMAS as a component of GEOS-Chem"
+)
 set(LUO_WETDEP OFF CACHE BOOL
   "Switch to build the Luo et al (2020) wetdep scheme into GEOS-Chem"
 )
 
 # Local variables
 set(GC_EXTERNAL_CONFIG      TRUE)
 set(GTMM                    FALSE)
-set(TOMAS                   FALSE)
 set(MECH                    "fullchem") # for now, we only support "fullchem"
 set(GCHP                    TRUE)
 set(MODEL_GCHP              TRUE)
@@ -27,6 +29,9 @@ target_compile_definitions(GEOSChemBuildProperties INTERFACE
   $<$<BOOL:${USE_REAL8}>:USE_REAL8> $<$<BOOL:${RRTMG}>:RRTMG>
   $<$<BOOL:${ADJOINT}>:ADJOINT>
   $<$<BOOL:${REVERSE_OPERATORS}>:REVERSE_OPERATORS> 
+  $<$<BOOL:${TOMAS}>:TOMAS>
+  $<$<STREQUAL:${TOMAS_BINS},15>:TOMAS15>
+  $<$<STREQUAL:${TOMAS_BINS},40>:TOMAS40>
   $<$<BOOL:${LUO_WETDEP}>:LUO_WETDEP>
 )
 
@@ -125,6 +130,7 @@ set(MECH "fullchem")
 gc_pretty_print(VARIABLE OMP IS_BOOLEAN)
 gc_pretty_print(VARIABLE USE_REAL8 IS_BOOLEAN)
 gc_pretty_print(VARIABLE APM IS_BOOLEAN)
+gc_pretty_print(VARIABLE TOMAS IS_BOOLEAN)
 gc_pretty_print(VARIABLE RRTMG IS_BOOLEAN)
 gc_pretty_print(VARIABLE GTMM IS_BOOLEAN)
 gc_pretty_print(VARIABLE LUO_WETDEP IS_BOOLEAN)

src/GCHP_GridComp/HEMCO_GridComp/CMakeLists.txt

@@ -5,5 +5,8 @@ add_subdirectory(HEMCO EXCLUDE_FROM_ALL)
 target_compile_definitions(HEMCOBuildProperties INTERFACE 
     $<$<BOOL:${ADJOINT}>:ADJOINT>
     $<$<BOOL:${REVERSE_OPERATORS}>:REVERSE_OPERATORS> 
+    $<$<BOOL:${TOMAS}>:TOMAS>
+    $<$<STREQUAL:${TOMAS_BINS},15>:TOMAS15>
+    $<$<STREQUAL:${TOMAS_BINS},40>:TOMAS40>
     ""
 )