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.

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

Sync develop and main #39

Merged
merged 8 commits into from
Aug 1, 2023
Merged

Sync develop and main #39

merged 8 commits into from
Aug 1, 2023

Commits on Jun 5, 2023

  1. Merge pull request #32 from GEOS-ESM/main

    Merge request "main-to-develop"
    amolod authored Jun 5, 2023
    Configuration menu
    Copy the full SHA
    2e5d816 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Update CI to use Baselibs 7.13.0

    This PR updates the CI to point to Baselibs 7.13.0 which is the version used by GEOSgcm on `main`
    
    It also adds small runs of GEOSgcm uncoupled and coupled-MOM6 to the CI
    mathomp4 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    085976b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #34 from GEOS-ESM/feature/mathomp4/update-ci-to-7.…

    …13-ocean
    
    Update CI to use Baselibs 7.13.0, add runs to CI
    mathomp4 authored Jun 8, 2023
    Configuration menu
    Copy the full SHA
    8842652 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. HFREEZE option added for 1/3 degree resolution (540x458), which is ne…

    …eded by sea ice model.
    Yury Vikhliaev committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    6f6e9f2 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Update CircleCI to use Orb Default Baselibs and BCs

    This PR updates the CircleCI config to default to using the Baselibs in
    the CircleCI orb rather than explicitly specifying the versions. In most
    cases, this is the "best" way as a change to the orb can fix this for
    projects without the need for a PR.
    
    Note that we keep commented the explicit anchors in case needed.
    mathomp4 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    4dfae67 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #37 from GEOS-ESM/feature/mathomp4/update-ci-orb-b…

    …aselibs-ocean
    
    Update CircleCI to use Orb Default Baselibs and BCs
    mathomp4 authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    9e0ef21 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Configuration menu
    Copy the full SHA
    13819ad View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e83cfd2 View commit details
    Browse the repository at this point in the history