Closed Katetc closed 1 month ago
@Katetc: I've run several tests comparing this branch to the current main branch. With LIVVkit I ran the dome (s0, s1, s2), ismip-hom (a, c, f), shelf-circular, shelf-confined, and stream tests. These all have BFB matches. I also got BFB matches for a dome DIVA test and an ISMIP6-type Antarctic spin-up.
I then ran a short Alps 200 m spin-up, comparing this branch to hma_glaciers3 (the branch used for GlacierMIP3, before the rebase to main) and hma_glaciers4 (after the rebase). Compared to hma_glaciers3, results are not quite BFB but are the same within roundoff (which is good enough). Compared to hma_glaciers4, results are BFB as expected.
As we talked about, there are a few diagnostic print statements to put back in glide_setup.F90. Once those are done, please go ahead and do the merge to main. Thanks again for all your work to clean up the history.
Moved commits from #63 to a branch with a less complicated merge history to get rid of duplicate commits. Original branch with appropriate dates and commit history found here: lipscomb/hma_glaciers4 This is the branch used to develop a glacier modeling scheme. This code was used for the runs we submitted to GlacierMIP3 for the European Alps. The glacier scheme will be described in full in a paper in prep by Minallah, Lipscomb, and Leguy. Briefly:
Much of the new code is in the new module glissade_glaciers.F90. There are some new glacier fields (some 1D, others 2D) in glide_vars.def, and there is a new 'glaciers' section of the config file.
There is a new restart option 2: "hybrid restart". For this kind of restart, CISM initializes itself using the restart file from a previous run, but with a new start and end date specified in the config file.
There are some new I/O capabilities. For example, it is possible to read in all the input climate data (e.g., monthly data for 20 different years, a total of 240 time slices) once at initialization and store the data for repeated application during the run (rather than read in the same monthly data multiple times).
Glacier-related diagnostics (e.g., total glacier area and volume in the region) are written to the log file along with the standard diagnostics.