Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ESMCI/cime
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: NorESMhub/cime
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: noresm
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 19 commits
  • 1 file changed
  • 6 contributors

Commits on Oct 16, 2023

  1. Merge remote-tracking branch 'esmci/master' into feature/update_to_esmci

    @mvertens
    mvertens committed Oct 16, 2023
    Copy the full SHA
    6b97472 View commit details

Commits on Oct 24, 2023

  1. Merge pull request #50 from mvertens/feature/update_to_esmci 

    update NorESMhub CIME to and ESMCI cime6.0.173

The only difference between NorESMhub CIME in this PR and and ESMCI cime6.0.173 is the addition of blom in
CIME/data/config/cesm/config_files.xml

Test suite: Ran SMS_D_Ld1.T62_tn14.NOINYOC.betzy_intel and verified that it was bfb.
Test baseline:
Test namelist changes:
Test status: bfb

User interface changes?: None

Update gh-pages html (Y/N)?: No
    @gold2718
    gold2718 authored Oct 24, 2023
    Copy the full SHA
    1364ee7 View commit details

Commits on Nov 8, 2023

  1. Merge tag 'cime6.0.184' into noresm 

    cime6.0.184
    @mvertens
    mvertens committed Nov 8, 2023
    Copy the full SHA
    4bb2cf3 View commit details

  2. Merge pull request #54 from mvertens/feature/update_to_cime6.0.184 

    update noresm to cime6.0.184
    @mvdebolskiy
    mvdebolskiy authored Nov 8, 2023
    Copy the full SHA
    cd2dc67 View commit details

Commits on Feb 19, 2024

  1. Merge tag 'cime6.0.218' into HEAD 

    cime6.0.218
    @mvertens
    mvertens committed Feb 19, 2024
    Copy the full SHA
    10753b8 View commit details

Commits on Mar 9, 2024

  1. Merge tag 'cime6.0.222' into feature/update_to_cime6.0.222 

    cime6.0.222
    @mvertens
    mvertens committed Mar 9, 2024
    Copy the full SHA
    b2bc6f5 View commit details

Commits on Apr 1, 2024

  1. Merge pull request #70 from mvertens/feature/update_to_cime6.0.222 

    update to cime6.0.222
    @mvertens
    mvertens authored Apr 1, 2024
    Copy the full SHA
    26ebfbd View commit details

  2. made the cime cprnc submodule use https rather than ssh

    @mvertens
    mvertens committed Apr 1, 2024
    Copy the full SHA
    efee4eb View commit details

  3. Merge pull request #73 from mvertens/feature/add_dglc_noresm 

    merge to cime6.0.232

This PR merges the NorESMHub cime fork to cime6.0.232 and is needed to have the new dglc component be able to be run out of system tests.

Test suite: Testing was done on derecho - see ESCOMP/CDEPS#268

Fixes: None

User interface changes?: None

Update gh-pages html (Y/N)?: N
    @gold2718
    gold2718 authored Apr 1, 2024
    Copy the full SHA
    31fbfd7 View commit details

Commits on Jul 1, 2024

  1. fix cprnc to use https

    @mvertens
    mvertens committed Jul 1, 2024
    Copy the full SHA
    f9b3d55 View commit details

Commits on Jul 11, 2024

  1. updates to fix conflict

    @mvertens
    mvertens committed Jul 11, 2024
    Copy the full SHA
    54e2a31 View commit details

  2. Merge pull request #77 from mvertens/feature/fix_cprnc 

    Update to cime6.0.250
Remove ssh dependence in .gitmodules file
    @gold2718
    gold2718 authored Jul 11, 2024
    Copy the full SHA
    dff006e View commit details

Commits on Sep 23, 2024

  1. Merge tag 'cime6.1.28' into HEAD 

    cime6.1.28
    @mvertens
    mvertens committed Sep 23, 2024
    Copy the full SHA
    bf32cb9 View commit details

Commits on Sep 24, 2024

  1. Merge pull request #82 from mvertens/feature/update_to_cime6.1.28 

    update to cime6.1.28
Needed to update share (i.e. nuopc_shr_methods.F90) which in turn in needed to update CMEPS.

Testing:
Verified that SMS_D_Ln9.ne30pg3_ne30pg3_mtn14.NF2000.betzy_intel.cam-outfrq9s is bfb with noresm2_5_013_cam6_3_158.

Test status: bit for bit
User interface changes?: No
Update gh-pages html ?: No
    @gold2718
    gold2718 authored Sep 24, 2024
    Copy the full SHA
    f4a6372 View commit details

Commits on Dec 2, 2024

  1. Merge tag 'cime6.1.38' into feature/update_cime 

    cime6.1.38
    @mvertens
    mvertens committed Dec 2, 2024
    Copy the full SHA
    2e6a89a View commit details

Commits on Jan 27, 2025

  1. Import same file error fix from cime6.1.44

    Steve Goldhaber committed Jan 27, 2025
    Copy the full SHA
    fc7c8fd View commit details

Commits on Feb 12, 2025

  1. Merge pull request #93 from gold2718/update_to_cime6.1.38 

    Update CIME to ESMCI/cime6.1.38
Add in one bug fix from cime6.1.44

GitHub PR link: NorESMhub#93

Test suite: noresm prealpha
Test baseline: NA
Test namelist changes: NA
Test status: BFB
    @gold2718
    gold2718 authored Feb 12, 2025
    Copy the full SHA
    8d3198c View commit details

Commits on Mar 8, 2025

  1. Merge remote-tracking branch 'esmci/master' into rpointers-update-cime

    @mvdebolskiy
    mvdebolskiy committed Mar 8, 2025
    Copy the full SHA
    dd1b016 View commit details

Commits on Mar 20, 2025

  1. Merge pull request #97 from mvdebolskiy/rpointers-update-cime 

    Rpointers update cime
    @mvdebolskiy
    mvdebolskiy authored Mar 20, 2025
    Copy the full SHA
    3012a95 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 .gitmodules
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "CIME/non_py/cprnc"]
path = CIME/non_py/cprnc
url = git@github.com:ESMCI/cprnc
url = https://github.com/ESMCI/cprnc