Index: /issm/trunk-jpl/src/c/classes/Constraints/Constraint.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/Constraint.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Constraints/Constraint.h	(revision 23588)
@@ -22,5 +22,4 @@
 		virtual void ActivatePenaltyMethod(void)=0;
 		virtual void ConstrainNode(Nodes* nodes,Parameters* parameters)=0;
-		virtual bool InAnalysis(int analysis_type)=0;
 		virtual void PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters)=0;
 		virtual void InputUpdateFromVectorDakota(IssmDouble* vector,Nodes* nodes,int name,int type) = 0;
Index: /issm/trunk-jpl/src/c/classes/Constraints/Constraints.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/Constraints.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Constraints/Constraints.cpp	(revision 23588)
@@ -24,7 +24,5 @@
 	for(int i=0;i<this->Size();i++){
 		Constraint* constraint=(Constraint*)this->GetObjectByOffset(i);
-		if(constraint->InAnalysis(in_analysis)){
-			constraint->ActivatePenaltyMethod();
-		}
+		constraint->ActivatePenaltyMethod();
 	}
 
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp	(revision 23588)
@@ -112,9 +112,4 @@
 }
 /*}}}*/
-bool SpcDynamic::InAnalysis(int in_analysis_type){/*{{{*/
-	if (in_analysis_type==this->analysis_type) return true;
-	else return false;
-}
-/*}}}*/
 
 /*SpcDynamic functions*/
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h	(revision 23588)
@@ -40,5 +40,4 @@
 		void ActivatePenaltyMethod(void);
 		void ConstrainNode(Nodes* nodes,Parameters* parameters);
-		bool InAnalysis(int analysis_type);
 		void PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters){_error_("not implemented yet");};
 		void InputUpdateFromVectorDakota(IssmDouble* vector,Nodes* nodes,int name,int type){_error_("not implemented yet");};
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp	(revision 23588)
@@ -109,9 +109,4 @@
 }
 /*}}}*/
-bool SpcStatic::InAnalysis(int in_analysis_type){/*{{{*/
-	if (in_analysis_type==this->analysis_type) return true;
-	else return false;
-}
-/*}}}*/
 void SpcStatic::InputUpdateFromVectorDakota(IssmDouble* vector,Nodes* nodes,int name,int type){/*{{{*/
 
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.h	(revision 23588)
@@ -39,5 +39,4 @@
 		void ActivatePenaltyMethod(void);
 		void ConstrainNode(Nodes* nodes,Parameters* parameters);
-		bool InAnalysis(int analysis_type);
 		void PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters){_error_("not implemented yet");};
 		void InputUpdateFromVectorDakota(IssmDouble* vector,Nodes* nodes,int name,int type);
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp	(revision 23588)
@@ -159,10 +159,4 @@
 }
 /*}}}*/
-bool SpcTransient::InAnalysis(int in_analysis_type){/*{{{*/
-
-	if (in_analysis_type==this->analysis_type) return true;
-	else return false;
-}
-/*}}}*/
 void SpcTransient::PenaltyDofAndValue(int* pdof,IssmDouble* pvalue,Nodes* nodes,Parameters* parameters){/*{{{*/
 
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h	(revision 23588)
@@ -41,5 +41,4 @@
 		void   ActivatePenaltyMethod(void);
 		void   ConstrainNode(Nodes* nodes,Parameters* parameters);
-		bool   InAnalysis(int analysis_type);
 		void   PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters);
 		void InputUpdateFromVectorDakota(IssmDouble* vector,Nodes* nodes,int name,int type){_error_("not implemented yet");};
Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 23588)
@@ -3443,5 +3443,4 @@
 
 		Constraint* constraint=(Constraint*)this->constraints_list[analysis_index]->GetObjectByOffset(i);
-		if(!constraint->InAnalysis(analysis_enum)) _error_("AMR create constraints for "<<EnumToStringx(analysis_enum)<<" not supported yet!\n");
 
 		SpcStatic* spcstatic = xDynamicCast<SpcStatic*>(constraint);
@@ -4543,5 +4542,4 @@
 	for (int i=0;i<nodes->Size();i++){
 		Node* node=xDynamicCast<Node*>(nodes->GetObjectByOffset(i));
-		_assert_(node->InAnalysis(HydrologyDCEfficientAnalysisEnum));
 		if(serial_active[node->Sid()]==1.){
 			node->Activate();
@@ -4616,5 +4614,4 @@
 	for (int i=0;i<nodes->Size();i++){
 		Node* node=xDynamicCast<Node*>(nodes->GetObjectByOffset(i));
-		_assert_(node->InAnalysis(HydrologyDCInefficientAnalysisEnum));
 		if(serial_active[node->Sid()]==1.){
 			node->Activate();
@@ -4665,5 +4662,4 @@
 	for (int i=0;i<nodes->Size();i++){
 		Node* node=xDynamicCast<Node*>(nodes->GetObjectByOffset(i));
-		_assert_(node->InAnalysis(L2ProjectionEPLAnalysisEnum));
 		if(serial_active[node->Sid()]==1.){
 			node->Activate();
Index: /issm/trunk-jpl/src/c/classes/Loads/Load.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Load.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Load.h	(revision 23588)
@@ -31,5 +31,4 @@
 		virtual void  GetNodesSidList(int* sidlist)=0;
 		virtual int   GetNumberOfNodes(void)=0;
-		virtual bool  InAnalysis(int analysis_type)=0;
 		virtual bool  IsPenalty(void)=0;
 		virtual void  PenaltyCreateJacobianMatrix(Matrix<IssmDouble>* Jff,IssmDouble kmax)=0;
Index: /issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp	(revision 23588)
@@ -219,9 +219,4 @@
 
 	return NUMVERTICES;
-}
-/*}}}*/
-bool  Moulin::InAnalysis(int in_analysis_type){/*{{{*/
-	if (in_analysis_type==this->analysis_type)return true;
-	else return false;
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Loads/Moulin.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Moulin.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Moulin.h	(revision 23588)
@@ -70,5 +70,4 @@
 		void  GetNodesLidList(int* lidlist);
 		int   GetNumberOfNodes(void);
-		bool  InAnalysis(int analysis_type);
 		bool  IsPenalty(void);
 		void  PenaltyCreateJacobianMatrix(Matrix<IssmDouble>* Jff,IssmDouble kmax){_error_("Not implemented yet");};
Index: /issm/trunk-jpl/src/c/classes/Loads/Neumannflux.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Neumannflux.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Neumannflux.cpp	(revision 23588)
@@ -246,9 +246,4 @@
 
 	return NUMNODES_BOUNDARY;
-}
-/*}}}*/
-bool  Neumannflux::InAnalysis(int in_analysis_type){/*{{{*/
-	if (in_analysis_type==this->analysis_type) return true;
-	else return false;
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Loads/Neumannflux.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Neumannflux.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Neumannflux.h	(revision 23588)
@@ -63,5 +63,4 @@
 		void GetNodesSidList(int* sidlist);
 		int  GetNumberOfNodes(void);
-		bool InAnalysis(int analysis_type);
 		bool IsPenalty(void);
 		void PenaltyCreateJacobianMatrix(Matrix<IssmDouble>* Jff,IssmDouble kmax){_error_("Not implemented yet");};
Index: /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp	(revision 23588)
@@ -345,9 +345,4 @@
 	}
 
-}
-/*}}}*/
-bool  Numericalflux::InAnalysis(int in_analysis_type){/*{{{*/
-	if (in_analysis_type==this->analysis_type) return true;
-	else return false;
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Numericalflux.h	(revision 23588)
@@ -64,5 +64,4 @@
 		void GetNodesSidList(int* sidlist);
 		int  GetNumberOfNodes(void);
-		bool InAnalysis(int analysis_type);
 		bool IsPenalty(void);
 		void PenaltyCreateJacobianMatrix(Matrix<IssmDouble>* Jff,IssmDouble kmax){_error_("Not implemented yet");};
Index: /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp	(revision 23588)
@@ -217,9 +217,4 @@
 
 	return NUMVERTICES;
-}
-/*}}}*/
-bool  Pengrid::InAnalysis(int in_analysis_type){/*{{{*/
-	if (in_analysis_type==this->analysis_type)return true;
-	else return false;
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Loads/Pengrid.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Pengrid.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Pengrid.h	(revision 23588)
@@ -65,5 +65,4 @@
 		void  GetNodesSidList(int* sidlist);
 		int   GetNumberOfNodes(void);
-		bool  InAnalysis(int analysis_type);
 		bool  IsPenalty(void);
 		void  PenaltyCreateJacobianMatrix(Matrix<IssmDouble>* Jff,IssmDouble kmax){_error_("Not implemented yet");};
Index: /issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp	(revision 23588)
@@ -165,9 +165,4 @@
 
 	return NUMVERTICES;
-}
-/*}}}*/
-bool  Penpair::InAnalysis(int in_analysis_type){/*{{{*/
-	if (in_analysis_type==this->analysis_type)return true;
-	else return false;
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Loads/Penpair.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Penpair.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Penpair.h	(revision 23588)
@@ -55,5 +55,4 @@
 		void  GetNodesSidList(int* sidlist);
 		int   GetNumberOfNodes(void);
-		bool  InAnalysis(int analysis_type);
 		bool  IsPenalty(void);
 		void  PenaltyCreateJacobianMatrix(Matrix<IssmDouble>* Jff,IssmDouble kmax);
Index: /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp	(revision 23588)
@@ -306,9 +306,4 @@
 
 	return NUMVERTICES;
-}
-/*}}}*/
-bool  Riftfront::InAnalysis(int in_analysis_type){/*{{{*/
-	if (in_analysis_type==this->analysis_type) return true;
-	else return false;
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Loads/Riftfront.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Loads/Riftfront.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Loads/Riftfront.h	(revision 23588)
@@ -81,5 +81,4 @@
 		void  GetNodesSidList(int* sidlist);
 		int   GetNumberOfNodes(void);
-		bool  InAnalysis(int analysis_type);
 		bool  IsPenalty(void);
 		void  PenaltyCreateJacobianMatrix(Matrix<IssmDouble>* Jff,IssmDouble kmax){_error_("Not implemented yet");};
Index: /issm/trunk-jpl/src/c/classes/Node.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Node.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Node.cpp	(revision 23588)
@@ -395,9 +395,4 @@
 }
 /*}}}*/
-bool Node::InAnalysis(int in_analysis_enum){/*{{{*/
-	if (in_analysis_enum==this->analysis_enum) return true;
-	else return false;
-}
-/*}}}*/
 int  Node::Lid(void){/*{{{*/
 	return lid; 
Index: /issm/trunk-jpl/src/c/classes/Node.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Node.h	(revision 23587)
+++ /issm/trunk-jpl/src/c/classes/Node.h	(revision 23588)
@@ -68,5 +68,4 @@
 		int   GetNumberOfDofs(int approximation_enum,int setenum);
 		void  HardDeactivate(void);
-		bool  InAnalysis(int analysis_enum);
 		bool  IsActive(void);
 		int   IsClone();
Index: /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp	(revision 23588)
@@ -30,5 +30,4 @@
 	for(i=0;i<loads->Size();i++){
 		load=(Load*)loads->GetObjectByOffset(i);
-		_assert_(load->InAnalysis(configuration_type));
 		load->Configure(elements,loads,nodes,vertices,materials,parameters);
 	}
Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp	(revision 23588)
@@ -33,5 +33,4 @@
 	for(int i=0;i<femmodel->loads->Size();i++){
 		Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
-		_assert_(load->InAnalysis(analysis_type));
 		if(load->ObjectEnum()==PengridEnum){
 			Pengrid* pengrid=(Pengrid*)load;
Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp	(revision 23588)
@@ -20,5 +20,4 @@
 	for (i=0;i<loads->Size();i++){
 		Load* load=(Load*)loads->GetObjectByOffset(i);
-		_assert_(load->InAnalysis(configuration_type)); 
 		if(RiftfrontEnum==loads->GetEnum(i)){
 			found=1;
@@ -76,5 +75,4 @@
 
 			load=(Load*)loads->GetObjectByOffset(i);
-			_assert_(load->InAnalysis(configuration_type)); 
 			riftfront=(Riftfront*)load;
 			riftfront->Constrain(&unstable);
@@ -109,5 +107,4 @@
 
 			load=(Load*)loads->GetObjectByOffset(i);
-			_assert_(load->InAnalysis(configuration_type)); 
 			riftfront=(Riftfront*)load;
 			if (riftfront->IsFrozen()){
@@ -140,5 +137,4 @@
 		if (RiftfrontEnum==loads->GetEnum(i)){
 			load=(Load*)loads->GetObjectByOffset(i);
-			_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 23587)
+++ /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp	(revision 23588)
@@ -36,5 +36,4 @@
 	for (i=0;i<femmodel->loads->Size();i++){
 		load=(Load*)femmodel->loads->GetObjectByOffset(i);
-		_assert_(load->InAnalysis(configuration_type));
 		load->CreateJacobianMatrix(Jff);
 		load->PenaltyCreateJacobianMatrix(Jff,kmax);
Index: /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp	(revision 23588)
@@ -31,5 +31,4 @@
 	for(int i=0;i<femmodel->loads->Size();i++){
 		Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
-		_assert_(load->InAnalysis(analysis_type));
 		if(load->ObjectEnum()==PengridEnum){
 			Pengrid* pengrid=(Pengrid*)load;
Index: /issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp	(revision 23588)
@@ -20,13 +20,7 @@
 
 	for(int i=0;i<constraints->Size();i++){
+		Constraint* constraint=(Constraint*)constraints->GetObjectByOffset(i);
+		((SpcDynamic*)constraint)->SetDynamicConstraint(nodes,yg_serial);
 
-		Constraint* constraint=(Constraint*)constraints->GetObjectByOffset(i);
-
-		/*Check this constraint belongs to this analysis: */
-		if(constraint->InAnalysis(configuration_type) && constraint->ObjectEnum()==SpcDynamicEnum){
-
-			((SpcDynamic*)constraint)->SetDynamicConstraint(nodes,yg_serial);
-
-		}
 	}
 
Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp	(revision 23587)
+++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp	(revision 23588)
@@ -105,9 +105,7 @@
 	for(int i=0;i<femmodel->constraints->Size();i++){
 		Constraint* constraint=(Constraint*)femmodel->constraints->GetObjectByOffset(i);
-		if(constraint->InAnalysis(configuration_type)){
-			constraint->PenaltyDofAndValue(&dof,&d,femmodel->nodes,femmodel->parameters);
-			if(dof!=-1){
-				MatSetValue(LHS,dof,dof,dmax,INSERT_VALUES);
-			}
+		constraint->PenaltyDofAndValue(&dof,&d,femmodel->nodes,femmodel->parameters);
+		if(dof!=-1){
+			MatSetValue(LHS,dof,dof,dmax,INSERT_VALUES);
 		}
 	}
@@ -151,10 +149,8 @@
 	for(int i=0;i<femmodel->constraints->Size();i++){
 		Constraint* constraint=(Constraint*)femmodel->constraints->GetObjectByOffset(i);
-		if(constraint->InAnalysis(configuration_type)){
-			constraint->PenaltyDofAndValue(&dof,&d,femmodel->nodes,femmodel->parameters);
-			d = d*dmax;
-			if(dof!=-1){
-				VecSetValues(RHS,1,&dof,(const double*)&d,INSERT_VALUES);
-			}
+		constraint->PenaltyDofAndValue(&dof,&d,femmodel->nodes,femmodel->parameters);
+		d = d*dmax;
+		if(dof!=-1){
+			VecSetValues(RHS,1,&dof,(const double*)&d,INSERT_VALUES);
 		}
 	}