Closed eclare108213 closed 3 months ago
I ran a QC test and it passed. This is what I did. Using derecho, intel, and 128 cores. I checked out the current main branch of Icepack and CICE and then merged in the icongel and congel branches. I then setup two qc cases, one with "one-step", the other with "two-step". The congel_freeze namelist was the only difference. I attach the images. "qc1" is one-step, "qc2" is two-step.
./cice.t-test.py $WORKDIR/CICE_RUNS/derecho_intel_smoke_gx1_128x1_medium_qc.qc1s $WORKDIR/CICE_RUNS/derecho_intel_smoke_gx1_128x1_medium_qc.qc2s
INFO:__main__:Running QC test on the following directories:
INFO:__main__: /glade/derecho/scratch/tcraig/CICE_RUNS/derecho_intel_smoke_gx1_128x1_medium_qc.qc1s
INFO:__main__: /glade/derecho/scratch/tcraig/CICE_RUNS/derecho_intel_smoke_gx1_128x1_medium_qc.qc2s
INFO:__main__:Number of files: 1825
INFO:__main__:2 Stage Test Passed
INFO:__main__:Quadratic Skill Test Passed for Northern Hemisphere
INFO:__main__:Quadratic Skill Test Passed for Southern Hemisphere
INFO:__main__:Creating map of the data (ice_thickness_derecho_intel_smoke_gx1_128x1_medium_qc.qc1.png)
INFO:__main__:Creating map of the data (ice_thickness_derecho_intel_smoke_gx1_128x1_medium_qc.qc2.png)
INFO:__main__:Creating map of the data (ice_thickness_derecho_intel_smoke_gx1_128x1_medium_qc.qc1_minus_derecho_intel_smoke_gx1_128x1_medium_qc.qc2.png)
INFO:__main__:
INFO:__main__:Quality Control Test PASSED
The two-step is the old implementation. One-step is the new and improved implementation. Do we want to make congel_freeze='one-step' the default?
Let me test it in coupled first.
Should we merge this week with old 'two-step' default then update the default next week or after if we gain confidence?
What happened with the gh-actions? I am happy to merge this with two-step as the default.
What happened with the gh-actions? I am happy to merge this with two-step as the default.
We need to merge the Icepack PR first, then update this PR which depends on it. Then GH actions should be OK. I will merge take care of those steps now and we can decide if we want to move away from two-step as the default later.
I just updated the Icepack version on this branch/PR. This should be ready to merge, will do some additional checks and wait for GH actions to run.
I updated the PR documentation and this PR should be ready to merge. @eclare108213, @dabail10, let me know if there are any concerns. Otherwise I'll merge before the weekend.
Thanks for this @eclare108213 and @apcraig - I agree we shouldn't change the default.
I also agree, we should leave the default as 'two-step' until at least one of the modeling centers has a chance to evaluate the change in a coupled system. This PR is ready to merge. Thanks @apcraig for your help!
base_suite comparison of the new code using default settings with the original code prior to modifications:
The 8 failed tests are expected on chicoma (due to large processor counts; missing forcing data), and there are always 2 tests left in pending status when all have finished. The tests with missing data are the new ones for testing the
congel_freeze='one-step'
option.QC testing was done comparing the 'two-step' and new 'one-step' option and this passed, see additional information below.
congel_freeze = 'two-step'
(default)congel_freeze = 'one-step'
Add support for 'one-step' congelation ice formation in addition to current default 'two-step' option. Added a new namelist, congel_freeze to control the congelation option. This CICE update requires an update to Icepack to support the new congel_freeze option. The default setting for congel_freeze is set to 'two-step' for backwards compatibility. The new 'one-step' option will be evaluated and may become the default option in the future.
Testing indicates the default setting is bit-for-bit identical with the current main.