CICE-Consortium / Icepack

Development repository for sea-ice column physics
Other
25 stars 131 forks source link

Merge E3SM Icepack cice-consortium/E3SM-icepack-initial-integration to Consortium #460

Closed apcraig closed 11 months ago

apcraig commented 11 months ago

PR checklist

NOTE: TO DO AFTER MERGE

apcraig commented 11 months ago

I will review the documentation and propose some changes via a PR to E3SM-Project:cice-consortium/E3SM-icepack-initial-integration. Once that's ready, we can test/review/merge this PR to the Consortium.

apcraig commented 11 months ago

@dabail10, the Tf/Tocnfrz thing is a little confusing. I think what was done was the following. There were a few places where the freezing T was hardwired, those were modified so the code uses Tf (the computed value of freezing temp) and is internally consistent. Then we added a new option for tfrz_option, "constant", which allows the user to set the value of Tocnfrz via icepack_parameters. The default for Tocnfrz is -1.8. The other options for tfrz_option is "minus1p8", "linear_salt", and "mushy". The difference between "constant" and "minus1p8" is that the former allows the user to set a Tocnfrz value that will be used while the latter always uses -1.8.

We are also supporting "_old" options for all of these settings. That provides backward compatibility for CICE testing to make sure we're not changing answers overall relative the Consortium main. The "_old" version just sets trcrn(It) in icepack_compute_tracers to Tocnfrz (-1.8 by default) instead of Tf (the freezing temperature associated with the tfrz_option). These "_old" versions will be deprecated after the code is moved to Consortium main, that will change answers but be more correct. The "_old" versions exist just for testing.

apcraig commented 11 months ago

Testing vs Icepack Consortium and CICE Consortium mains performed as expected. https://github.com/CICE-Consortium/Test-Results/wiki/icepack_by_hash_forks#96f2fc707fc743d7ce6eb8f543bd449a35a1a649 https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#7603016e1db8cf6d752e3b35bfbe18391639d4db

This is ready for review and merge.