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 GEOSradiation_GridComp v1.10.0 #852

Merged
merged 4 commits into from
Dec 5, 2024
Merged

Update to GEOSradiation_GridComp v1.10.0 #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a6c442
Update to GEOSradiation_GridComp v1.10.0
mathomp4 Nov 27, 2024
35686e6
Update CI; add ifx
mathomp4 Dec 2, 2024
7155df5
Try coupled ifx
mathomp4 Dec 2, 2024
f1f2568
Merge branch 'main' into feature/mathomp4/rad-v1.10.0
sdrabenh Dec 4, 2024
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
33 changes: 26 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ workflows:
- docker-hub-creds
matrix:
parameters:
compiler: [ifort, gfortran]
compiler: [gfortran, ifort, ifx]
baselibs_version: *baselibs_version
repo: GEOSgcm
persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
Expand All @@ -44,12 +44,12 @@ workflows:
- docker-hub-creds
matrix:
parameters:
compiler: [gfortran, ifort]
baselibs_version: *baselibs_version
bcs_version: *bcs_version
compiler: [gfortran, ifort, ifx]
requires:
- build-GEOSgcm-on-<< matrix.compiler >>
repo: GEOSgcm
baselibs_version: *baselibs_version
bcs_version: *bcs_version

# Run Coupled GCM (1 hour, no ExtData)
- ci/run_gcm:
Expand All @@ -58,12 +58,12 @@ workflows:
- docker-hub-creds
matrix:
parameters:
compiler: [gfortran, ifort]
baselibs_version: *baselibs_version
bcs_version: *bcs_version
compiler: [gfortran, ifort, ifx]
requires:
- build-GEOSgcm-on-<< matrix.compiler >>
repo: GEOSgcm
baselibs_version: *baselibs_version
bcs_version: *bcs_version
gcm_ocean_type: MOM6
change_layout: false

Expand All @@ -90,6 +90,25 @@ workflows:
image_name: geos-env-bcs
tag_build_arg_name: *tag_build_arg_name
resource_class: xlarge
- ci/publish_docker:
filters:
tags:
only: /^v.*$/
name: publish-ifx-docker-image
context:
- docker-hub-creds
- ghcr-creds
os_version: *os_version
baselibs_version: *baselibs_version
bcs_version: *bcs_version
container_name: geosgcm
mpi_name: intelmpi
mpi_version: "2021.14"
compiler_name: ifx
compiler_version: "2025.0"
image_name: geos-env-bcs
tag_build_arg_name: *tag_build_arg_name
resource_class: xlarge
- ci/publish_docker:
filters:
tags:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0) |
| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.5](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.5) |
| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.6.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.2) |
| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.9.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.9.0) |
| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.10.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.10.0) |
| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.1) |
| [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) |
| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.9](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.9) |
Expand Down
2 changes: 1 addition & 1 deletion components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ sis2:
GEOSradiation_GridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp
remote: ../GEOSradiation_GridComp.git
tag: v1.9.0
tag: v1.10.0
develop: develop

RRTMGP:
Expand Down
Loading