Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp	(revision 22043)
+++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp	(revision 22044)
@@ -61,4 +61,6 @@
 			break;
 		case CalvingDevEnum:
+			iomodel->FetchDataToInput(elements,"md.calving.stress_threshold_groundedice",CalvingStressThresholdGroundediceEnum);
+			iomodel->FetchDataToInput(elements,"md.calving.stress_threshold_floatingice",CalvingStressThresholdFloatingiceEnum);
 			iomodel->FetchDataToInput(elements,"md.calving.meltingrate",CalvingMeltingrateEnum);
 			break;
@@ -80,8 +82,5 @@
 		case DefaultCalvingEnum:
 		case CalvingLevermannEnum:
-			break;
 		case CalvingDevEnum:
-			parameters->AddObject(iomodel->CopyConstantObject("md.calving.stress_threshold_groundedice",CalvingStressThresholdGroundediceEnum));
-			parameters->AddObject(iomodel->CopyConstantObject("md.calving.stress_threshold_floatingice",CalvingStressThresholdFloatingiceEnum));
 			break;
 		case CalvingMinthicknessEnum:
Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 22043)
+++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 22044)
@@ -207,8 +207,8 @@
 	Input* vy_input = inputs->GetInput(VyAverageEnum); _assert_(vy_input);
 	Input* gr_input = inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(gr_input);
+	Input* smax_fl_input = inputs->GetInput(CalvingStressThresholdFloatingiceEnum); _assert_(smax_fl_input);
+	Input* smax_gr_input = inputs->GetInput(CalvingStressThresholdGroundediceEnum); _assert_(smax_gr_input);
 	IssmDouble  B   = this->GetMaterialParameter(MaterialsRheologyBbarEnum);
 	IssmDouble  n   = this->GetMaterialParameter(MaterialsRheologyNEnum);
-	this->parameters->FindParam(&sigma_max_floating,CalvingStressThresholdFloatingiceEnum);
-	this->parameters->FindParam(&sigma_max_grounded,CalvingStressThresholdGroundediceEnum);
 
 	/* Start looping on the number of vertices: */
@@ -221,4 +221,6 @@
 		vy_input->GetInputValue(&vy,gauss);
 		gr_input->GetInputValue(&groundedice,gauss);
+		smax_fl_input->GetInputValue(&sigma_max_floating,gauss);
+		smax_gr_input->GetInputValue(&sigma_max_grounded,gauss);
 		vel=sqrt(vx*vx+vy*vy)+1.e-14;
 
Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 22043)
+++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 22044)
@@ -226,8 +226,8 @@
 	Input* vy_input = inputs->GetInput(VyEnum); _assert_(vy_input);
 	Input* gr_input = inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(gr_input);
+	Input* smax_fl_input = inputs->GetInput(CalvingStressThresholdFloatingiceEnum); _assert_(smax_fl_input);
+	Input* smax_gr_input = inputs->GetInput(CalvingStressThresholdGroundediceEnum); _assert_(smax_gr_input);
 	IssmDouble  B   = this->GetMaterialParameter(MaterialsRheologyBbarEnum);
 	IssmDouble  n   = this->GetMaterialParameter(MaterialsRheologyNEnum);
-	this->parameters->FindParam(&sigma_max_floating,CalvingStressThresholdFloatingiceEnum);
-	this->parameters->FindParam(&sigma_max_grounded,CalvingStressThresholdGroundediceEnum);
 
 	/* Start looping on the number of vertices: */
@@ -240,4 +240,6 @@
 		vy_input->GetInputValue(&vy,gauss);
 		gr_input->GetInputValue(&groundedice,gauss);
+		smax_fl_input->GetInputValue(&sigma_max_floating,gauss);
+		smax_gr_input->GetInputValue(&sigma_max_grounded,gauss);
 		vel=sqrt(vx*vx+vy*vy)+1.e-14;