Skip to content

Commit

Permalink
Merge pull request #116 from GEOS-ESM/feature/mathomp4/update-compone…
Browse files Browse the repository at this point in the history
…nts-fv3-2024Sep25

Update components.yaml to match GEOSgcm main as of 2024-Sep-25
  • Loading branch information
mathomp4 authored Sep 26, 2024
2 parents 13a12a7 + 624dfca commit 8e9e70a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ parameters:
# Anchors to prevent forgetting to update a version
os_version: &os_version ubuntu20
baselibs_version: &baselibs_version v7.25.0
bcs_version: &bcs_version v11.5.0
bcs_version: &bcs_version v11.6.0
tag_build_arg_name: &tag_build_arg_name fv3version

orbs:
ci: geos-esm/circleci-tools@2
ci: geos-esm/circleci-tools@4

workflows:
build-test:
Expand Down Expand Up @@ -64,7 +64,7 @@ workflows:
filters:
tags:
only: /^v.*$/
name: publish-intel-docker-image
name: publish-ifort-docker-image
context:
- docker-hub-creds
- ghcr-creds
Expand All @@ -73,8 +73,8 @@ workflows:
container_name: geosfvdycore
mpi_name: intelmpi
mpi_version: "2021.13"
compiler_name: intel
compiler_version: "2024.2"
compiler_name: ifort
compiler_version: "2021.13"
image_name: geos-env
tag_build_arg_name: *tag_build_arg_name
resource_class: xlarge
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.17.0] - 2024-09-25

### Changed

- Update to `components.yaml` to match or exceed GEOSgcm `main` as of 2024-09-25
- ESMA_cmake v3.48.0 → v3.51.0
- FVdycoreCubed_GridComp v2.11.1 → v2.12.0
- Update CircleCI to use v4 orb

## [2.16.0] - 2024-08-12

### Changed
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)

project (
GEOSfvdycore
VERSION 2.16.0
VERSION 2.17.0
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
Expand Down
4 changes: 2 additions & 2 deletions components.yaml
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.48.0
tag: v3.51.0
develop: develop

ecbuild:
Expand Down Expand Up @@ -47,7 +47,7 @@ FMS:
FVdycoreCubed_GridComp:
local: ./src/Components/@FVdycoreCubed_GridComp
remote: ../FVdycoreCubed_GridComp.git
tag: v2.11.1
tag: v2.12.0
develop: develop

fvdycore:
Expand Down

0 comments on commit 8e9e70a

Please sign in to comment.