Update C-preprocessor switches

Updates include:
- Remove unused GCHP and MODEL_GCHPCTM
- Move setting GCHP_WRAPPER and MAPL_ESMF from GCHP_GridComp to
  GEOSChem_GridCompn CMakeLists.txt
- Remove extraneous setting of GC_EXTERNAL_CONFIG
- Set new setting USE_ESMF to true
- Explicitly set EXTERNAL_GRID to true

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>

Author: lizziel

src/GCHP_GridComp/CMakeLists.txt

@@ -4,9 +4,6 @@
 # Set cmake logicals needed for subprojects
 #---------------
 set(FV_PRECISION           R8    ) # FV3 precision is R8
-set(GCHP_WRAPPER           TRUE  ) # GCHP model configuration
-set(GC_EXTERNAL_CONFIG     TRUE  ) # Not GEOS-Chem Classic
-set(MAPL_ESMF              TRUE  ) # HEMCO and GEOS-Chem will use MAPL/ESMF
 set(MAPL_ACG ${CMAKE_CURRENT_SOURCE_DIR}/../MAPL/Apps/mapl_acg.pl)
 
 #-------------------------------------------

src/GCHP_GridComp/GEOSChem_GridComp/CMakeLists.txt

@@ -7,9 +7,11 @@ set(HETP_EXTERNAL_CONFIG    TRUE) # Not HETP standalone test
 set(HEMCO_EXTERNAL_CONFIG   TRUE) # Not HEMCO standalone
 set(GTMM                    FALSE)
 set(MECH "fullchem" CACHE STRING "Name of the chemistry mechanism to use")
-set(GCHP                    TRUE)
+set(EXTERNAL_GRID           TRUE)
+set(GCHP_WRAPPER            TRUE)
 set(MODEL_GCHP              TRUE)
-set(MODEL_GCHPCTM           TRUE)
+set(MAPL_ESMF               TRUE)
+set(USE_ESMF                TRUE)
 
 # Cached variables
 set(USE_REAL8 ON CACHE BOOL
@@ -57,7 +59,7 @@ add_subdirectory(geos-chem EXCLUDE_FROM_ALL)
 
 # Configure build properties for GEOS-Chem
 target_compile_definitions(GEOSChemBuildProperties INTERFACE
-  ESMF_ EXTERNAL_GRID NC_HAS_COMPRESSION MODEL_GCHPCTM MODEL_GCHP
+  USE_ESMF EXTERNAL_GRID NC_HAS_COMPRESSION MODEL_GCHP
   $<$<BOOL:${USE_REAL8}>:USE_REAL8>
   $<$<BOOL:${RRTMG}>:RRTMG>
   $<$<BOOL:${ADJOINT}>:ADJOINT>