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

Auto PR - develop → MAPL-v3 - add options for CICE4/CICE6; to be tested #496

Merged
merged 15 commits into from
Jul 27, 2023
Merged

Auto PR - develop → MAPL-v3 - add options for CICE4/CICE6; to be tested #496

merged 15 commits into from
Jul 27, 2023

Commits on May 26, 2023

  1. add options for CICE4/CICE6; to be tested

    @zhaobin74
    zhaobin74 committed May 26, 2023
    Configuration menu
    Copy the full SHA
    48173ae View commit details
    Browse the repository at this point in the history

  2. add processing cice6 history output in gcm_run.j

    @zhaobin74
    zhaobin74 committed May 26, 2023
    Configuration menu
    Copy the full SHA
    cb4d4c8 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. add CICE6 in sedfile

    @zhaobin74
    zhaobin74 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    5048498 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. completed gcm_run.j for CICE6 part

    @zhaobin74
    zhaobin74 committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    2ccbe9d View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. finished CICE6 bits in AGCM.rc.tmpl

    @zhaobin74
    zhaobin74 committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    8360c9b View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. merged with develop (v2.2.0) and resolved conflicts

    @zhaobin74
    zhaobin74 committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    d51cad6 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. remove 1 collection and some fields when CICE6 is running

    @zhaobin74
    zhaobin74 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    6303af7 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Merge branch 'develop' into feature/zhaobin74/cice6coupled

    @sdrabenh
    sdrabenh authored Jun 21, 2023
    Configuration menu
    Copy the full SHA
    a5ce4e9 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Update CI BCs to v11.1.0. Update other setup scripts

    @mathomp4
    mathomp4 committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    aa0a771 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Add new SCM cases

    @mathomp4
    mathomp4 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2a83bd6 View commit details
    Browse the repository at this point in the history

  2. Add dat files

    @mathomp4
    mathomp4 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    bdbc4ff View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Merge branch 'develop' into feature/zhaobin74/cice6coupled

    @sdrabenh
    sdrabenh authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    b9fdda4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #478 from GEOS-ESM/feature/zhaobin74/cice6coupled 

    Add CICE6 as a new option for sea ice model
    @sdrabenh
    sdrabenh authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    c187811 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/mathomp4/add-new-scm

    @sdrabenh
    sdrabenh authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    f6e1ced View commit details
    Browse the repository at this point in the history

  4. Merge pull request #494 from GEOS-ESM/feature/mathomp4/add-new-scm 

    Add new SCM cases
    @sdrabenh
    sdrabenh authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    be7a891 View commit details
    Browse the repository at this point in the history