Back to 13 sol types as in trunk | ice_sheet_mask is read in a separate file | explicitsnow_subli updated to be closer to the trunk version.