Merge pull request #2 from GEOS-ESM/feature/2G

GOCART2G

.gitignore

@@ -7,3 +7,7 @@
 /ESMF/Shared/GMAO_Shared@/
 /ESMF/Shared/NCEP_Shared@/
 /ESMF/HEMCO_GridComp@/
+/install/
+tags
+
+.DS_STORE

CMakeLists.txt

@@ -27,10 +27,12 @@ set (DOING_GEOS5 YES)
 set (ACG_FLAGS -v)
 set (FV_PRECISION R4R8)
 
-list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake@")
-include (esma)
+if (NOT COMMAND esma)
+    list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake@")
+    include (esma)
+endif()
 
-ecbuild_declare_project()
+    ecbuild_declare_project()
 
 # This is a KLUDGE to emulate paths used in GEOSgcm so that GOCART Legacy code generation works
 file (MAKE_DIRECTORY ${esma_include}/GEOSchem_GridComp)
@@ -43,3 +45,6 @@ include_directories(${MPI_Fortran_INCLUDE_PATH})
 
 # Recursively build source tree
 add_subdirectory (ESMF)
+add_subdirectory (Process_Library)
+
+ecbuild_install_project (NAME GOCART)

ESMF/Aerosol_GridComp/AeroCinderella_GridComp/CMakeLists.txt

@@ -9,7 +9,7 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/AeroCinderella_GridComp.F90)
     esma_add_library (${this}
             SRCS AeroCinderella_GridComp.F90
             SUBCOMPONENTS ${alldirs}
-            DEPENDENCIES MAPL GEOS_Shared Chem_Shared
+            DEPENDENCIES MAPL GEOS_Shared
             INCLUDES ${INC_ESMF})
 
     mapl_acg (${this} AeroCinderella_StateSpecs.rc

ESMF/Aerosol_GridComp/AeroCinderella_GridComp/Cinderella/CMakeLists.txt

@@ -4,14 +4,14 @@ set (srcs
         LinearFields.F90
         ConvertUnits_private.F90
         ConvertUnits.F90
-        ChemTracers_private.F90
-        ChemTracers.F90
+        NOAA_TracerMap.F90
+        NOAA_GOCARTtracers.F90
         MissingFields.F90
         )
 
 esma_add_library(${this}
         SRCS ${srcs}
-        DEPENDENCIES MAPL)
+        DEPENDENCIES MAPL GEOS_Shared)
 
 target_include_directories (${this} PUBLIC ${INC_ESMF} ${INC_NETCDF})