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

Auto PR - main → MAPL-v3 - Update to fvdycore 2.8.1 #718

Merged
merged 9 commits into from
Dec 10, 2023
Merged

Auto PR - main → MAPL-v3 - Update to fvdycore 2.8.1 #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
21885b2
Update to fvdycore 2.8.1
mathomp4 Dec 5, 2023
8462622
Update to Baselibs v7.17.0
mathomp4 Dec 5, 2023
622172b
Update to MAPL 2.42.2
mathomp4 Dec 5, 2023
96a38e9
Update to MAPL 2.42.3
mathomp4 Dec 6, 2023
4f43c29
Merge pull request #715 from GEOS-ESM/feature/mathomp4/update-fvdycor…
sdrabenh Dec 7, 2023
21335c5
Merge branch 'main' into feature/mathomp4/update-baselibs-7.17
sdrabenh Dec 7, 2023
ed8285f
Merge pull request #716 from GEOS-ESM/feature/mathomp4/update-baselib…
sdrabenh Dec 7, 2023
7b5e080
Merge branch 'main' into feature/mathomp4/update-mapl-2.42.2
sdrabenh Dec 7, 2023
6fdc61a
Merge pull request #717 from GEOS-ESM/feature/mathomp4/update-mapl-2.…
sdrabenh Dec 8, 2023
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 .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ parameters:

# Anchors to prevent forgetting to update a version
os_version: &os_version ubuntu20
baselibs_version: &baselibs_version v7.14.0
baselibs_version: &baselibs_version v7.17.0
bcs_version: &bcs_version v11.3.0
tag_build_arg_name: &tag_build_arg_name gcmversion

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
runs-on: ubuntu-latest
container:
image: gmao/ubuntu20-geos-env:v7.14.0-intelmpi_2021.6.0-intel_2022.1.0
image: gmao/ubuntu20-geos-env:v7.17.0-intelmpi_2021.6.0-intel_2022.1.0
# Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
# It seems like we might not need secrets on GitHub Actions which is good for forked
# pull requests
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
| [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc) | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1) |
| [ecbuild](https://github.com/GEOS-ESM/ecbuild) | [geos/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) |
| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.36.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.36.0) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.22.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.22.0) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.24.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.24.0) |
| [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.8](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.8) |
| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.9.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.9.0) |
| [geos-chem](https://github.com/GEOS-ESM/geos-chem) | [geos/v13.0.0-rc1](https://github.com/GEOS-ESM/geos-chem/releases/tag/geos%2Fv13.0.0-rc1) |
Expand All @@ -26,13 +26,13 @@
| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.2.8](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.8) |
| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.4.0](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.4.0) |
| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.5.1](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.5.1) |
| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.8.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.8.0) |
| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.8.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.8.1) |
| [GMI](https://github.com/GEOS-ESM/GMI) | [v1.1.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.1.0) |
| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.6](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.6) |
| [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.2.1](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.2.1) |
| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) |
| [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.1.1](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.1.1) |
| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.42.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.42.0) |
| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.42.3](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.42.3) |
| [MITgcm](https://github.com/GEOS-ESM/MITgcm) | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o) |
| [MOM5](https://github.com/GEOS-ESM/MOM5) | [geos/5.1.0+1.2.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B1.2.0) |
| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v2.2.3](https://github.com/GEOS-ESM/MOM6/tree/geos/v2.2.3) |
Expand Down
6 changes: 3 additions & 3 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GEOSgcm:
env:
local: ./@env
remote: ../ESMA_env.git
tag: v4.22.0
tag: v4.24.0
develop: main

cmake:
Expand Down Expand Up @@ -42,7 +42,7 @@ GEOS_Util:
MAPL:
local: ./src/Shared/@MAPL
remote: ../MAPL.git
tag: v2.42.0
tag: v2.42.3
develop: develop

FMS:
Expand All @@ -67,7 +67,7 @@ FVdycoreCubed_GridComp:
fvdycore:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore
remote: ../GFDL_atmos_cubed_sphere.git
tag: geos/v2.8.0
tag: geos/v2.8.1
develop: geos/develop

GEOSchem_GridComp:
Expand Down