Update gx1 initial condition, Icepack, tests, and version. Fix hmix default value #586
Conversation
- update set_nml.gx1prod to match current production system - add apr 1 test case for gx1 - update landice tests, use gx1 - fix hmix default CICE-Consortium#585 - delete old code in ice_forcing.F90 (should have been done in earlier PR)
| endif ! dbug | ||
|
|
||
| end subroutine Jra55_data_old | ||
|
|
||
| !======================================================================= | ||
| ! | ||
| ! AOMIP shortwave forcing |
There was a problem hiding this comment.
Just a note, mainly as a reminder: We are making JRA the default, but the older forcing options are still available. Those will need to be deprecated via our process (not in this release).
configuration/scripts/ice_in
Outdated
| @@ -2,6 +2,9 @@ | |||
| days_per_year = 365 | |||
| use_leap_years = .false. | |||
| year_init = 1997 | |||
There was a problem hiding this comment.
shouldn't year_init match the new forcing data? maybe it doesn't matter, as long as it's properly set in the -s options. I see below that fyear_init=2005, but I thought that one wasn't used now. It's a little confusing, would be better to be consistent.
There was a problem hiding this comment.
I saw this and wondered the same things. I was reluctant to make this change as I didn't understand the importance or history. The other thing is that it will change all the gx3 results as well in our regression test. But I agree 100% that it would be nice if all of this were consistent. Are there other defaults that need to change. Should use_leap_years be always true, for instance? I can make this change as part of this PR, but it will change answers.
| @@ -4394,7 +4153,7 @@ subroutine ocn_data_ncar(dt) | |||
| do j = 1, ny_block | |||
| do i = 1, nx_block | |||
| if (n == 2) sss (i,j,:) = c0 | |||
| if (n == 3) hmix (i,j,:) = c0 | |||
| if (n == 3) hmix (i,j,:) = c20 | |||
There was a problem hiding this comment.
Is this just temporary because of NaNs in the file? If not, then it would be better to set this as a parameter at the top of the module, to make it more explicit. 'default mixed layer depth'
There was a problem hiding this comment.
I think this avoids a divide by zero. I assume there are also some science reasons for setting it to 20. I can create a parameter in the code as suggested and will do that later today. I think that's a good idea.
There was a problem hiding this comment.
This is a way of avoiding divison by zero. @dabail10 suggested max(c20,work1(i,j,iblk)). I dont have a preference. C20 is set to match the only other fixed setting in subroutine init_coupler_flux.
Update CI wget implementation CICE-Consortium#588 Create variable in ice_forcing.F90 called mixed_layer_depth_default and use it instead of c20 Fix bug in hourly output, created in time manager update CICE-Consortium#589 Set start year for all runs to 2005 and turn leap years on by default Update documentation in history output section to add information about hist_avg namelist, noted in CICE-Consortium#566
|
This is ready to merge. I ran a full test suite on cheyenne this morning, https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#4dc3bf15908deffbd68dd400fc0513a6bae7b81f and everything looks good. It would be nice to merge this afternoon to leverage automated weekend testing and to carry out release testing this weekend as well. Someone should review and approve. I'm happy to make additional changes as needed too. |
| @@ -4518,7 +4280,7 @@ subroutine ocn_data_oned | |||
| ss_tlty(:,:,:) = c0 | |||
| frzmlt (:,:,:) = c0 ! freezing/melting potential (W/m^2) | |||
| qdp (:,:,:) = c0 ! deep ocean heat flux (W/m^2) | |||
There was a problem hiding this comment.
We need to fix the ocn_data_oned subroutine when we clean up the forcing module. sss probably shouldn't be hardwired either. We can discuss whether to get rid of this option completely (and just use Icepack) or keep it as an additional test for comparing with Icepack's test, or keep it to have netcdf available in a column configuration.
| @@ -0,0 +1,6 @@ | |||
| year_init = 2005 | |||
| month_init = 9 | |||
| day_init = 2 | |||
There was a problem hiding this comment.
does this test work, starting Sep 2?
There was a problem hiding this comment.
Yes it does. It works just fine. In fact, sec_init = 7200 as well in this setup in case you didn't notice and it all works fine. It runs 5 days to 2005-09-07-07200. The output is also as expected in the sense that things like daily history averages are fine except on the first and last day. If one started on 2005-09-07-07200, you'd probably want to run 22 hours first (which you can do with npt_unit='h' and npt=22) to get on a daily boundary, and then start running days or months after that.
PR checklist
Update gx1 initial condition, Icepack, tests, and version number. Fix hmix default value CESM ocean forcing - hmix division by zero #585
apcraig, dabail10
tests are bit-for-bit except gx1 with new initial condition. debug tests with gx1 fail due to Nans in ic file. https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#c0364f4f6924009f9d949d6c0484e832c1c5a9c6
Also