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 CICE (2024-11) including pio_finalize bug fix #96

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from

Conversation

NickSzapiro-NOAA
Copy link
Collaborator

@NickSzapiro-NOAA NickSzapiro-NOAA commented Nov 19, 2024

For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers

PR checklist

  • Short (1 sentence) summary of your PR:
    Reduce prints in shrt_orbital. Additional write restart at end of run. Updates to FSD in icepack. Allow kmt variable name of "mask" and different size netcdf 2d reads. rpointer fix for cesm. Remove orca grid. Add start_tod initialization. Add pio_finalize calls. Update version to 6.6.0. Update opticep tests for dsnow args
  • Developer(s):
    Dave Bailey, Jim Edwards, Tony Craig, Anton Steketee
  • 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.
    See Update CICE (2024-11) including pio_finalize bug fix ufs-community/ufs-weather-model#2505
  • 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 document the changes in detail, including why the changes are made. This will become part of the PR commit log.
    Merge authoritative CICE-Consortium main into EMC fork. Closes Sync with CICE-Consortium (2024-11-18) #95

NickSzapiro-NOAA and others added 12 commits October 10, 2024 12:09
…ortium#980)

Was missed as part of the BGC + Icepack interface update.
* reduce orbital parameters output to log

* avoid printing in initialization as ice log is not yet ready

---------

Co-authored-by: Jim Edwards <[email protected]>
…-Consortium#984)

* support for cesm write_restart_at_endofrun

* clean up merge

* correct rpointer file name for cesm

* response to review

* correct exist and file_exist

* get pointer file name root from ice_in namelist and append timestamp for cesm

* Update cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90

Co-authored-by: Anton Steketee <[email protected]>

* the pointer_file name is set in namelist, no need to modify here

* cleanup whitespace

* need to use default cesm pointer name for write and not read from ice_in namelist

---------

Co-authored-by: Jim Edwards <[email protected]>
Co-authored-by: Anton Steketee <[email protected]>
Update fsd implementation and interfaces.  

This changes answers for all results due to changes in Icepack. Initial ice and snow volume values at the beginning of the lateral melt routine are now used for updating the snow and ice enthalpy as well other tracers for lateral melting.

Change calls to icepack_step_therm1 and icepack_step_therm2 for the new FSD rearrangement.  Update calls to step_dyn_wave, step_therm2, step_therm1 to be consistent with new Icepack interfaces

Update fsd arguments floe_rad_l, floe_rad_c, floe_binwidth, c_fsd_range to Icepack.  Add floe_rad_l, floe_rad_c, floe_binwidth, and c_fsd_range out arguments to icepack_init_fsd_bounds calls.

Update rside/fside arguments to Icepack

Update unittest and coupler layers as needed

Update driver code including remove zsal from mct/cesm.

Update Icepack to #286630f

---------

Co-authored-by: apcraig <[email protected]>
…ICE-Consortium#985)

This change allows for a single processor read of netcdf variables that are not of size nx_global by ny_global. This is to make it easier to extent the ice_grid routines.

This changes allows the mask variable in the kmt netcdf file to be called "mask" instead of "kmc". Both options now work.

This change splits reading the mask and grid into seperate subroutines, so the routine can be reused independently later.

* Allow for varname=mask and reading different size nc files

* Update ug_implementation.rst

* fix gadi test submission

* Tidy gadi compiler flags
With the change in cesm3_cice6_5_0_9 the correct cesm pointer_file name is written to the namelist file and so it is no longer required to append the instance number in a multi instance case.

* add status feature to open existing file, remove no longer needed cesm pointer_file modification

* add status for pointer_file open in netcdf
Deprecate ORCA/CPOM grid functionality as it is not uses in CICE6. The model will abort if orca_halogrid = .true. or gridtype='cpom_grid' in the namelist.

Fix gadi test submission
…m#991)

Define msec in subroutine InitializeRealize in nuopc/cmeps driver
…rtium#995)

* Add pio_finalize calls for CICE history and restart files when running with PIO.  This
cleans up some PIO internal data.  The code was aborting when trying to write
lots of files (>600) because we reinitialize PIO for each file.  This is a short term
fix.  A longer term fix is to initialize PIO once and reuse as much as possible.

Add a new test that runs CICE for a year writing hourly files (>8000 files).  Test with
pio2 and netcdf.

* Add error checks and CESMCOUPLED cpp to new ice_pio_finalize method.
Update Icepack to #3792520561cf94
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sync with CICE-Consortium (2024-11-18)
6 participants