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

Jump to bottom

Sync develop and main #39

Merged
merged 8 commits into from
Aug 1, 2023
Merged

Sync develop and main #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e5d816
Merge pull request #32 from GEOS-ESM/main
amolod Jun 5, 2023
085976b
Update CI to use Baselibs 7.13.0
mathomp4 Jun 8, 2023
8842652
Merge pull request #34 from GEOS-ESM/feature/mathomp4/update-ci-to-7.…
mathomp4 Jun 8, 2023
6f6e9f2
HFREEZE option added for 1/3 degree resolution (540x458), which is ne…
Jul 12, 2023
4dfae67
Update CircleCI to use Orb Default Baselibs and BCs
mathomp4 Jul 31, 2023
9e0ef21
Merge pull request #37 from GEOS-ESM/feature/mathomp4/update-ci-orb-b…
mathomp4 Jul 31, 2023
13819ad
Merge branch 'develop' into yv/hotfix/hfreeze-fix
sanAkel Aug 1, 2023
e83cfd2
Merge pull request #36 from GEOS-ESM/yv/hotfix/hfreeze-fix
sanAkel Aug 1, 2023
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
38 changes: 34 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2.1

# Anchors to prevent forgetting to update a version
baselibs_version: &baselibs_version v7.7.0
bcs_version: &bcs_version v10.23.0
#baselibs_version: &baselibs_version v7.14.0
#bcs_version: &bcs_version v11.1.0

orbs:
ci: geos-esm/circleci-tools@1
Expand All @@ -18,8 +18,38 @@ workflows:
matrix:
parameters:
compiler: [gfortran, ifort]
baselibs_version: *baselibs_version
#baselibs_version: *baselibs_version
repo: GEOSgcm
checkout_fixture: true
mepodevelop: true
persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra

# Run AMIP GCM (1 hour, no ExtData)
- ci/run_gcm:
name: run-GCM-on-<< matrix.compiler >>
context:
- docker-hub-creds
matrix:
parameters:
compiler: [gfortran, ifort]
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:
name: run-coupled-GCM-on-<< matrix.compiler >>
context:
- docker-hub-creds
matrix:
parameters:
compiler: [gfortran, ifort]
requires:
- build-GEOSgcm-on-<< matrix.compiler >>
repo: GEOSgcm
#baselibs_version: *baselibs_version
#bcs_version: *bcs_version
gcm_ocean_type: MOM6
change_layout: false
2 changes: 2 additions & 0 deletions MOM6_GEOSPlug/mom6_app/540x458/MOM_override
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ TOPO_FILE = "ocean_topog.nc"
!#override NIPROC = 4
!#override NJPROC = 4
#override LAYOUT = 45,2

HFREEZE = 10.0
Loading