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

Update to MAPL 2.23.0, ESMA_env v4.2.0, ESMA_cmake v3.17.0 #428

Merged
merged 3 commits into from
Jul 8, 2022
Merged

Update to MAPL 2.23.0, ESMA_env v4.2.0, ESMA_cmake v3.17.0 #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de5d288
Update to MAPL 2.23.0
mathomp4 Jul 5, 2022
6f5d244
Move to develop as MAPL branch was merged
mathomp4 Jul 6, 2022
bb85624
Update components to use MAPL 2.23.0 tag
mathomp4 Jul 6, 2022
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
11 changes: 8 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
version: 2.1

# Anchors to prevent forgetting to update a version
baselibs_version: &baselibs_version v7.5.0
bcs_version: &bcs_version v10.22.3

orbs:
ci: geos-esm/circleci-tools@1

Expand All @@ -12,9 +16,8 @@ workflows:
- docker-hub-creds
matrix:
parameters:
compiler:
- gfortran
- ifort
compiler: [ifort, gfortran]
baselibs_version: *baselibs_version
repo: GEOSgcm
persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
##################################################
Expand All @@ -25,6 +28,8 @@ workflows:
# matrix: #
# parameters: #
# compiler: [gfortran, ifort] #
# baselibs_version: *baselibs_version #
# bcs_version: *bcs_version #
# requires: #
# - build-GEOSgcm-on-<< matrix.compiler >> #
# repo: GEOSgcm #
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-mkl:v6.2.13-openmpi_4.1.2-gcc_11.2.0
image: gmao/ubuntu20-geos-env-mkl:v7.5.0-openmpi_4.1.2-gcc_11.2.0
credentials:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
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 @@ -15,8 +15,8 @@
| [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.0.1](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.0.1) |
| [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.2.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.2.0) |
| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.16.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.16.0) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v3.13.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v3.13.0) |
| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.17.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.17.0) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.2.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.2.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) | [v1.8.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v1.8.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 @@ -28,7 +28,7 @@
| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.5.5](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.5.5) |
| [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.0.7](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.0.7) |
| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) |
| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.21.3](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.21.3) |
| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.23.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.23.0) |
| [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.0.3](https://github.com/GEOS-ESM/MOM6/releases/tag/geos%2Fv2.0.3) |
| [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.2.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.2.0) |
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,13 +5,13 @@ GEOSgcm:
env:
local: ./@env
remote: ../ESMA_env.git
tag: v3.13.0
tag: v4.2.0
develop: main

cmake:
local: ./@cmake
remote: ../ESMA_cmake.git
tag: v3.16.0
tag: v3.17.0
develop: develop

ecbuild:
Expand All @@ -36,7 +36,7 @@ GMAO_Shared:
MAPL:
local: ./src/Shared/@MAPL
remote: ../MAPL.git
tag: v2.21.3
tag: v2.23.0
develop: develop

FMS:
Expand Down