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
mathomp4 committed Aug 22, 2023
2 parents bc6b623 + 373b4d5 commit 821e17f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@
| [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.0.2](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.0.2) |
| [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.31.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.31.0) |
| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.31.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.31.1) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.19.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.19.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.5.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.5.0) |
| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.6.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.6.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) |
| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.1.1](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.1) |
| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.1.2](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.2) |
| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.0.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.2) |
| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.12.2](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.12.2) |
| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.2.1](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.1) |
| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.1.4](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.1.4) |
| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.4.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.4.0) |
| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.5.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.5.0) |
| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.4.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.4.1) |
| [GMI](https://github.com/GEOS-ESM/GMI) | [v1.0.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.0.0) |
| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.1](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.1) |
| [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.1.2.7](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.1.2.7) |
| [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.0.2](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.0.2) |
| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.40.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.40.0) |
| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.40.3](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.40.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.0](https://github.com/GEOS-ESM/MOM6/tree/geos/v2.2.0) |
| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v2.2.1](https://github.com/GEOS-ESM/MOM6/tree/geos/v2.2.1) |
| [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.2.1](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.2.1) |
| [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) |
| [RRTMGP](https://github.com/GEOS-ESM/rte-rrtmgp) | [geos/v1.6+1.1.0](https://github.com/GEOS-ESM/rte-rrtmgp/releases/tag/geos%2Fv1.6%2B1.1.0) |
Expand Down
8 changes: 4 additions & 4 deletions components.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
cmake:
local: ./@cmake
remote: ../ESMA_cmake.git
tag: v3.31.0
tag: v3.31.1
develop: develop

ecbuild:
Expand Down Expand Up @@ -121,7 +121,7 @@ StratChem:
GEOS_OceanGridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp
remote: ../GEOS_OceanGridComp.git
tag: v2.1.1
tag: v2.1.2
develop: develop

mom:
Expand All @@ -133,7 +133,7 @@ mom:
mom6:
local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6
remote: ../MOM6.git
tag: geos/v2.2.0
tag: geos/v2.2.1
develop: main
recurse_submodules: true

Expand Down Expand Up @@ -163,7 +163,7 @@ sis2:
GEOSradiation_GridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp
remote: ../GEOSradiation_GridComp.git
tag: v1.4.0
tag: v1.5.0
develop: develop

RRTMGP:
Expand Down

0 comments on commit 821e17f

Please sign in to comment.