cam_noresm2_1_v1.0.2: Fix ice delimiter bug fix

gold2718 commented 5 months ago

Summary: Add a compile-time option to revert the ice delimiter to the NorESM2.0 behavior

Contributors: gold2718

Reviewers: oyvindseland, DirkOlivie

Purpose of changes: Allow revert ice delimiter fix (#124) Also, fix some usermods directories to turn on AEROCOM output as described in the user manual.

Github PR URL: https://github.com/NorESMhub/CAM/pull/125

Changes made to build system: None

Changes made to the namelist: None

Changes to the defaults for the boundary datasets: None

Substantial timing or memory changes: None

Added a compile time switch (NORESM2_ICE_DELIMITER) that reverts the ice delimiter behavior to match NorESM2.0.

aux_cam_noresm:
- BASELINE failures for NF compsets (expected due to bug fixes and ice delimiter change)
- NLCOMP failure (namelist change) for F2000climo compset due to change in land ice from CISM2%NOEVOLV to SGLC.
Ran test ERP_D_Ln9_P18.f19_f19.NF1850.betzy_intel.cam-outfrq9s three ways:
1. "Default" NorESM2.1 configuration (with ice delimiter fix), compared with version before NorESM2 option (PASS)
2. NorESM2.1 configuration modified to use NorESM2.0 ice delimiter (by defining NORESM2_ICE_DELIMITER), compared with NorESM2 code version (substituted NorESM2 version of src/NorESM/micro_mg2_0.F90 -- PASS)
3. "Default" NorESM2.1 configuration (with ice delimiter fix), compared with NorESM2 code version (BASELINE FAIL as expected)

resolves #124

DirkOlivie commented 5 months ago

Hi, I would make the comment a little bit more explicit. Now it says "Uncomment the line below to recover the NorESM2 behavior". Maybe write "Uncomment the line below to recover the NorESM2 behavior for micro_mg2_0.F90" (as the other 3 bug-corrections will remain active).

Looks fine for the rest.

gold2718 commented 5 months ago

Hi, I would make the comment a little bit more explicit. Now it says "Uncomment the line below to recover the NorESM2 behavior". Maybe write "Uncomment the line below to recover the NorESM2 behavior for micro_mg2_0.F90" (as the other 3 bug-corrections will remain active).

Good point. How about "Uncomment the line below to recover the NorESM2 ice delimiter behavior."?

I could also include information from the release notes which currently reads:

Removed an artificial limit on the number of ice particles. See https://github.com/NorESMhub/CAM/issues/110

Thoughts?

DirkOlivie commented 5 months ago

Hi, the text "Uncomment the line below to recover the NorESM2 ice delimiter behavior" is fine for me.

gold2718 commented 5 months ago

Hi, the text "Uncomment the line below to recover the NorESM2 ice delimiter behavior" is fine for me.

@DirkOlivie, If it is okay now, could you 'finish' the review and approve it?

gold2718 commented 5 months ago

@oyvindseland, do you want to review this PR?

DirkOlivie commented 5 months ago

Yes, fine for me.

oyvindseland commented 5 months ago

Hi

I do not need to review the code change since Dirk has already done so

ons. 17. jan. 2024 kl. 10:21 skrev goldy @.***>:

@oyvindseland https://github.com/oyvindseland, do you want to review this PR?

— Reply to this email directly, view it on GitHub https://github.com/NorESMhub/CAM/pull/125#issuecomment-1895405313, or unsubscribe https://github.com/notifications/unsubscribe-auth/ADZCKBQD7GF36NPNPJYZDYTYO6JYXAVCNFSM6AAAAABBWWLZKGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQOJVGQYDKMZRGM . You are receiving this because you were mentioned.Message ID: @.***>

NorESMhub / CAM

cam_noresm2_1_v1.0.2: Fix ice delimiter bug fix #125