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

NUOPC/CMEPS cap updates #670

Merged
merged 90 commits into from
Dec 8, 2021
Merged

NUOPC/CMEPS cap updates #670

merged 90 commits into from
Dec 8, 2021

Commits on Apr 23, 2020

  1. updated orbital calculations needed for cesm

    Mariana Vertenstein committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    183218a View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2020

  1. fixed problems in updated orbital calculations needed for cesm

    Mariana Vertenstein committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    10e7c20 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2020

  1. update CICE6 to support coupling with UFS

    @apcraig
    apcraig committed May 10, 2020
    Configuration menu
    Copy the full SHA
    ce8e5a9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from apcraig/ufs01 

    Update CICE for coupling with UFS
    @dabail10
    dabail10 authored May 10, 2020
    Configuration menu
    Copy the full SHA
    8f0b5ee View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. Merge pull request #1 from ESCOMP/nuopc

    @DeniseWorthen
    DeniseWorthen authored May 12, 2020
    Configuration menu
    Copy the full SHA
    7ac0e3d View commit details
    Browse the repository at this point in the history

Commits on May 19, 2020

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed May 19, 2020
    Configuration menu
    Copy the full SHA
    80c9e6e View commit details
    Browse the repository at this point in the history

Commits on May 25, 2020

  1. put in changes so that both ufsatm and cesm requirements for potentia… 

    …l temperature and density are satisfied
    Mariana Vertenstein committed May 25, 2020
    Configuration menu
    Copy the full SHA
    53715ea View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Merge pull request #3 from mvertens/mvertens/nuopc 

    changes to satisfy ufsatm and cesm requirements for pot temp and density from atm
    @dabail10
    dabail10 authored May 26, 2020
    Configuration menu
    Copy the full SHA
    7e43703 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2020

  1. Merge remote-tracking branch 'upstream/nuopc' into HEAD

    @DeniseWorthen
    DeniseWorthen committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    f41f1e9 View commit details
    Browse the repository at this point in the history

  2. update icepack submodule

    @DeniseWorthen
    DeniseWorthen committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    e70d1ab View commit details
    Browse the repository at this point in the history

  3. Revert "update icepack submodule" 

    This reverts commit e70d1ab.
    @DeniseWorthen
    DeniseWorthen committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    308a1d4 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2020

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    7848fdf View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2020

  1. Merge remote-tracking branch 'upstream/nuopc' into HEAD

    @DeniseWorthen
    DeniseWorthen committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    6982ee4 View commit details
    Browse the repository at this point in the history

  2. update comp_ice.backend with temporary ice_timers fix

    @DeniseWorthen
    DeniseWorthen committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    089f60f View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    6affdcf View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2020

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    b5a6058 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc

    @dabail10
    dabail10 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    415df0e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    b4da8a6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc

    @dabail10
    dabail10 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    239c7de View commit details
    Browse the repository at this point in the history

  5. Fix threading problem in init_bgc

    @dabail10
    dabail10 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    ad03424 View commit details
    Browse the repository at this point in the history

  6. Fix additional OMP problems

    @dabail10
    dabail10 committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    73e7774 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. changes for coldstart running

    @DeniseWorthen
    DeniseWorthen committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    46fcfba View commit details
    Browse the repository at this point in the history

  2. Move the forapps directory

    @dabail10
    dabail10 committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    c762336 View commit details
    Browse the repository at this point in the history

  3. remove cesmcoupled ifdefs

    @DeniseWorthen
    DeniseWorthen committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    6bccf71 View commit details
    Browse the repository at this point in the history

  4. Fix logging issues for NUOPC

    @dabail10
    dabail10 committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    902e883 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc

    @dabail10
    dabail10 committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    178693a View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2020

  1. removal of many cpp-ifdefs

    Mariana Vertenstein committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    b4afd2e View commit details
    Browse the repository at this point in the history

  2. fix compile errors

    @DeniseWorthen
    DeniseWorthen committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    3a1b88b View commit details
    Browse the repository at this point in the history

  3. fixes to get cesm working

    Mariana Vertenstein committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    41855fd View commit details
    Browse the repository at this point in the history

  4. update to latest nuopc changes

    Mariana Vertenstein committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    aea1aa8 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2020

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    e4c989c View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2020

  1. fixed white space issue

    Mariana Vertenstein committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    30a81cc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from mvertens/nuopc 

    cleanup changes to nuopc branch
    @dabail10
    dabail10 authored Jul 7, 2020
    Configuration menu
    Copy the full SHA
    8ebdda9 View commit details
    Browse the repository at this point in the history

  3. Add restart_coszen namelist option

    @dabail10
    dabail10 committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    27dd3b7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'nuopc' into coszen

    @dabail10
    dabail10 authored Jul 7, 2020
    Configuration menu
    Copy the full SHA
    6b4a277 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #5 from ESCOMP/coszen 

    Add restart_coszen namelist option
    @dabail10
    dabail10 authored Jul 7, 2020
    Configuration menu
    Copy the full SHA
    93f0e86 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    7211bc1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc

    @dabail10
    dabail10 committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    148ab08 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. Update NUOPC cap to work with latest CICE6 master

    @dabail10
    dabail10 committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    aa9ef50 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    793e7ce View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. nuopc,cmeps or s2s build updates

    @DeniseWorthen
    DeniseWorthen committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    7fc1c30 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2020

  1. fixes for dbug_flag

    @DeniseWorthen
    DeniseWorthen committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    1802396 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2020

  1. Merge pull request #6 from DeniseWorthen/escomp/nuopc 

    emc nuopc cap changes
    @dabail10
    dabail10 authored Aug 10, 2020
    Configuration menu
    Copy the full SHA
    964c860 View commit details
    Browse the repository at this point in the history

  2. Update nuopc2 to latest CICE master

    @dabail10
    dabail10 committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    1cf95cf View commit details
    Browse the repository at this point in the history

  3. Merge latest CICE master

    @dabail10
    dabail10 committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    adbff47 View commit details
    Browse the repository at this point in the history

  4. Fix some merge problems

    @dabail10
    dabail10 committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    b52362e View commit details
    Browse the repository at this point in the history

  5. Fix dbug variable

    @dabail10
    dabail10 committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    f106591 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2020

  1. Manual merge of UFS changes

    @dabail10
    dabail10 committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    64c5569 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from ESCOMP/nuopc2 

    Update to latest CICE master
    @dabail10
    dabail10 authored Aug 12, 2020
    Configuration menu
    Copy the full SHA
    f6040e1 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc

    @dabail10
    dabail10 committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    5a0c13d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    3e4d1e7 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2020

  1. fixes to get CESM B1850 compset working

    Mariana Vertenstein committed Oct 4, 2020
    Configuration menu
    Copy the full SHA
    c360dc2 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. refactored ice_prescribed_mod.F90 to work with cdeps rather than the … 

    …mct data models
    Mariana Vertenstein committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    1a32f3e View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2021

  1. Fix use_restart_time

    @dabail10
    dabail10 committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    e48dd38 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2021

  1. changes for creating masks at runtime

    Mariana Vertenstein committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    f59b5c3 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2021

  1. added ice_mesh_mod

    Mariana Vertenstein committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    66356cb View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2021

  1. implemented area correction factors as option

    Mariana Vertenstein committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    6ff987c View commit details
    Browse the repository at this point in the history

  2. more cleanup

    Mariana Vertenstein committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    0f90ce1 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2021

  1. Fix dragio

    @dabail10
    dabail10 committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    d78c3a3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from ESCOMP/mvertens/nuopc_updates 

    introduction of mask file for generating mask when appropriate
    @dabail10
    dabail10 authored Mar 22, 2021
    Configuration menu
    Copy the full SHA
    1139e7f View commit details
    Browse the repository at this point in the history

  3. Fix mushy bug

    @dabail10
    dabail10 committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    68132e7 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. updates to nuopc cap to resolve inconsistency between driver inputs a… 

    …nd cice namelists
    Mariana Vertenstein committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    ff3783a View commit details
    Browse the repository at this point in the history

  2. changed error message

    Mariana Vertenstein committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    718a75d View commit details
    Browse the repository at this point in the history

  3. added icepack_warnings_flush

    Mariana Vertenstein committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    3ee6fe2 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2021

  1. updates to get ice categories working

    Mariana Vertenstein committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    3bdc07b View commit details
    Browse the repository at this point in the history

Commits on May 4, 2021

  1. updates to have F compset almost working with cice6 - still problems … 

    …in polar regions - need to resolve 253K/cice6 versus 273K/cice5 differences
    Mariana Vertenstein committed May 4, 2021
    Configuration menu
    Copy the full SHA
    508e9b9 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2021

  1. changed tolerance of mesh/grid comparison

    Mariana Vertenstein committed May 6, 2021
    Configuration menu
    Copy the full SHA
    a2ddbd9 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2021

  1. added issues raised in PR

    Mariana Vertenstein committed May 10, 2021
    Configuration menu
    Copy the full SHA
    56e1a83 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2021

  1. Merge pull request #9 from ESCOMP/nuopc_updates 

    changes that enable cice6 to run as an external cesm component
    @dabail10
    dabail10 authored Jun 2, 2021
    Configuration menu
    Copy the full SHA
    8b5ac3a View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    82d5d51 View commit details
    Browse the repository at this point in the history

  2. Merge CICE Consortium main to nuopc

    @dabail10
    dabail10 committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    6faa645 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2021

  1. Update to latest Consortium main

    @dabail10
    dabail10 committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    f6f2e33 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2021

  1. Update CESM-CICE sync with new time manager

    @dabail10
    dabail10 committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    a026050 View commit details
    Browse the repository at this point in the history

  2. Add back in latlongrid

    @dabail10
    dabail10 committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    380045b View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2021

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    874274a View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    a41a9dd View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2021

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Aug 4, 2021
    Configuration menu
    Copy the full SHA
    5ed5734 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2021

  1. Merge branch 'master' of https://github.com/CICE-Consortium/CICE into… 

    … nuopc
    @dabail10
    dabail10 committed Sep 2, 2021
    Configuration menu
    Copy the full SHA
    35e47f0 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2021

  1. Merge branch 'main' of https://github.com/CICE-Consortium/CICE into n… 

    …uopc
    @dabail10
    dabail10 committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    72e7ad3 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2021

  1. Add new advanced snow physics to driver

    @dabail10
    dabail10 committed Oct 19, 2021
    Configuration menu
    Copy the full SHA
    c896dc6 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2021

  1. Fix restart issue with land blocks

    @dabail10
    dabail10 committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    9fbb188 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2021

  1. Update mesh check in cap

    @dabail10
    dabail10 committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    cbefb7a View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2021

  1. fix scam problems

    Mariana Vertenstein committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    ecbd0a2 View commit details
    Browse the repository at this point in the history

  2. Merge tag 'cice6_20211028' into feature/fix_scam

    Mariana Vertenstein committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    cf5f6d9 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2021

  1. reintroduced imesh_eps check

    Mariana Vertenstein committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    364961c View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2021

  1. Update CICE_InitMod.F90

    @dabail10
    dabail10 committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    79ccb3d View commit details
    Browse the repository at this point in the history

  2. Put dragio in the namelist instead

    @dabail10
    dabail10 committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    545906e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/fix_scam' of https://github.com/mvertens/CICE i… 

    …nto nuopc
    @dabail10
    dabail10 committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    5296481 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2021

  1. Remove redundant code

    @dabail10
    dabail10 committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    6db265a View commit details
    Browse the repository at this point in the history

  2. Fix some indents

    @dabail10
    dabail10 committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    5e6a27c View commit details
    Browse the repository at this point in the history