fixes to snow_to_ice conversion and addition of coldcontent conservation to glacier model