Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 23498)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 23499)
@@ -4670,12 +4670,11 @@
 	for (int i=0;i<nodes->Size();i++){
 		Node* node=xDynamicCast<Node*>(nodes->GetObjectByOffset(i));
-		if(node->InAnalysis(HydrologyDCEfficientAnalysisEnum)){
-			if(serial_active[node->Sid()]==1.){
-				node->Activate();
-				if(!node->IsClone()) counter++;
-			}
-			else{
-				node->Deactivate();
-			}
+		_assert_(node->InAnalysis(HydrologyDCEfficientAnalysisEnum));
+		if(serial_active[node->Sid()]==1.){
+			node->Activate();
+			if(!node->IsClone()) counter++;
+		}
+		else{
+			node->Deactivate();
 		}
 	}
@@ -4745,12 +4744,11 @@
 	for (int i=0;i<nodes->Size();i++){
 		Node* node=xDynamicCast<Node*>(nodes->GetObjectByOffset(i));
-		if(node->InAnalysis(HydrologyDCInefficientAnalysisEnum)){
-			if(serial_active[node->Sid()]==1.){
-				node->Activate();
-				if(!node->IsClone()) counter++;
-			}
-			else{
-				node->Deactivate();
-			}
+		_assert_(node->InAnalysis(HydrologyDCInefficientAnalysisEnum));
+		if(serial_active[node->Sid()]==1.){
+			node->Activate();
+			if(!node->IsClone()) counter++;
+		}
+		else{
+			node->Deactivate();
 		}
 	}
@@ -4795,12 +4793,11 @@
 	for (int i=0;i<nodes->Size();i++){
 		Node* node=xDynamicCast<Node*>(nodes->GetObjectByOffset(i));
-		if(node->InAnalysis(L2ProjectionEPLAnalysisEnum)){
-			if(serial_active[node->Sid()]==1.){
-				node->Activate();
-				if(!node->IsClone()) counter++;
-			}
-			else{
-				node->Deactivate();
-			}
+		_assert_(node->InAnalysis(L2ProjectionEPLAnalysisEnum));
+		if(serial_active[node->Sid()]==1.){
+			node->Activate();
+			if(!node->IsClone()) counter++;
+		}
+		else{
+			node->Deactivate();
 		}
 	}
Index: /issm/trunk-jpl/src/c/classes/Nodes.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Nodes.cpp	(revision 23498)
+++ /issm/trunk-jpl/src/c/classes/Nodes.cpp	(revision 23499)
@@ -52,7 +52,6 @@
 
 		/*Check that this node corresponds to our analysis currently being carried out: */
-		if(node->InAnalysis(analysis_type)){
-			node->DistributeDofs(&dofcount,setenum);
-		}
+		_assert_(node->InAnalysis(analysis_type));
+		node->DistributeDofs(&dofcount,setenum);
 	}
 
@@ -73,7 +72,6 @@
 		/*Check that this node corresponds to our analysis currently being carried out: */
 		Node* node=xDynamicCast<Node*>(this->GetObjectByOffset(i));
-		if (node->InAnalysis(analysis_type)){
-			node->OffsetDofs(dofcount,setenum);
-		}
+		_assert_(node->InAnalysis(analysis_type));
+		node->OffsetDofs(dofcount,setenum);
 	}
 
@@ -90,7 +88,6 @@
 	for(i=0;i<this->Size();i++){
 		Node* node=xDynamicCast<Node*>(this->GetObjectByOffset(i));
-		if (node->InAnalysis(analysis_type)){
-			node->ShowTrueDofs(truedofs,maxdofspernode,setenum);//give maxdofspernode, column size, so that nodes can index into truedofs
-		}
+		_assert_(node->InAnalysis(analysis_type));
+		node->ShowTrueDofs(truedofs,maxdofspernode,setenum);//give maxdofspernode, column size, so that nodes can index into truedofs
 	}
 
@@ -100,7 +97,6 @@
 	for(i=0;i<this->Size();i++){
 		Node* node=xDynamicCast<Node*>(this->GetObjectByOffset(i));
-		if (node->InAnalysis(analysis_type)){
-			node->UpdateCloneDofs(alltruedofs,maxdofspernode,setenum);
-		}
+		_assert_(node->InAnalysis(analysis_type));
+		node->UpdateCloneDofs(alltruedofs,maxdofspernode,setenum);
 	}
 
@@ -108,7 +104,6 @@
 	for(i=0;i<this->Size();i++){
 		Node* node=xDynamicCast<Node*>(this->GetObjectByOffset(i));
-		if (node->InAnalysis(analysis_type)){
-			node->ReindexingDone();
-		}
+		_assert_(node->InAnalysis(analysis_type));
+		node->ReindexingDone();
 	}
 
@@ -149,11 +144,8 @@
 
 		Node* node=xDynamicCast<Node*>(this->GetObjectByOffset(i));
-
-		/*Check that this node corresponds to our analysis currently being carried out: */
-		if (node->InAnalysis(analysis_type)){
-
-			/*For this object, decide whether it is a clone: */
-			node->SetClone(minranks);
-		}
+		_assert_(node->InAnalysis(analysis_type));
+
+		/*For this object, decide whether it is a clone: */
+		node->SetClone(minranks);
 	}
 
@@ -203,11 +195,8 @@
 
 		Node* node=xDynamicCast<Node*>(this->GetObjectByOffset(i));
-
-		/*Check that this node corresponds to our analysis currently being carried out: */
-		if (node->InAnalysis(analysis_type)){
-
-			numdofs=node->GetNumberOfDofs(NoneApproximationEnum,setenum);
-			if(numdofs>max)max=numdofs;
-		}
+		_assert_(node->InAnalysis(analysis_type));
+
+		numdofs=node->GetNumberOfDofs(NoneApproximationEnum,setenum);
+		if(numdofs>max)max=numdofs;
 	}
 
@@ -239,12 +228,9 @@
 
 		Node* node=xDynamicCast<Node*>(this->GetObjectByOffset(i));
-
-		/*Check that this node corresponds to our analysis currently being carried out: */
-		if (node->InAnalysis(analysis_type)){
-
-			/*Ok, this object is a node, ask it to plug values into partition: */
-			if (!node->IsClone()){
-				numdofs+=node->GetNumberOfDofs(NoneApproximationEnum,setenum);
-			}
+		_assert_(node->InAnalysis(analysis_type));
+
+		/*Ok, this object is a node, ask it to plug values into partition: */
+		if (!node->IsClone()){
+			numdofs+=node->GetNumberOfDofs(NoneApproximationEnum,setenum);
 		}
 	}
@@ -285,11 +271,8 @@
 
 		Node* node=xDynamicCast<Node*>(this->GetObjectByOffset(i));
-
-		/*Check that this node corresponds to our analysis currently being carried out: */
-		if (node->InAnalysis(analysis_type)){
-
-			sid=node->Sid();
-			if (sid>max_sid)max_sid=sid;
-		}
+		_assert_(node->InAnalysis(analysis_type));
+
+		sid=node->Sid();
+		if(sid>max_sid)max_sid=sid;
 	}
 
@@ -317,11 +300,9 @@
 
 		Node* node=xDynamicCast<Node*>(this->GetObjectByOffset(i));
-
-		/*Check that this node corresponds to our analysis currently being carried out: */
-		if (node->InAnalysis(analysis_type)){
-			/*Plug rank into ranks, according to sid: */
-			sid=node->Sid();
-			ranks[sid]=my_rank; 
-		}
+		_assert_(node->InAnalysis(analysis_type));
+
+		/*Plug rank into ranks, according to sid: */
+		sid=node->Sid();
+		ranks[sid]=my_rank; 
 	}
 }
@@ -336,11 +317,9 @@
 
 		Node* node=xDynamicCast<Node*>(this->GetObjectByOffset(i));
-
-		/*Check that this node corresponds to our analysis currently being carried out: */
-		if(node->InAnalysis(analysis_type)){
-			if(node->RequiresDofReindexing()){
-				flag = 1;
-				break;
-			}
+		_assert_(node->InAnalysis(analysis_type));
+
+		if(node->RequiresDofReindexing()){
+			flag = 1;
+			break;
 		}
 	}
Index: /issm/trunk-jpl/src/c/modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp	(revision 23498)
+++ /issm/trunk-jpl/src/c/modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp	(revision 23499)
@@ -191,48 +191,47 @@
 	for(i=0;i<femmodel->nodes->Size();i++){
 		Node* node=xDynamicCast<Node*>(femmodel->nodes->GetObjectByOffset(i));
-		if(node->InAnalysis(configuration_type)){
-
-			/*Reinitialize flags to false*/
-			j=0;
-			while(j<localnumnodes){
-				if(flagsindices[j]>=0){
-					flags[flagsindices[j]] = false;
-					flagsindices[j]        = -1;
-					j++;
-				}
-				else{
-					break;
-				}
-			}
-
-			//for(j=0;j<localnumnodes;j++) flags[j]=false;
-
-			/*Loop over elements that hold node number i*/
-			//if(head_e[node->Lid()]==-1 && head_l[node->Lid()]==-1){
-			//	printf("[%i] vertex %i\n",IssmComm::GetRank(),node->Lid()+1);
-			//}
-			for(j=head_e[node->Lid()];j!=-1;j=next_e[j]){
-				offset=count2offset_e[j];
-				element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(offset));
-				element->SetwiseNodeConnectivity(&d_nz,&o_nz,node,flags,flagsindices,set1enum,set2enum);
-				if(node->IsClone()){
-					connectivity_clone[node->Sid()]+=d_nz+o_nz;
-				}
-				else{
-					d_connectivity[node->Sid()]+=d_nz;
-					o_connectivity[node->Sid()]+=o_nz;
-				}
-			}
-			for(j=head_l[node->Lid()];j!=-1;j=next_l[j]){
-				offset=count2offset_l[j];
-				load=xDynamicCast<Load*>(femmodel->loads->GetObjectByOffset(offset));
-				load->SetwiseNodeConnectivity(&d_nz,&o_nz,node,flags,flagsindices,set1enum,set2enum);
-				if(node->IsClone()){
-					connectivity_clone[node->Sid()]+=d_nz+o_nz;
-				}
-				else{
-					d_connectivity[node->Sid()]+=d_nz;
-					o_connectivity[node->Sid()]+=o_nz;
-				}
+		_assert_(node->InAnalysis(configuration_type));
+
+		/*Reinitialize flags to false*/
+		j=0;
+		while(j<localnumnodes){
+			if(flagsindices[j]>=0){
+				flags[flagsindices[j]] = false;
+				flagsindices[j]        = -1;
+				j++;
+			}
+			else{
+				break;
+			}
+		}
+
+		//for(j=0;j<localnumnodes;j++) flags[j]=false;
+
+		/*Loop over elements that hold node number i*/
+		//if(head_e[node->Lid()]==-1 && head_l[node->Lid()]==-1){
+		//	printf("[%i] vertex %i\n",IssmComm::GetRank(),node->Lid()+1);
+		//}
+		for(j=head_e[node->Lid()];j!=-1;j=next_e[j]){
+			offset=count2offset_e[j];
+			element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(offset));
+			element->SetwiseNodeConnectivity(&d_nz,&o_nz,node,flags,flagsindices,set1enum,set2enum);
+			if(node->IsClone()){
+				connectivity_clone[node->Sid()]+=d_nz+o_nz;
+			}
+			else{
+				d_connectivity[node->Sid()]+=d_nz;
+				o_connectivity[node->Sid()]+=o_nz;
+			}
+		}
+		for(j=head_l[node->Lid()];j!=-1;j=next_l[j]){
+			offset=count2offset_l[j];
+			load=xDynamicCast<Load*>(femmodel->loads->GetObjectByOffset(offset));
+			load->SetwiseNodeConnectivity(&d_nz,&o_nz,node,flags,flagsindices,set1enum,set2enum);
+			if(node->IsClone()){
+				connectivity_clone[node->Sid()]+=d_nz+o_nz;
+			}
+			else{
+				d_connectivity[node->Sid()]+=d_nz;
+				o_connectivity[node->Sid()]+=o_nz;
 			}
 		}
@@ -257,5 +256,6 @@
 		for(i=0;i<femmodel->nodes->Size();i++){
 			Node* node=xDynamicCast<Node*>(femmodel->nodes->GetObjectByOffset(i));
-			if(node->InAnalysis(configuration_type) && !node->IsClone()){
+			if(!node->IsClone()){
+				_assert_(node->InAnalysis(configuration_type));
 				for(j=0;j<node->indexing.fsize;j++){
 					_assert_(count<m);
Index: /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp	(revision 23498)
+++ /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp	(revision 23499)
@@ -33,7 +33,6 @@
 	for(int i=0;i<nodes->Size();i++){
 		Node* node=(Node*)nodes->GetObjectByOffset(i);
-		if (node->InAnalysis(configuration_type)){
-			node->CreateNodalConstraints(ys);
-		}
+		_assert_(node->InAnalysis(configuration_type));
+		node->CreateNodalConstraints(ys);
 	}
 
Index: /issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp	(revision 23498)
+++ /issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp	(revision 23499)
@@ -44,13 +44,9 @@
 			/*Go through all nodes, and ask them to retrieve values from ug, and plug them into uf: */
 			for(int i=0;i<nodes->Size();i++){
+				Node* node=(Node*)nodes->GetObjectByOffset(i);
+				_assert_(node->InAnalysis(configuration_type));
 
-				Node* node=(Node*)nodes->GetObjectByOffset(i);
-
-				/*Check that this node corresponds to our analysis currently being carried out: */
-				if (node->InAnalysis(configuration_type)){
-
-					/*For this object, reduce values for enum set Fset: */
-					node->VecReduce(uf,ug_serial,FsetEnum);
-				}
+				/*For this object, reduce values for enum set Fset: */
+				node->VecReduce(uf,ug_serial,FsetEnum);
 			}
 		}
Index: /issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.cpp	(revision 23498)
+++ /issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.cpp	(revision 23499)
@@ -27,11 +27,8 @@
 
 			Node* node=(Node*)nodes->GetObjectByOffset(i);
+			_assert_(node->InAnalysis(configuration_type));
 
-			/*Check that this node corresponds to our configuration currently being carried out: */
-			if (node->InAnalysis(configuration_type)){
-
-				/*For this object, merge values for enum set SetEnum: */
-				node->VecMerge(ug,uf_serial,SetEnum);
-			}
+			/*For this object, merge values for enum set SetEnum: */
+			node->VecMerge(ug,uf_serial,SetEnum);
 		}
 	}