Closed apcraig closed 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.
@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.
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.
PR checklist
[X] Short (1 sentence) summary of your PR: Merge E3SM Icepack cice-consortium/E3SM-icepack-initial-integration to Consortium
[X] Developer(s): apcraig, eclare108213, dabail19
[X] Suggest PR reviewers from list in the column to the right.
[X] Please copy the PR test results link or provide a summary of testing completed below. underway....
How much do the PR code changes differ from the unmodified code?
Does this PR create or have dependencies on CICE or any other models?
Does this PR add any new test cases?
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/.)
[X] Please provide any additional information or relevant details below:
Update dEdd shortwave, snicar, https://github.com/E3SM-Project/Icepack/pull/7
Update modal aerosols, this changes answers in Icepack standalone
Update public interfaces
Update Tf implementation to make internally consistent in multiple places, https://github.com/E3SM-Project/Icepack/pull/12
Modify iDin computation in subroutine compute_microS_mushy
Fix fhtan computation in compute_albedos subroutine
Modify some internal subroutine interfaces, remove parameters from arguments, leverage module data instead
Rename orb interfaces, change from shr_orb to icepack_orb to better differentiate internal and external versions of the orbital code
Refactor some optional argument handling
Clean up icepack driver namelist logging
Clean up some formatting
Add ability to reuse Icepack binary in Icepack test scripts
Add snicar_suite test suite
Update documentation
NOTE: TO DO AFTER MERGE