Merge pull request #905 from xylar/fix-remapping-tidal-mixing

Fix remapping of tidal mixing fields

Add `ice_density` to `ais_*.cfg` for clarity

Merge pull request #886 from xylar/fix-conda-cache

In CI, use a unique cache directory for each python version

Merge pull request #868 from matthewhoffman/landice/update_MALI-Dev_s…

…ubmodule

Update MALI-Dev submodule

This PR updates the MALI-Dev submodule, which is long overdue. Of note, it brings in recent Makefile changes to support recent environment updates on Chicoma.

Merge pull request #858 from altheaden/tweak-ci

Tweak behaviors of CI workflows

Enforce minimum column thickness in initial_state

In cavities, we thicken the water column to make sure it has the
minimum thickness.  The hope is that this makes the vertical
coorinate converge more quickly and smoothly to its final result.

Used to produce the RRSwISC6to18E3r5 mesh

Merge pull request #820 from hollyhan/landice/add_correct_sealevel_na…

…melist

Set simulation length in the SLM namelist to 300 years 

In current setup, ISMIP6-2300 historical simulation is performed for 15 years between 2000-2015 CE, and the projection simulations start from year 2015 until 2301. Previously, the sea-level model namelist was set such that the total length of simulation covered by the SLM is 285 years to cover years between 2015-2300, but since we've decided to run the coupled MALI-SLM model for the historical period as well, the simulation length option in the SLM naemlist needs to be corrected to cover the whole 300 years (2000-2300). This PR includes the change.

Merge pull request #796 from xylar/update-mali-dev

Update MALI-Dev submodule to latest develop

Merge pull request #774 from irenavankova/add-FRIS-meshes

Add FRIS meshes