Skip to content

Sea level ponds second PR including Icepack#1036

Merged
apcraig merged 8 commits into
CICE-Consortium:mainfrom
apcraig:slponds2m
Jul 17, 2025
Merged

Sea level ponds second PR including Icepack#1036
apcraig merged 8 commits into
CICE-Consortium:mainfrom
apcraig:slponds2m

Conversation

@apcraig
Copy link
Copy Markdown
Contributor

@apcraig apcraig commented Jul 16, 2025

PR checklist

Update Icepack to #4469e2e878e952bf6

Update CICE for sea level ponds
- fix allocate
- clean up CICE_InitMod.F90 in drivers
- update unittest code to be consistent with standalone cice
- remove call to icepack_init_sealvlpnd (was removed in Icepack)
- add new pond history fields to ice_in
- add new pond history fields to histall test option
- update pond history field names using dpnd_* convention
- turn off pond history "dpnd_" fields for topo ponds scheme, not yet validated
- update pond history field accum_hist_field calls using 1:ncat_hist

Updated drivers standalone/cice and nuopc/cmeps. Other drivers need to be updated.

Remove trailing blanks

Update code alignment

Update documentation

eclare108213 and others added 7 commits July 16, 2025 16:22
- fix allocate
- clean up CICE_InitMod.F90 in drivers
- update unittest code to be consistent with standalone cice
- remove call to icepack_init_sealvlpnd (was removed in icepack)
- add new pond history fields to ice_in
- add new pond history fields to histall test option
Add a note in the user guide that pond topo history fields are not
fully implemented yet
@apcraig
Copy link
Copy Markdown
Contributor Author

apcraig commented Jul 16, 2025

I am running a final set of tests and waiting for github actions to complete. Also looking for a review and documentation check if possible. Suggest reviewing with whitespace changes hidden. Lots of files are changed, but many are alignment type stuff in the drivers or changes to the scripts/doc. Only a handful of source code files were changed and that was mostly associated with the renaming of the pond history field names.

I have confirmed this code is identical to my slponds2 branch which was my working branch prior to the merge of #1020. slponds2 consisted of #1020 plus these changes. This branch, slponds2m, is just the changes on top of #1020 after #1020 was squash merged. The only new code is associated with the 1:ncat_hist change in the accum_hist_field call in ice_history_pond.F90

Copy link
Copy Markdown
Contributor

@eclare108213 eclare108213 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Requesting a couple changes in the docs but will approve for expeditiousness.

Comment thread doc/source/cice_index.rst Outdated
Comment thread doc/source/cice_index.rst
@apcraig
Copy link
Copy Markdown
Contributor Author

apcraig commented Jul 17, 2025

OK, my testing is looking good. This is ready to merge. I'll do that later this evening unless I hear otherwise. Thanks!!

@apcraig apcraig merged commit 21fc281 into CICE-Consortium:main Jul 17, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants