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.

Sign up for GitHub

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

Jump to bottom

Auto PR - develop → MAPL-v3 - Move GEOSgcm_GridComp under Components in GEOSldas #766

Merged
merged 11 commits into from
Apr 11, 2024
Merged

Auto PR - develop → MAPL-v3 - Move GEOSgcm_GridComp under Components in GEOSldas #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
611bc96
Merge develop into BRIDGE in prep for release v18.0.2 (#761)
gmao-rreichle Apr 10, 2024
4f51324
updated components.yaml in prep for release v18.0.2
gmao-rreichle Apr 10, 2024
b5121b8
Merge BRIDGE into main in prep for release v18.0.2 (#762)
gmao-rreichle Apr 10, 2024
01fdc0f
Merge main into BRIDGE in prep for future release (#763)
gmao-rreichle Apr 10, 2024
99f8617
change components.yaml back to develop version
gmao-rreichle Apr 10, 2024
ed79dd1
Merge branch 'develop' into BRIDGE
gmao-rreichle Apr 10, 2024
39dbcad
merge BRIDGE into develop in prep for future release (#764)
gmao-rreichle Apr 11, 2024
208a45c
Move GEOSgcm_GridComp under Components in GEOSldas
mathomp4 Apr 11, 2024
2e1d12d
Update components.yaml
mathomp4 Apr 11, 2024
775da95
Update components.yaml
gmao-rreichle Apr 11, 2024
95b2b49
Move external GEOSgcm_GridComp repository under src/Components (#765)
gmao-rreichle Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ GEOSldas_GridComp:
develop: develop

GEOSgcm_GridComp:
local: ./src/Components/@GEOSldas_GridComp/@GEOSgcm_GridComp
local: ./src/Components/@GEOSgcm_GridComp
remote: ../GEOSgcm_GridComp.git
branch: develop
sparse: ./config/GEOSgcm_GridComp_ldas.sparse
Expand Down
3 changes: 3 additions & 0 deletions src/Components/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/@GEOSldas_GridComp
/GEOSldas_GridComp
/GEOSldas_GridComp@
/@GEOSgcm_GridComp
/GEOSgcm_GridComp
/GEOSgcm_GridComp@
1 change: 1 addition & 0 deletions src/Components/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
esma_add_subdirectory (GEOSldas_GridComp)
esma_add_subdirectory (GEOSgcm_GridComp)