fix missing connection of ICE and FRZR in some of the SURF components

[zhaobin74]

This PR partially fixed #1110. There will be additional independent efforts coming

NOTE: FRZR is combined with SNO and ICE to form total frozen precip, as done in catchment to keep consistency. FRZR could be part of liquid precip based on discussion. Should that is the case, another PR is needed to change across all surf components. Right now, FRZR is zero so it really does not matter.

This PR fixed #1110.

Based on the consensus, FRZR should be treated as liquid, so it is combined with PLS and PCU to form RAIN.

The PR is 0-diff for AMIP and non 0-diff for coupled configurations.

Due to scope change, this PR is now non 0-diff.

Put in draft mode while waiting for fixes in other components (LAKE, LANDICE and Catchment)

[zhaobin74]

This PR is in 0-diff uncoupled category but I don't see it in the list. I can change it if someone could point me to the correct label. Thanks.

[gmao-rreichle]

Not sure what SNODB is here, but if it's meant to be solid precipitation, we probably shouldn't add FRZR to it. Rather, FRZR should be added to the liquid precip. In Catchment, we initially added FRZR to snowfall (solid precipitation), but @wmputman clarified that FRZR should be treated as (supercooled) liquid. Freezing only occurs when the drop hits the surface and the surface is sufficiently cold. I still need to consult with Randy to be sure, but I expect that we will change Catch GridComp accordingly, that is, add FRZR to liquid precipitation rather than solid precipitation. Sorry if I misunderstood the code here.

[zhaobin74]

@gmao-rreichle, please see my comments about FRZR above. I' ll change FRZR to be included in liquid precip , i.e. RAIN in the ocean components. Just want to be consistent with other components. Thanks.

[gmao-rreichle]

@zhaobin74 : Thanks. Rather than making the subcomponents of Saltwater match what's currently in Catchment, why don't we plan on changing Catchment as part of this PR? We have a meeting with Randy tomorrow afternoon. I assume that Randy will be ok with the changes. Then there's only one PR needed that fixes the issue across the components in the right way. We might need to look at other components as well. It looks like ICEF and FRZR have not yet been added to landice.

[zhaobin74]

@gmao-rreichle, @lcandre2 will work on the landice and lake components to include ICE and FRZR. Initially @lcandre2 and I agreed on two PRs. If you think it is proper to have one single PR that includes catchment, that's fine with me. Let me know how you'd like to proceed. Thank you

[gmao-rreichle]

@zhaobin74 : It's probably best to have just one PR for all of the FRZR changes. Then it's easier to make sure everything is consistent across components. Indeed, Lake also needs updating... We can add the Catchment changes to the branch.

[zhaobin74]

@zhaobin74 : It's probably best to have just one PR for all of the FRZR changes. Then it's easier to make sure everything is consistent across components. Indeed, Lake also needs updating... We can add the Catchment changes to the branch.

Sounds good, @gmao-rreichle. I'll update the title to reflect the scope change.

[gmao-rreichle]

@zhaobin74 : It's probably best to have just one PR for all of the FRZR changes. Then it's easier to make sure everything is consistent across components. Indeed, Lake also needs updating... We can add the Catchment changes to the branch.

Sounds good, @gmao-rreichle. I'll update the title to reflect the scope change.

@zhaobin74 , @lcandre2 : Apologies, I didn't realize that the planned Landice changes are non-0-diff. My assumption was that we only reallocate FRZR, which is identical to 0 in the current and forthcoming model versions (v11, v12). This is to make sure FRZR is in the right place if it is ever filled with something. Now I understand that Landice was a bit further behind and had an error in the old precipitation variables. Given that, I'm wondering if it's not better, after all, to separate the changes into two PRs, non-0-diff for Landice and 0-diff for all other components (assuming Lake is also 0-diff). In any case, I will add the Catchment changes to this branch. I'll defer to you about making the non-0-diff Landice changes here or on a separate PR. Apologies for the misunderstanding and confusion.