Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 16833)
+++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 16834)
@@ -8748,12 +8748,6 @@
 ElementVector* Penta::CreatePVectorStressbalanceHOFront(void){
 
-	/*Intermediaries */
-	IssmDouble  xyz_list[NUMVERTICES][3];
-	bool        isfront;
-
-	isfront=IsZeroLevelset(MaskIceLevelsetEnum);
-
 	/*If no front, return NULL*/
-	if(!isfront) return NULL;
+	if(!IsZeroLevelset(MaskIceLevelsetEnum)) return NULL;
 
 	/*Intermediaries*/
@@ -8761,4 +8755,5 @@
 	IssmDouble  Jdet,surface,z_g,water_pressure,ice_pressure,air_pressure;
 	IssmDouble  surface_under_water,base_under_water,pressure;
+	IssmDouble  xyz_list[NUMVERTICES][3];
 	IssmDouble  xyz_list_front[4][3];
 	IssmDouble  area_coordinates[4][3];
@@ -8842,19 +8837,13 @@
 ElementVector* Penta::CreatePVectorStressbalanceFSFront(void){
 
-	/*Intermediaries */
+	/*If no front, return NULL*/
+	if(!IsZeroLevelset(MaskIceLevelsetEnum)) return NULL;
+
+	/*Fetch number of nodes and dof for this finite element*/
 	int         i;
-	IssmDouble  xyz_list[NUMVERTICES][3];
-	bool        isfront;
-
-	/*Retrieve all inputs and parameters*/
-	isfront=IsZeroLevelset(MaskIceLevelsetEnum);
-
-	/*If no front, return NULL*/
-	if(!isfront) return NULL;
-
-	/*Fetch number of nodes and dof for this finite element*/
 	IssmDouble  rho_ice,rho_water,gravity;
 	IssmDouble  Jdet,z_g,water_pressure,air_pressure;
 	IssmDouble  surface_under_water,base_under_water,pressure;
+	IssmDouble  xyz_list[NUMVERTICES][3];
 	IssmDouble  xyz_list_front[4][3];
 	IssmDouble  area_coordinates[4][3];
Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 16833)
+++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 16834)
@@ -3922,18 +3922,12 @@
 ElementVector* Tria::CreatePVectorStressbalanceFSFront(void){
 
-	/*Intermediaries */
+	/*If no front, return NULL*/
+	if(!IsZeroLevelset(MaskIceLevelsetEnum)) return NULL;
+
+	/*Intermediaries*/
 	int         i;
-	IssmDouble  xyz_list[NUMVERTICES][3];
-	bool        isfront;
-
-	/*If the level set is awlays <=0, there is no ice front here*/
-	isfront=IsZeroLevelset(MaskIceLevelsetEnum);
-
-	/*If no front, return NULL*/
-	if(!isfront) return NULL;
-
-	/*Intermediaries*/
 	IssmDouble  rho_ice,rho_water,gravity,y_g;
 	IssmDouble  Jdet,water_pressure,air_pressure,pressure;
+	IssmDouble  xyz_list[NUMVERTICES][3];
 	IssmDouble  xyz_list_front[2][3];
 	IssmDouble  area_coordinates[2][3];
@@ -4199,13 +4193,6 @@
 ElementVector* Tria::CreatePVectorStressbalanceSSAFront(){
 
-	/*Intermediaries */
-	IssmDouble  xyz_list[NUMVERTICES][3];
-	bool        isfront;
-
-	/*Determine if there is an icefront in this element*/
-	isfront=IsZeroLevelset(MaskIceLevelsetEnum);
-
 	/*If no front, return NULL*/
-	if(!isfront) return NULL;
+	if(!IsZeroLevelset(MaskIceLevelsetEnum)) return NULL;
 
 	/*Intermediaries*/
@@ -4213,4 +4200,5 @@
 	IssmDouble  Jdet,thickness,bed,water_pressure,ice_pressure,air_pressure;
 	IssmDouble  surface_under_water,base_under_water,pressure;
+	IssmDouble  xyz_list[NUMVERTICES][3];
 	IssmDouble  xyz_list_front[2][3];
 	IssmDouble  area_coordinates[2][3];