Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 15040)
+++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 15041)
@@ -6067,7 +6067,4 @@
 	IssmDouble xyz_list[NUMVERTICES][3];
 	IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0};
-	IssmDouble slope[3]={0.0,0.0,0.0};
-	IssmDouble MAXSLOPE=.06; // 6 %
-	IssmDouble MOUNTAINKEXPONENT=10;
 	IssmDouble L[2][numdof];
 	IssmDouble DL[2][2]                  ={{ 0,0 },{0,0}}; //for basal drag
@@ -6099,5 +6096,4 @@
 	for(i=0;i<NUMVERTICES2D;i++) for(j=0;j<2;j++) xyz_list_tria[i][j]=xyz_list[i][j];
 	parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-	Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input);
 	Input* vx_input=inputs->GetInput(VxEnum);           _assert_(vx_input);
 	Input* vy_input=inputs->GetInput(VyEnum);           _assert_(vy_input);
@@ -6115,13 +6111,4 @@
 		/*Friction: */
 		friction->GetAlpha2(&alpha2, gauss,VxEnum,VyEnum,VzEnum);
-
-		// If we have a slope > 6% for this element,  it means  we are on a mountain. In this particular case, 
-		//velocity should be = 0. To achieve this result, we set alpha2_list to a very high value: */
-		surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss);
-		slope_magnitude=sqrt(pow(slope[0],2)+pow(slope[1],2));
-
-		if (slope_magnitude>MAXSLOPE){
-			alpha2=pow((IssmDouble)10,MOUNTAINKEXPONENT);
-		}
 
 		GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0],gauss);
@@ -6905,7 +6892,4 @@
 	IssmDouble slope_magnitude,alpha2,Jdet;
 	IssmDouble phi=1.0;
-	IssmDouble slope[3]={0.0,0.0,0.0};
-	IssmDouble MAXSLOPE=.06; // 6 %
-	IssmDouble MOUNTAINKEXPONENT=10;
 	IssmDouble L[2][numdof];
 	IssmDouble DL[2][2]={{ 0,0 },{0,0}}; //for basal drag
@@ -6944,14 +6928,6 @@
 		GetL(&L[0][0], gauss,NDOF2);
 
-		surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss);
 		friction->GetAlpha2(&alpha2, gauss,VxEnum,VyEnum,VzEnum); 
-		slope_magnitude=sqrt(pow(slope[0],2)+pow(slope[1],2));
 		if(migration_style==SubelementMigrationEnum) alpha2=phi*alpha2;
-
-		// If we have a slope > 6% for this element,  it means  we are on a mountain. In this particular case, 
-		//velocity should be = 0. To achieve this result, we set alpha2_list to a very high value: */
-		if (slope_magnitude>MAXSLOPE){
-			alpha2=pow((IssmDouble)10,MOUNTAINKEXPONENT);
-		}
 
 		DL_scalar=alpha2*gauss->weight*Jdet;
Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 15040)
+++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 15041)
@@ -3319,7 +3319,5 @@
 	int        analysis_type,migration_style;
 	int        gausspoints=2;
-	IssmDouble MAXSLOPE  = .06; // 6 %
-	IssmDouble MOUNTAINKEXPONENT = 10;
-	IssmDouble slope_magnitude,alpha2;
+	IssmDouble alpha2;
 	IssmDouble Jdet;
 	IssmDouble phi=1.0;
@@ -3363,10 +3361,5 @@
 		gauss->GaussPoint(ig);
 
-		// If we have a slope > 6% for this element,  it means  we are on a mountain. In this particular case, 
-		//velocity should be = 0. To achieve this result, we set alpha2_list to a very high value: */
-		surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss);
-		slope_magnitude=sqrt(slope[0]*slope[0]+slope[1]*slope[1]);
-		if(slope_magnitude>MAXSLOPE) alpha2=pow((IssmDouble)10,MOUNTAINKEXPONENT);
-		else friction->GetAlpha2(&alpha2, gauss,VxEnum,VyEnum,VzEnum);
+		friction->GetAlpha2(&alpha2, gauss,VxEnum,VyEnum,VzEnum);
 		if(migration_style==SubelementMigrationEnum) alpha2=phi*alpha2;
 		if(migration_style==SubelementMigration2Enum){
