Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Tria.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Tria.cpp	(revision 13091)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Tria.cpp	(revision 13092)
@@ -192,7 +192,7 @@
 			break;
 		 #endif
 		case BedSlopeXAnalysisEnum: case SurfaceSlopeXAnalysisEnum: case BedSlopeYAnalysisEnum: case SurfaceSlopeYAnalysisEnum:
-			Ke=CreateKMatrixSlope();
+			Ke=CreateMassMatrix();
 			break;
 		case PrognosticAnalysisEnum:
 			Ke=CreateKMatrixPrognostic();
@@ -476,37 +476,35 @@
 	return Ke;
 }
 /*}}}*/
-/*FUNCTION Tria::CreateKMatrixSlope {{{*/
-ElementMatrix* Tria::CreateKMatrixSlope(void){
+/*FUNCTION Tria::CreateMassMatrix {{{*/
+ElementMatrix* Tria::CreateMassMatrix(void){
 
 	/*constants: */
 	const int    numdof=NDOF1*NUMVERTICES;
 
 	/* Intermediaries */
-	int        i,j,ig;
-	IssmDouble     DL_scalar,Jdet;
-	IssmDouble     xyz_list[NUMVERTICES][3];
-	IssmDouble     L[1][3];
-	GaussTria *gauss = NULL;
+	IssmDouble  D,Jdet;
+	IssmDouble  xyz_list[NUMVERTICES][3];
+	IssmDouble  L[1][3];
+	GaussTria  *gauss = NULL;
 
 	/*Initialize Element matrix*/
 	ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
-
 	GetVerticesCoordinates(&xyz_list[0][0],nodes,NUMVERTICES);
 
 	/* Start looping on the number of gaussian points: */
 	gauss=new GaussTria(2);
-	for (ig=gauss->begin();ig<gauss->end();ig++){
+	for(int ig=gauss->begin();ig<gauss->end();ig++){
 
 		gauss->GaussPoint(ig);
 		
 		GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss);
-		DL_scalar=gauss->weight*Jdet;
+		D=gauss->weight*Jdet;
 
 		GetL(&L[0][0], &xyz_list[0][0], gauss,NDOF1);
 
 		TripleMultiply(&L[0][0],1,3,1,
-					&DL_scalar,1,1,0,
+					&D,1,1,0,
 					&L[0][0],1,3,0,
 					&Ke->values[0],1);
 	}
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Tria.h
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Tria.h	(revision 13091)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Tria.h	(revision 13092)
@@ -176,7 +176,7 @@
 		ElementMatrix* CreateKMatrixPrognostic(void);
 		ElementMatrix* CreateKMatrixPrognostic_CG(void);
 		ElementMatrix* CreateKMatrixPrognostic_DG(void);
-		ElementMatrix* CreateKMatrixSlope(void);
+		ElementMatrix* CreateMassMatrix(void);
 		ElementVector* CreatePVectorBalancethickness(void);
 		ElementVector* CreatePVectorBalancethickness_DG(void);
 		ElementVector* CreatePVectorBalancethickness_CG(void);
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Penta.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Penta.cpp	(revision 13091)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Penta.cpp	(revision 13092)
@@ -441,7 +441,7 @@
 			break;
 		#endif
 		case BedSlopeXAnalysisEnum: case SurfaceSlopeXAnalysisEnum: case BedSlopeYAnalysisEnum: case SurfaceSlopeYAnalysisEnum:
-			Ke=CreateKMatrixSlope();
+			Ke=CreateBasalMassMatrix();
 			break;
 		case PrognosticAnalysisEnum:
 			Ke=CreateKMatrixPrognostic();
@@ -499,13 +499,13 @@
 	return Ke;
 }
 /*}}}*/
-/*FUNCTION Penta::CreateKMatrixSlope {{{*/
-ElementMatrix* Penta::CreateKMatrixSlope(void){
+/*FUNCTION Penta::CreateBasalMassMatrix{{{*/
+ElementMatrix* Penta::CreateBasalMassMatrix(void){
 
 	if (!IsOnBed()) return NULL;
 
 	Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria.
-	ElementMatrix* Ke=tria->CreateKMatrixSlope();
+	ElementMatrix* Ke=tria->CreateMassMatrix();
 	delete tria->matice; delete tria;
 
 	/*clean up and return*/
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Penta.h
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Penta.h	(revision 13091)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Elements/Penta.h	(revision 13092)
@@ -168,8 +168,8 @@
 		/*}}}*/
 		/*Penta specific routines:{{{*/
 		void	  BedNormal(IssmDouble* bed_normal, IssmDouble xyz_list[3][3]);
+		ElementMatrix* CreateBasalMassMatrix(void);
 		ElementMatrix* CreateKMatrixPrognostic(void);
-		ElementMatrix* CreateKMatrixSlope(void);
 		ElementVector* CreatePVectorPrognostic(void);
 		ElementVector* CreatePVectorSlope(void);
 		void	  GetDofList(int** pdoflist,int approximation_enum,int setenum);