Index: ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp
===================================================================
--- ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp	(revision 18958)
+++ ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp	(revision 18959)
@@ -104,8 +104,8 @@
 
 	if(save_results){
 		if(VerboseSolution()) _printf0_("   saving results\n");
-		int outputs = MaskIceLevelsetEnum;
-		femmodel->RequestedOutputsx(&femmodel->results,&outputs,1);
+		int outputs[2] = {MaskIceLevelsetEnum, CalvingCalvingrateEnum};
+		femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2);
 	}
 }/*}}}*/
 ElementVector* LevelsetAnalysis::CreateDVector(Element* element){/*{{{*/
Index: ../trunk-jpl/src/c/cores/transient_core.cpp
===================================================================
--- ../trunk-jpl/src/c/cores/transient_core.cpp	(revision 18958)
+++ ../trunk-jpl/src/c/cores/transient_core.cpp	(revision 18959)
@@ -119,8 +119,8 @@
 
 			/* extrapolate velocities onto domain with no ice */
 			Analysis* extanalysis = new ExtrapolationAnalysis();
-			const int nvars=2;
-			int vars[nvars] = {VxEnum, VyEnum};
+			const int nvars=3;
+			int vars[nvars] = {VxEnum, VyEnum, ThicknessEnum};
 			for(int iv=0;iv<nvars;iv++){
 				femmodel->parameters->SetParam(vars[iv],ExtrapolationVariableEnum); 
 				extanalysis->Core(femmodel);
Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/Elements/Element.cpp	(revision 18958)
+++ ../trunk-jpl/src/c/classes/Elements/Element.cpp	(revision 18959)
@@ -1370,15 +1370,18 @@
 				this->StrainRateperpendicular();
 				int calvinglaw;
 				this->FindParam(&calvinglaw,CalvingLawEnum);
-				switch(calvinglaw){
-					         case CalvingLevermannEnum:
-									this->CalvingRateLevermann();
-									break;
-								case CalvingPiEnum:
-									this->CalvingRatePi();
-									break;
-								default:
-									_error_("Calving law "<<EnumToStringx(calvinglaw)<<" not supported yet");
+					switch(calvinglaw){
+						case DefaultCalvingEnum:
+							//do nothing
+							break;
+						case CalvingLevermannEnum:
+							this->CalvingRateLevermann();
+							break;
+						case CalvingPiEnum:
+							this->CalvingRatePi();
+							break;
+						default:
+							_error_("Calving law "<<EnumToStringx(calvinglaw)<<" not supported yet");
 				}
 				input=this->inputs->GetInput(output_enum);
 				break;
