Skip to content

Commit e800012

Browse files
authored
Merge branch 'develop' into feature/acollow/v11instanceRC
2 parents fdf1fe5 + 4f030fb commit e800012

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
# Anchors in case we need to override the defaults from the orb
4-
#baselibs_version: &baselibs_version v8.20.0
4+
#baselibs_version: &baselibs_version v8.24.0
55
#bcs_version: &bcs_version v11.6.0
66

77
orbs:

CHANGELOG.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
- Calculation of surface area density and effective radius for connection to chemistry
1515
now comes from optics tables
16-
- Changed effective radius in MieQuery.H to remove in place units scaling; made
16+
- Changed effective radius in MieQuery.H to remove in place units scaling; made
1717
corresponding change in Chem_SettlingSimple
1818
- Updated optics lookup tables to accommodate area and effective radius calculation
1919
- Check userRC in ESMF_GridCompRun in GOCART2G gridcomp
@@ -26,11 +26,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2626
- Modified filepaths for the optics files to no longer link to a personal nobackup directory
2727
- Added logic to ensure the alarm accounts for skipping heartbeat in `NI` and `SU` components
2828
- Update CI to use reusable workflows
29-
- Update `components.yaml` to match that of GEOSgcm main as of 2025-12-04
30-
- ESMA_env v4.35.0
31-
- ESMA_cmake v3.68.0
32-
- GMAO_Shared v2.1.4
33-
- MAPL v2.63.0
29+
- Update `components.yaml` to match that of GEOSgcm main as of 2026-01-15
30+
- ESMA_env v5.17.0
31+
- ESMA_cmake v3.69.0
32+
- GMAO_Shared v2.1.6
33+
- MAPL v2.64.1
3434
- fwet removed from children GridCompMod and placed in respective instance RC files
3535
- Updated settling routine and calls to allow settling velocity diagnostics in output field
3636
- Updated pressure lids in instance.rc files for use in GCMv12

components.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ GOCART:
55
env:
66
local: ./env@
77
remote: ../ESMA_env.git
8-
tag: v5.16.0
8+
tag: v5.17.0
99
develop: main
1010

1111
cmake:
1212
local: ./cmake@
1313
remote: ../ESMA_cmake.git
14-
tag: v3.68.0
14+
tag: v3.69.0
1515
develop: develop
1616

1717
ecbuild:
@@ -28,12 +28,12 @@ HEMCO:
2828
GMAO_Shared:
2929
local: ./ESMF/Shared/GMAO_Shared@
3030
remote: ../GMAO_Shared.git
31-
tag: v2.1.4
31+
tag: v2.1.6
3232
sparse: ./config/GMAO_Shared.sparse
3333
develop: main
3434

3535
MAPL:
3636
local: ./ESMF/Shared/MAPL@
3737
remote: ../MAPL.git
38-
tag: v2.63.0
38+
tag: v2.64.1
3939
develop: develop

0 commit comments

Comments
 (0)