Index: /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp	(revision 23157)
+++ /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp	(revision 23158)
@@ -13,17 +13,14 @@
 	/* activate/deactivate nodes for levelset method according to IceMaskNodeActivation */
 
-	/* intermediaries */
-	bool solvein2d=false;
-	int i,in,domaintype,analysis_type;
-	Elements* elements = femmodel->elements;
-
 	/* find parameters */
+	int domaintype;
 	femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
 
-	for(i=0;i<elements->Size();i++){
-		Element    *element  = xDynamicCast<Element*>(elements->GetObjectByOffset(i));
+	for(int i=0;i<femmodel->elements->Size();i++){
+		Element    *element  = xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
 		int         numnodes = element->GetNumberOfNodes();
 		IssmDouble *mask     = xNew<IssmDouble>(numnodes);
-		// include switch for elements with multiple different sets of nodes
+
+		/*include switch for elements with multiple different sets of nodes*/
 		switch(element->GetElementType()){
 			case MINIEnum:case MINIcondensedEnum:
@@ -51,14 +48,9 @@
 		}
 
-		for(in=0;in<numnodes;in++){
+		for(int in=0;in<numnodes;in++){
 			Node* node=element->GetNode(in);
-			if(mask[in]==1.){
-				node->Activate();
-			}
-			else {
-				node->Deactivate();
-			}
+			if(mask[in]==1.) node->Activate();
+			else             node->Deactivate();
 		}
-
 		xDelete<IssmDouble>(mask);
 	}
@@ -66,14 +58,18 @@
 void GetMaskOfIceVerticesLSMx(FemModel* femmodel){/*{{{*/
 
-	/* Intermediaries */
-	int i;
+	/*Initialize vector with number of vertices*/
+	int numvertices=femmodel->vertices->NumberOfVertices();
+	if(numvertices==0)  return;
+	Vector<IssmDouble>* vec_mask_ice=new Vector<IssmDouble>(numvertices);
 
-	/*Initialize vector with number of vertices*/
-	int numvertices=femmodel->vertices->NumberOfVertices(); if (numvertices==0)return;
-	Vector<IssmDouble>* vec_mask_ice=new Vector<IssmDouble>(numvertices); //vertices that have ice at next time step
 	/*Fill vector with values: */
-	for(i=0;i<femmodel->elements->Size();i++){
+	for(int i=0;i<femmodel->elements->Size();i++){
 		Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
-		SetMaskOfIceElement(vec_mask_ice, element);
+		if(element->IsIceInElement()){
+			int nbv = element->GetNumberOfVertices();
+			for(int iv=0;iv<nbv;iv++){
+				vec_mask_ice->SetValue(element->vertices[iv]->Sid(),1.,INS_VAL);
+			}
+		}
 	}
 
@@ -86,15 +82,3 @@
 	delete vec_mask_ice;
 	xDelete<IssmDouble>(mask_ice);
-
 }/*}}}*/
-void SetMaskOfIceElement(Vector<IssmDouble>* vec_mask_ice, Element* element){/*{{{*/
-
-	/* Intermediaries */
-	int numvertices = element->GetNumberOfVertices();
-
-	if(element->IsIceInElement()){
-		for(int i = 0;i<numvertices;i++){
-			vec_mask_ice->SetValue(element->vertices[i]->Sid(),1.,INS_VAL);
-		}
-	}
-}/*}}}*/
Index: /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h
===================================================================
--- /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h	(revision 23157)
+++ /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h	(revision 23158)
@@ -10,4 +10,3 @@
 void SetActiveNodesLSMx(FemModel* femmodel);
 void GetMaskOfIceVerticesLSMx(FemModel* femmodel);
-void SetMaskOfIceElement(Vector<IssmDouble>* vec_mask_ice, Element* element);
 #endif  /* _UPDATESPCSX_H */