From 4f3b24a200a5dc83d1f3d740047c7a6de241d296 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 18 Mar 2026 07:58:19 -0400 Subject: [PATCH 1/3] v12: Updates for GOCART2G_ExtData repo --- .gitignore | 3 +++ CHANGELOG.md | 3 +++ CMakeLists.txt | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ec766ae..5408211 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ GEOSCHEMchem_GridComp/geos-chem@ /@GOCART/ /GOCART/ /GOCART@/ +/@GOCART2G_ExtData/ +/GOCART2G_ExtData/ +/GOCART2G_ExtData@/ /@QuickChem/ /QuickChem/ /QuickChem@/ diff --git a/CHANGELOG.md b/CHANGELOG.md index bee63cb..82e97d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added + +- Added CMake for new `GOCART2G_ExtData` subrepo + ### Removed ### Changed ### Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index 17c88ed..9faba81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,7 @@ set (alldirs DNA_GridComp HEMCO_GridComp RRG + GOCART2G_ExtData ) set (srcs @@ -16,7 +17,7 @@ set (srcs GEOS_ChemEnvGridComp.F90 ) -# Note: GOCART_GridComp is added specifically as it is not longer +# Note: GOCART_GridComp is added specifically as it is no longer # automatically a dependence through alldirs esma_add_library (${this} SRCS ${srcs} From c15a0046f1c163b898025b0b1f516e9960be7877 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 18 Mar 2026 09:29:10 -0400 Subject: [PATCH 2/3] Do CMake the right way --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9faba81..311e4fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ esma_set_this () -esma_add_subdirectories(Shared GOCART TR GMI StratChem MAM MATRIX CARMA GAAS ACHEM) +esma_add_subdirectories(Shared GOCART TR GMI StratChem MAM MATRIX CARMA GAAS ACHEM GOCART2G_ExtData) set (alldirs GEOSpchem_GridComp @@ -9,7 +9,6 @@ set (alldirs DNA_GridComp HEMCO_GridComp RRG - GOCART2G_ExtData ) set (srcs From 26b88010e6f0231385a8d4299575c5e227fa717e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 15 Apr 2026 11:04:39 -0400 Subject: [PATCH 3/3] Fix up CMake and ignore --- .gitignore | 6 +++--- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5408211..f8538f6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,9 @@ GEOSCHEMchem_GridComp/geos-chem@ /@GOCART/ /GOCART/ /GOCART@/ -/@GOCART2G_ExtData/ -/GOCART2G_ExtData/ -/GOCART2G_ExtData@/ +/@Aerosol_ExtData/ +/Aerosol_ExtData/ +/Aerosol_ExtData@/ /@QuickChem/ /QuickChem/ /QuickChem@/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 311e4fd..6173a7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ esma_set_this () -esma_add_subdirectories(Shared GOCART TR GMI StratChem MAM MATRIX CARMA GAAS ACHEM GOCART2G_ExtData) +esma_add_subdirectories(Shared GOCART TR GMI StratChem MAM MATRIX CARMA GAAS ACHEM Aerosol_ExtData) set (alldirs GEOSpchem_GridComp