Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Now use short submodule names in .gitmodules #394

Merged
merged 2 commits into from
Mar 18, 2024

Conversation

yantosca
Copy link
Contributor

@yantosca yantosca commented Mar 18, 2024

Name and Institution (Required)

Name: Bob Yantosca
Institution: Harvard + GCST

Confirm you have reviewed the following documentation

Describe the update

This is a minor update that fixes some incorrect submodule names in the .gitmodules file. We have changed:

[submodule "src/MAPL"]
[submodule "src/GMAO_Shared"]
[submodule "ESMA_cmake"]
[submodule "src/gFTL-shared"]
[submodule "src/FMS"]
[submodule "src/GCHP_GridComp/FVdycoreCubed_GridComp"]
[submodule "src/GCHP_GridComp/GEOSChem_GridComp/geos-chem"]
[submodule "src/GCHP_GridComp/HEMCO_GridComp/HEMCO"]
[submodule "src/yaFyaml"]
[submodule "src/pFlogger"]
[submodule "docs/geos-chem-shared-docs"]
[submodule "src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J"]

to

[submodule "MAPL"]
[submodule "GMAO_Shared"]
[submodule "ESMA_cmake"]
[submodule "gFTL-shared"]
[submodule "FMS"]
[submodule "FVdycoreCubed_GridComp"]
[submodule "geos-chem"]
[submodule "HEMCO"]
[submodule "yaFyaml"]
[submodule "pFlogger"]
[submodule "geos-chem-shared-docs"]
[submodule "Cloud-J"]

This "future-proofs" the submodule names in case a submodule is moved to a different path.

Expected changes

This is a zero-diff update,

Related Github Issue(s)

NOTE: This PR should be merged immediately after:

.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>
@yantosca yantosca added category: Bug Something isn't working no-diff-to-benchmark This update will not change the results of fullchem benchmark simulations labels Mar 18, 2024
@yantosca yantosca requested a review from lizziel March 18, 2024 15:24
@yantosca yantosca self-assigned this Mar 18, 2024
@yantosca yantosca changed the base branch from main to dev/no-diff-to-benchmark March 18, 2024 15:24
.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>
@yantosca yantosca added bugfix and removed category: Bug Something isn't working labels Mar 18, 2024
@yantosca yantosca changed the title Bug fix: Make sure geos-chem-shared-docs and Cloud-J submodule names are consistent with their path declarations in .gitmodules Bug fix: Now use short submodule names in .gitmodules Mar 18, 2024
@yantosca yantosca added this to the 14.3.1 milestone Mar 18, 2024
@yantosca yantosca changed the title Bug fix: Now use short submodule names in .gitmodules Now use short submodule names in .gitmodules Mar 18, 2024
@yantosca yantosca merged commit cbba841 into dev/no-diff-to-benchmark Mar 18, 2024
1 check passed
@yantosca yantosca deleted the bugfix/gitmodules branch March 18, 2024 19:41
yantosca added a commit that referenced this pull request Mar 18, 2024
This merge brings PR #396 (Add GCHP_WRAPPER cpp definition, by @lizziel)
into the GEOS-Chem "no-diff-to-benchmark" development stream.

This fixes an compiliation issue in Cloud-J, which occurred because the
GCHP_WRAPPPER C-preprocessor setting was not defined in CMakeLists.txt.
Thus we need to merge this PR before Cloud-J PR #10 and GCHP PR #394.

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-diff-to-benchmark This update will not change the results of fullchem benchmark simulations
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants