Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp	(revision 18074)
+++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp	(revision 18075)
@@ -5814,5 +5814,5 @@
 
 	int num_dof=2;
-	IssmDouble L1L2l3[3];
+	IssmDouble basis[3];
 
 	/*Cast gauss to GaussPenta*/
@@ -5820,27 +5820,27 @@
 	GaussPenta* gauss = dynamic_cast<GaussPenta*>(gauss_in);
 
-	/*Get L1L2l3 in actual coordinate system: */
-	L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0;
-	L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0;
-	L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0;
+	/*Get basis in actual coordinate system: */
+	basis[0]=gauss->coord1*(1-gauss->coord4)/2.0;
+	basis[1]=gauss->coord2*(1-gauss->coord4)/2.0;
+	basis[2]=gauss->coord3*(1-gauss->coord4)/2.0;
 
 	/*Build LFS: */
 	for(int i=0;i<3;i++){
-		LFS[num_dof*3*0+num_dof*i+0] = L1L2l3[i];
+		LFS[num_dof*3*0+num_dof*i+0] = basis[i];
 		LFS[num_dof*3*0+num_dof*i+1] = 0;
 		LFS[num_dof*3*1+num_dof*i+0] = 0;
-		LFS[num_dof*3*1+num_dof*i+1] = L1L2l3[i];
-		LFS[num_dof*3*2+num_dof*i+0] = L1L2l3[i];
+		LFS[num_dof*3*1+num_dof*i+1] = basis[i];
+		LFS[num_dof*3*2+num_dof*i+0] = basis[i];
 		LFS[num_dof*3*2+num_dof*i+1] = 0;
 		LFS[num_dof*3*3+num_dof*i+0] = 0;
-		LFS[num_dof*3*3+num_dof*i+1] = L1L2l3[i];
-		LFS[num_dof*3*4+num_dof*i+0] = L1L2l3[i];
+		LFS[num_dof*3*3+num_dof*i+1] = basis[i];
+		LFS[num_dof*3*4+num_dof*i+0] = basis[i];
 		LFS[num_dof*3*4+num_dof*i+1] = 0;
 		LFS[num_dof*3*5+num_dof*i+0] = 0;
-		LFS[num_dof*3*5+num_dof*i+1] = L1L2l3[i];
-		LFS[num_dof*3*6+num_dof*i+0] = L1L2l3[i];
+		LFS[num_dof*3*5+num_dof*i+1] = basis[i];
+		LFS[num_dof*3*6+num_dof*i+0] = basis[i];
 		LFS[num_dof*3*6+num_dof*i+1] = 0;
 		LFS[num_dof*3*7+num_dof*i+0] = 0;
-		LFS[num_dof*3*7+num_dof*i+1] = L1L2l3[i];
+		LFS[num_dof*3*7+num_dof*i+1] = basis[i];
 	}
 }/*}}}*/
@@ -5862,5 +5862,5 @@
 	int num_dof_vel=3*7;
 	int num_dof_total=3*7+1*6;
-	IssmDouble L1L2l3[3];
+	IssmDouble basis[3];
 	IssmDouble dbasis[3][6];
 
@@ -5869,8 +5869,8 @@
 	GaussPenta* gauss = dynamic_cast<GaussPenta*>(gauss_in);
 
-	/*Get L1L2l3 in actual coordinate system: */
-	L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0;
-	L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0;
-	L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0;
+	/*Get basis in actual coordinate system: */
+	basis[0]=gauss->coord1*(1-gauss->coord4)/2.0;
+	basis[1]=gauss->coord2*(1-gauss->coord4)/2.0;
+	basis[2]=gauss->coord3*(1-gauss->coord4)/2.0;
 
 	element->NodalFunctionsP1Derivatives(&dbasis[0][0],xyz_list,gauss);
@@ -5878,16 +5878,16 @@
 	/*Build LprimeFS: */
 	for(int i=0;i<3;i++){
-		LprimeFS[num_dof_total*0+num_dof*i+0] = L1L2l3[i];
+		LprimeFS[num_dof_total*0+num_dof*i+0] = basis[i];
 		LprimeFS[num_dof_total*0+num_dof*i+1] = 0.;
 		LprimeFS[num_dof_total*0+num_dof*i+2] = 0.;
 		LprimeFS[num_dof_total*1+num_dof*i+0] = 0.;
-		LprimeFS[num_dof_total*1+num_dof*i+1] = L1L2l3[i];
+		LprimeFS[num_dof_total*1+num_dof*i+1] = basis[i];
 		LprimeFS[num_dof_total*1+num_dof*i+2] = 0.;
 		LprimeFS[num_dof_total*2+num_dof*i+0] = 0.;
 		LprimeFS[num_dof_total*2+num_dof*i+1] = 0.;
-		LprimeFS[num_dof_total*2+num_dof*i+2] = L1L2l3[i];
+		LprimeFS[num_dof_total*2+num_dof*i+2] = basis[i];
 		LprimeFS[num_dof_total*3+num_dof*i+0] = 0.;
 		LprimeFS[num_dof_total*3+num_dof*i+1] = 0.;
-		LprimeFS[num_dof_total*3+num_dof*i+2] = L1L2l3[i];
+		LprimeFS[num_dof_total*3+num_dof*i+2] = basis[i];
 		LprimeFS[num_dof_total*4+num_dof*i+0] = 0.;
 		LprimeFS[num_dof_total*4+num_dof*i+1] = 0.;
@@ -5936,6 +5936,6 @@
 		LprimeFS[num_dof_total*4+num_dof_vel+i] = 0.;
 		LprimeFS[num_dof_total*5+num_dof_vel+i] = 0.;
-		LprimeFS[num_dof_total*6+num_dof_vel+i] = L1L2l3[i];
-		LprimeFS[num_dof_total*7+num_dof_vel+i] = L1L2l3[i];
+		LprimeFS[num_dof_total*6+num_dof_vel+i] = basis[i];
+		LprimeFS[num_dof_total*7+num_dof_vel+i] = basis[i];
 	}
 	for(int i=3;i<6;i++){
@@ -5962,5 +5962,5 @@
 
 	int num_dof=3;
-	IssmDouble L1L2l3[3];
+	IssmDouble basis[3];
 
 	/*Cast gauss to GaussPenta*/
@@ -5968,23 +5968,23 @@
 	GaussPenta* gauss = dynamic_cast<GaussPenta*>(gauss_in);
 
-	/*Get L1L2l3 in actual coordinate system: */
-	L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0;
-	L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0;
-	L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0;
+	/*Get basis in actual coordinate system: */
+	basis[0]=gauss->coord1*(1-gauss->coord4)/2.0;
+	basis[1]=gauss->coord2*(1-gauss->coord4)/2.0;
+	basis[2]=gauss->coord3*(1-gauss->coord4)/2.0;
 
 	/*Build LFS: */
 	for(int i=0;i<3;i++){
-		LFS[num_dof*3*0+num_dof*i+0] = L1L2l3[i];
+		LFS[num_dof*3*0+num_dof*i+0] = basis[i];
 		LFS[num_dof*3*0+num_dof*i+1] = 0.;
 		LFS[num_dof*3*0+num_dof*i+2] = 0.;
 		LFS[num_dof*3*1+num_dof*i+0] = 0.;
-		LFS[num_dof*3*1+num_dof*i+1] = L1L2l3[i];
+		LFS[num_dof*3*1+num_dof*i+1] = basis[i];
 		LFS[num_dof*3*1+num_dof*i+2] = 0.;
 		LFS[num_dof*3*2+num_dof*i+0] = 0.;
 		LFS[num_dof*3*2+num_dof*i+1] = 0.;
-		LFS[num_dof*3*2+num_dof*i+2] = L1L2l3[i];
+		LFS[num_dof*3*2+num_dof*i+2] = basis[i];
 		LFS[num_dof*3*3+num_dof*i+0] = 0.;
 		LFS[num_dof*3*3+num_dof*i+1] = 0.;
-		LFS[num_dof*3*3+num_dof*i+2] = L1L2l3[i];
+		LFS[num_dof*3*3+num_dof*i+2] = basis[i];
 	}
 }/*}}}*/
@@ -6000,5 +6000,5 @@
 	 */
 	int num_dof=2;
-	IssmDouble L1L2l3[3];
+	IssmDouble basis[3];
 
 	/*Cast gauss to GaussPenta*/
@@ -6006,19 +6006,19 @@
 	GaussPenta* gauss = dynamic_cast<GaussPenta*>(gauss_in);
 
-	/*Get L1L2l3 in actual coordinate system: */
-	L1L2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0;
-	L1L2l3[1]=gauss->coord2*(1-gauss->coord4)/2.0;
-	L1L2l3[2]=gauss->coord3*(1-gauss->coord4)/2.0;
+	/*Get basis in actual coordinate system: */
+	basis[0]=gauss->coord1*(1-gauss->coord4)/2.0;
+	basis[1]=gauss->coord2*(1-gauss->coord4)/2.0;
+	basis[2]=gauss->coord3*(1-gauss->coord4)/2.0;
 
 	/*Build LprimeFS: */
 	for(int i=0;i<3;i++){
-		LprimeFS[num_dof*3*0+num_dof*i+0] = L1L2l3[i];
+		LprimeFS[num_dof*3*0+num_dof*i+0] = basis[i];
 		LprimeFS[num_dof*3*0+num_dof*i+1] = 0.;
 		LprimeFS[num_dof*3*1+num_dof*i+0] = 0.;
-		LprimeFS[num_dof*3*1+num_dof*i+1] = L1L2l3[i];
-		LprimeFS[num_dof*3*2+num_dof*i+0] = L1L2l3[i];
+		LprimeFS[num_dof*3*1+num_dof*i+1] = basis[i];
+		LprimeFS[num_dof*3*2+num_dof*i+0] = basis[i];
 		LprimeFS[num_dof*3*2+num_dof*i+1] = 0.;
 		LprimeFS[num_dof*3*3+num_dof*i+0] = 0.;
-		LprimeFS[num_dof*3*3+num_dof*i+1] = L1L2l3[i];
+		LprimeFS[num_dof*3*3+num_dof*i+1] = basis[i];
 	}
 }/*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp	(revision 18074)
+++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp	(revision 18075)
@@ -883,5 +883,5 @@
 	GetJacobianInvert(&Jinv[0][0], xyz_list, gauss);
 
-	/*Build dh1dh3: 
+	/*Build basis function derivatives: 
 	 *
 	 * [dhi/dx]= Jinv*[dhi/dr]
Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h	(revision 18074)
+++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h	(revision 18075)
@@ -28,7 +28,7 @@
 		void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss);
 		void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss,int finiteelement);
-		void GetNodalFunctionsP1(IssmDouble* l1l6, Gauss* gauss);
-		void GetNodalFunctionsP1Derivatives(IssmDouble* dh1dh6,IssmDouble* xyz_list, Gauss* gauss);
-		void GetNodalFunctionsMINIDerivatives(IssmDouble* dh1dh7,IssmDouble* xyz_list, Gauss* gauss);
+		void GetNodalFunctionsP1(IssmDouble* basis, Gauss* gauss);
+		void GetNodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss);
+		void GetNodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss);
 		void GetNodalFunctionsP1DerivativesReference(IssmDouble* dl1dl6,Gauss* gauss);
 		void GetNodalFunctionsMINIDerivativesReference(IssmDouble* dl1dl7,Gauss* gauss);