Skip to content

Commit

Permalink
Merge branch 'main' into release/MAPL-v3
Browse files Browse the repository at this point in the history
# Conflicts:
#	components.yaml
  • Loading branch information
mathomp4 committed Jan 5, 2024
2 parents 8138e63 + fa89c76 commit 709efb9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ workflows:
bcs_version: *bcs_version
container_name: geosgcm
mpi_name: openmpi
mpi_version: 4.1.4
mpi_version: 5.0.0
compiler_name: gcc
compiler_version: 12.1.0
image_name: geos-env-bcs
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
| [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.3](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.42.3) |
| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.43.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.43.0) |
| [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

0 comments on commit 709efb9

Please sign in to comment.