Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cub…

…ed_sphere into feature/ccpp_data_thrd_cnt

CMakeLists.txt

@@ -34,6 +34,7 @@ option(GFS_TYPES   "Enable compiler definition -DGFS_TYPES"                OFF)
 option(use_WRTCOMP "Enable compiler definition -Duse_WRTCOMP"              OFF)
 option(INTERNAL_FILE_NML     "Enable compiler definition -DINTERNAL_FILE_NML"      ON)
 option(ENABLE_QUAD_PRECISION "Enable compiler definition -DENABLE_QUAD_PRECISION"  ON)
+option(HYDRO       "Enable compiler definition -DHYDRO"                    OFF)
 
 find_package(MPI REQUIRED)
 if(OPENMP)
@@ -115,11 +116,13 @@ list(APPEND driver_srcs
 list(APPEND fv3_srcs ${model_srcs}
                      ${tools_srcs})
 
-list(APPEND fv3_defs SPMD
-                     MOIST_CAPPA
-                     USE_COND)
+list(APPEND fv3_defs SPMD)
 
 # Additional (optional) compiler definitions
+if (NOT HYDRO)
+  list(APPEND fv3_defs USE_COND MOIST_CAPPA)
+endif()
+
 if(DEBUG)
   list(APPEND fv3_defs DEBUG)
 endif()