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

Update branch from CICE main #6703bc533 #109

Merged
merged 5 commits into from
May 26, 2023
Merged

Update branch from CICE main #6703bc533 #109

merged 5 commits into from
May 26, 2023

Conversation

apcraig
Copy link
Owner

@apcraig apcraig commented May 26, 2023

PR checklist

  • Short (1 sentence) summary of your PR:
    Update branch from CICE main #6703bc533
  • Developer(s):
    apcraig
  • Suggest PR reviewers from list in the column to the right.
  • Please copy the PR test results link or provide a summary of testing completed below.
    Tested vs Consortium main, bit-for-bit except restart file diffs on non-ice points.
  • How much do the PR code changes differ from the unmodified code?
    • bit for bit
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on Icepack or any other models?
    • Yes
    • No
  • Does this PR update the Icepack submodule? If so, the Icepack submodule must point to a hash on Icepack's main branch.
    • Yes
    • No
  • Does this PR add any new test cases?
    • Yes
    • No
  • Is the documentation being updated? ("Documentation" includes information on the wiki or in the .rst files from doc/source/, which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/. A test build of the technical docs will be performed as part of the PR testing.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
  • Please provide any additional information or relevant details below:

dabail10 and others added 5 commits March 23, 2023 15:46
@dabail10
Fix CESMCOUPLED compile issue in icepack. (CICE-Consortium#823)
9424497 
* Fix CESMCOUPLED compile problem in icepack
@apcraig
Update global reduction implementation to improve performance, fix VP…
5b0418a 
… bug (CICE-Consortium#824)

* Update global reduction implementation to improve performance, fix VP bug

This was mainly done for situations like VP that need a fast global sum.
The VP global sum is still slightly faster than the one computed in the
infrastructure, so kept that implementation.  Found a bug in the workspace_y
calculation in VP that was fixed.  Also found that the haloupdate call
as part of the precondition step generally improves VP performance, so removed
option to NOT call the haloupdate there.

Separately, fixed a bug in the tripoleT global sum implementation, added
a tripoleT global sum unit test, and resynced ice_exit.F90, ice_reprosum.F90,
and ice_global_reductions.F90 between serial and mpi versions.

- Refactor global sums to improve performance, move if checks outside do loops
- Fix bug in tripoleT global sums, tripole seam masking
- Update VP solver, use local global sum more often
- Update VP solver, fix bug in workspace_y calculation
- Update VP solver, always call haloupdate during precondition
- Refactor ice_exit.F90 and sync serial and mpi versions
- Sync ice_reprosum.F90 between serial and mpi versions
- Update sumchk unit test to handle grids better
- Add tripoleT sumchk test

* Update VP global sum to exclude local implementation with tripole grids
@dabail10
Add functionality to change hist_avg for each stream (CICE-Consortium…
35ec167 
…#827)

* Add functionality to change hist_avg for each stream

* Fix some documentation

* Try to fix sphinx problem

* Fix hist_avg documentation

* Add some metadata changes to time and time_bounds
@apcraig
Update Icepack to #6703bc533c968 May 22, 2023 (CICE-Consortium#829)
b98b8ae 
Remove trailing blanks via automated tool in some Fortran files
@apcraig
Merge branch 'main' of https://github.com/cice-consortium/cice into i…
407a5c3 
…cep230524

Update to CICE-Consortium main #6703bc533, May 24, 2023
Includes Icepack update from same date
@apcraig apcraig merged commit a093b13 into E3SMIcepackDEV May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@apcraig @dabail10