Basal Runoff (mass, but enthalpy can be computed) and Calving (mass, not enthalpy) added to the variables PISMIceModel tracks and will report back for the two-way coupling.
Changed from subclassing to inclusion.
Removed use of std::unique_ptr from inside STL collections.  This may have been a cause of problems with Intel C++