From 516ec68cd70b306c98f2a8839e98fc2dad8d0a25 Mon Sep 17 00:00:00 2001
From: Bob Yantosca <yantosca@seas.harvard.edu>
Date: Mon, 18 Mar 2024 11:15:42 -0400
Subject: [PATCH 1/2] Bug fix: Make submodule names consistent with declared
 paths

.gitmodules
- The geos-chem-shared-docs submodule should be named
  "docs/source/geos-chem-shared-docs" to be consistent with its path
- The Cloud-J submodule should be "src/GCHP_GridComp/Cloud_J", to be
  consistent with its path

CHANGELOG.md
- Updated accordingly

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
---
 .gitmodules  | 4 ++--
 CHANGELOG.md | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 68252c3bc..77cfc57c4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,9 +28,9 @@
 [submodule "src/pFlogger"]
 	path = src/pFlogger
 	url = https://github.com/geoschem/pFlogger.git
-[submodule "docs/geos-chem-shared-docs"]
+[submodule "docs/source/geos-chem-shared-docs"]
 	path = docs/source/geos-chem-shared-docs
 	url = https://github.com/geoschem/geos-chem-shared-docs.git
-[submodule "src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J"]
+[submodule "src/GCHP_GridComp/Cloud-J"]
 	path = src/GCHP_GridComp/Cloud-J
 	url = https://github.com/geoschem/Cloud-J
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3734b85a4..9dbef94b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Fixed
 - Fixed bug where SPHU used to construct PLE for advection was vertically inverted if using raw GMAO meteorology files
+- Fixed submodule names (`geos-chem-shared-docs`, `Cloud-J`) to be consistent with the declared `path` in .gitmodules`
 
 ## [14.3.0] - 2024-02-07
 ### Added

From 7896445ae6195ffd4dfea47d6e0c01eb6045a361 Mon Sep 17 00:00:00 2001
From: Bob Yantosca <yantosca@seas.harvard.edu>
Date: Mon, 18 Mar 2024 13:15:15 -0400
Subject: [PATCH 2/2] Now use short names for submodules in .gitmodules

.gitmodules
- Use short names (i.e. only the name of the module and not of the
  entire path) for submodules

CHANGELOG.md
- Updated accordingly

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
---
 .gitmodules  | 22 +++++++++++-----------
 CHANGELOG.md |  4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 77cfc57c4..035f2dc87 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,36 +1,36 @@
-[submodule "src/MAPL"]
+[submodule "MAPL"]
 	path = src/MAPL
 	url = https://github.com/geoschem/MAPL
-[submodule "src/GMAO_Shared"]
+[submodule "GMAO_Shared"]
 	path = src/GMAO_Shared
 	url = https://github.com/geoschem/GMAO_Shared
 [submodule "ESMA_cmake"]
 	path = ESMA_cmake
 	url = https://github.com/geoschem/ESMA_cmake
-[submodule "src/gFTL-shared"]
+[submodule "gFTL-shared"]
 	path = src/gFTL-shared
 	url = https://github.com/geoschem/gFTL-shared.git
-[submodule "src/FMS"]
+[submodule "FMS"]
 	path = src/FMS
 	url = https://github.com/geoschem/FMS.git
-[submodule "src/GCHP_GridComp/FVdycoreCubed_GridComp"]
+[submodule "FVdycoreCubed_GridComp"]
 	path = src/GCHP_GridComp/FVdycoreCubed_GridComp
 	url = https://github.com/geoschem/FVdycoreCubed_GridComp.git
-[submodule "src/GCHP_GridComp/GEOSChem_GridComp/geos-chem"]
+[submodule "geos-chem"]
 	path = src/GCHP_GridComp/GEOSChem_GridComp/geos-chem
 	url = https://github.com/geoschem/geos-chem.git
-[submodule "src/GCHP_GridComp/HEMCO_GridComp/HEMCO"]
+[submodule "HEMCO"]
 	path = src/GCHP_GridComp/HEMCO_GridComp/HEMCO
 	url = https://github.com/geoschem/HEMCO.git
-[submodule "src/yaFyaml"]
+[submodule "yaFyaml"]
 	path = src/yaFyaml
 	url = https://github.com/geoschem/yaFyaml.git
-[submodule "src/pFlogger"]
+[submodule "pFlogger"]
 	path = src/pFlogger
 	url = https://github.com/geoschem/pFlogger.git
-[submodule "docs/source/geos-chem-shared-docs"]
+[submodule "geos-chem-shared-docs"]
 	path = docs/source/geos-chem-shared-docs
 	url = https://github.com/geoschem/geos-chem-shared-docs.git
-[submodule "src/GCHP_GridComp/Cloud-J"]
+[submodule "Cloud-J"]
 	path = src/GCHP_GridComp/Cloud-J
 	url = https://github.com/geoschem/Cloud-J
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dbef94b8..74d9a57ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Added
 - Now print container name being read by ExtData when `CAP.EXTDATA` is set to `DEBUG` in `logging.yml`
 
+### Changed
+- Now use short names for submodules (i.e. without the path) in `.gitmodules`
+
 ### Fixed
 - Fixed bug where SPHU used to construct PLE for advection was vertically inverted if using raw GMAO meteorology files
-- Fixed submodule names (`geos-chem-shared-docs`, `Cloud-J`) to be consistent with the declared `path` in .gitmodules`
 
 ## [14.3.0] - 2024-02-07
 ### Added