Index: /issm/trunk-jpl/src/c/classes/Loads/Loads.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Loads.cpp	(revision 23489)
+++ /issm/trunk-jpl/src/c/classes/Loads/Loads.cpp	(revision 23490)
@@ -55,9 +55,7 @@
 	/*Now go through all loads, and get how many nodes they own, unless they are clone nodes: */
 	for(int i=0;i<this->Size();i++){
-
 		Load* load=xDynamicCast<Load*>(this->GetObjectByOffset(i));
-		if (load->InAnalysis(analysis_type)){
-			if(load->IsPenalty()) ispenalty++;
-		}
+		_assert_(load->InAnalysis(analysis_type)); 
+		if(load->IsPenalty()) ispenalty++;
 	}
 
@@ -82,8 +80,7 @@
 
 		Load* load=xDynamicCast<Load*>(this->GetObjectByOffset(i));
-		if (load->InAnalysis(analysis_type)){
-			numnodes=load->GetNumberOfNodes();
-			if(numnodes>max)max=numnodes;
-		}
+		_assert_(load->InAnalysis(analysis_type));
+		numnodes=load->GetNumberOfNodes();
+		if(numnodes>max)max=numnodes;
 	}
 
Index: /issm/trunk-jpl/src/c/modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp	(revision 23489)
+++ /issm/trunk-jpl/src/c/modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp	(revision 23490)
@@ -158,5 +158,5 @@
 	for(i=0;i<femmodel->loads->Size();i++){
 		load = xDynamicCast<Load*>(femmodel->loads->GetObjectByOffset(i));
-		if(!load->InAnalysis(configuration_type)) continue;
+		_assert_(load->InAnalysis(configuration_type));
 		lidlist = xNew<int>(load->GetNumberOfNodes());
 		load->GetNodesLidList(lidlist);
Index: /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp	(revision 23489)
+++ /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp	(revision 23490)
@@ -30,7 +30,6 @@
 	for(i=0;i<loads->Size();i++){
 		load=(Load*)loads->GetObjectByOffset(i);
-		if (load->InAnalysis(configuration_type)){
-			load->Configure(elements,loads,nodes,vertices,materials,parameters);
-		}
+		_assert_(load->InAnalysis(configuration_type));
+		load->Configure(elements,loads,nodes,vertices,materials,parameters);
 	}
 	if(VerboseMProcessor()) _printf0_("      Configuring materials...\n");
Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp	(revision 23489)
+++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp	(revision 23490)
@@ -33,10 +33,9 @@
 	for(int i=0;i<femmodel->loads->Size();i++){
 		Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
-		if(load->InAnalysis(analysis_type)){
-			if(load->ObjectEnum()==PengridEnum){
-				Pengrid* pengrid=(Pengrid*)load;
-				pengrid->ConstraintActivate(&unstable);
-				num_unstable_constraints += unstable;
-			}
+		_assert_(load->InAnalysis(analysis_type));
+		if(load->ObjectEnum()==PengridEnum){
+			Pengrid* pengrid=(Pengrid*)load;
+			pengrid->ConstraintActivate(&unstable);
+			num_unstable_constraints += unstable;
 		}
 	}
Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp	(revision 23489)
+++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp	(revision 23490)
@@ -20,9 +20,8 @@
 	for (i=0;i<loads->Size();i++){
 		Load* load=(Load*)loads->GetObjectByOffset(i);
-		if(load->InAnalysis(configuration_type)){
-			if(RiftfrontEnum==loads->GetEnum(i)){
-				found=1;
-				break;
-			}
+		_assert_(load->InAnalysis(configuration_type)); 
+		if(RiftfrontEnum==loads->GetEnum(i)){
+			found=1;
+			break;
 		}
 	}
@@ -77,12 +76,8 @@
 
 			load=(Load*)loads->GetObjectByOffset(i);
-			if(load->InAnalysis(configuration_type)){
-
-				riftfront=(Riftfront*)load;
-
-				riftfront->Constrain(&unstable);
-
-				num_unstable_constraints+=unstable;
-			}
+			_assert_(load->InAnalysis(configuration_type)); 
+			riftfront=(Riftfront*)load;
+			riftfront->Constrain(&unstable);
+			num_unstable_constraints+=unstable;
 		}
 	}
@@ -114,11 +109,9 @@
 
 			load=(Load*)loads->GetObjectByOffset(i);
-			if(load->InAnalysis(configuration_type)){
-
-				riftfront=(Riftfront*)load;
-				if (riftfront->IsFrozen()){
-					found=1;
-					break;
-				}
+			_assert_(load->InAnalysis(configuration_type)); 
+			riftfront=(Riftfront*)load;
+			if (riftfront->IsFrozen()){
+				found=1;
+				break;
 			}
 		}
@@ -146,12 +139,8 @@
 
 		if (RiftfrontEnum==loads->GetEnum(i)){
-
 			load=(Load*)loads->GetObjectByOffset(i);
-			if(load->InAnalysis(configuration_type)){
-
-				riftfront=(Riftfront*)load;
-				riftfront->FreezeConstraints();
-			}
-
+			_assert_(load->InAnalysis(configuration_type)); 
+			riftfront=(Riftfront*)load;
+			riftfront->FreezeConstraints();
 		}
 	}
Index: /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp	(revision 23489)
+++ /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp	(revision 23490)
@@ -36,6 +36,7 @@
 	for (i=0;i<femmodel->loads->Size();i++){
 		load=(Load*)femmodel->loads->GetObjectByOffset(i);
-		if(load->InAnalysis(configuration_type)) load->CreateJacobianMatrix(Jff);
-		if(load->InAnalysis(configuration_type)) load->PenaltyCreateJacobianMatrix(Jff,kmax);
+		_assert_(load->InAnalysis(configuration_type));
+		load->CreateJacobianMatrix(Jff);
+		load->PenaltyCreateJacobianMatrix(Jff,kmax);
 	}
 	Jff->Assemble();
Index: /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp	(revision 23489)
+++ /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp	(revision 23490)
@@ -31,9 +31,8 @@
 	for(int i=0;i<femmodel->loads->Size();i++){
 		Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
-		if(load->InAnalysis(analysis_type)){
-			if(load->ObjectEnum()==PengridEnum){
-				Pengrid* pengrid=(Pengrid*)load;
-				pengrid->ResetConstraint();
-			}
+		_assert_(load->InAnalysis(analysis_type));
+		if(load->ObjectEnum()==PengridEnum){
+			Pengrid* pengrid=(Pengrid*)load;
+			pengrid->ResetConstraint();
 		}
 	}
Index: /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp	(revision 23489)
+++ /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp	(revision 23490)
@@ -54,5 +54,6 @@
 		for (i=0;i<femmodel->loads->Size();i++){
 			load=xDynamicCast<Load*>(femmodel->loads->GetObjectByOffset(i));
-			if(load->InAnalysis(configuration_type)) load->CreateKMatrix(Kff_temp,NULL);
+			_assert_(load->InAnalysis(configuration_type)); 
+			load->CreateKMatrix(Kff_temp,NULL);
 		}
 		Kff_temp->Assemble();
@@ -89,8 +90,7 @@
 	for(i=0;i<femmodel->loads->Size();i++){
 		load=xDynamicCast<Load*>(femmodel->loads->GetObjectByOffset(i));
-		if(load->InAnalysis(configuration_type)){
-			load->CreateKMatrix(Kff,Kfs);
-			load->CreatePVector(pf);
-		}
+		_assert_(load->InAnalysis(configuration_type));
+		load->CreateKMatrix(Kff,Kfs);
+		load->CreatePVector(pf);
 	}