Index: /issm/trunk-jpl/src/c/classes/Constraints/Constraint.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/Constraint.h	(revision 18930)
+++ /issm/trunk-jpl/src/c/classes/Constraints/Constraint.h	(revision 18931)
@@ -20,8 +20,8 @@
 
 		virtual      ~Constraint(){};
+		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 bool InAnalysis(int analysis_type)=0;
-		virtual void ActivatePenaltyMethod(void)=0;
 
 };
Index: /issm/trunk-jpl/src/c/classes/Constraints/Constraints.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/Constraints.cpp	(revision 18930)
+++ /issm/trunk-jpl/src/c/classes/Constraints/Constraints.cpp	(revision 18931)
@@ -20,5 +20,16 @@
 
 /*Numerics: */
-int Constraints::NumberOfConstraints(void){/*{{{*/
+void Constraints::ActivatePenaltyMethod(int in_analysis){/*{{{*/
+
+	for(int i=0;i<this->Size();i++){
+		Constraint* constraint=(Constraint*)this->GetObjectByOffset(i);
+		if(constraint->InAnalysis(in_analysis)){
+			constraint->ActivatePenaltyMethod();
+		}
+	}
+
+}
+/*}}}*/
+int  Constraints::NumberOfConstraints(void){/*{{{*/
 
 	int localconstraints;
@@ -35,13 +46,2 @@
 }
 /*}}}*/
-void Constraints::ActivatePenaltyMethod(int in_analysis){/*{{{*/
-
-	for(int i=0;i<this->Size();i++){
-		Constraint* constraint=(Constraint*)this->GetObjectByOffset(i);
-		if(constraint->InAnalysis(in_analysis)){
-			constraint->ActivatePenaltyMethod();
-		}
-	}
-
-}
-/*}}}*/
Index: /issm/trunk-jpl/src/c/classes/Constraints/Constraints.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/Constraints.h	(revision 18930)
+++ /issm/trunk-jpl/src/c/classes/Constraints/Constraints.h	(revision 18931)
@@ -27,6 +27,6 @@
 
 		/*numerics*/
+		void ActivatePenaltyMethod(int in_analysis);
 		int  NumberOfConstraints(void);
-		void ActivatePenaltyMethod(int in_analysis);
 
 };
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp	(revision 18930)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp	(revision 18931)
@@ -37,30 +37,4 @@
 
 /*Object virtual functions definitions:*/
-void SpcDynamic::Echo(void){/*{{{*/
-
-	_printf_("SpcDynamic:\n");
-	_printf_("   sid: " << sid << "\n");
-	_printf_("   nodeid: " << nodeid << "\n");
-	_printf_("   dof: " << dof << "\n");
-	_printf_("   value: " << value << "\n");
-	_printf_("   isset: " <<(isset?"true":"false") << "\n");
-	_printf_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
-	return;
-}
-/*}}}*/
-void SpcDynamic::DeepEcho(void){/*{{{*/
-
-	this->Echo();
-	return;
-}		
-/*}}}*/
-int SpcDynamic::Id(void){ return sid; }/*{{{*/
-/*}}}*/
-int SpcDynamic::ObjectEnum(void){/*{{{*/
-
-	return SpcDynamicEnum;
-
-}
-/*}}}*/
 Object* SpcDynamic::copy() {/*{{{*/
 
@@ -77,13 +51,34 @@
 }
 /*}}}*/
+void    SpcDynamic::DeepEcho(void){/*{{{*/
+
+	this->Echo();
+	return;
+}		
+/*}}}*/
+void    SpcDynamic::Echo(void){/*{{{*/
+
+	_printf_("SpcDynamic:\n");
+	_printf_("   sid: " << sid << "\n");
+	_printf_("   nodeid: " << nodeid << "\n");
+	_printf_("   dof: " << dof << "\n");
+	_printf_("   value: " << value << "\n");
+	_printf_("   isset: " <<(isset?"true":"false") << "\n");
+	_printf_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
+	return;
+}
+/*}}}*/
+int     SpcDynamic::Id(void){ return sid; }/*{{{*/
+/*}}}*/
+int     SpcDynamic::ObjectEnum(void){/*{{{*/
+
+	return SpcDynamicEnum;
+
+}
+/*}}}*/
 
 /*Constraint virtual functions definitions: */
 void SpcDynamic::ActivatePenaltyMethod(void){/*{{{*/
 	this->penalty = true;
-}
-/*}}}*/
-bool SpcDynamic::InAnalysis(int in_analysis_type){/*{{{*/
-	if (in_analysis_type==this->analysis_type) return true;
-	else return false;
 }
 /*}}}*/
@@ -103,11 +98,16 @@
 }
 /*}}}*/
+bool SpcDynamic::InAnalysis(int in_analysis_type){/*{{{*/
+	if (in_analysis_type==this->analysis_type) return true;
+	else return false;
+}
+/*}}}*/
 
 /*SpcDynamic functions*/
-int SpcDynamic::GetDof(){/*{{{*/
+int        SpcDynamic::GetDof(){/*{{{*/
 	return dof;
 }
 /*}}}*/
-int   SpcDynamic::GetNodeId(){/*{{{*/
+int        SpcDynamic::GetNodeId(){/*{{{*/
 
 	return nodeid;
@@ -120,5 +120,5 @@
 }
 /*}}}*/
-void SpcDynamic::SetDynamicConstraint(Nodes* nodes,IssmDouble* yg_serial){/*{{{*/
+void       SpcDynamic::SetDynamicConstraint(Nodes* nodes,IssmDouble* yg_serial){/*{{{*/
 
 	int pos;
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h	(revision 18930)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h	(revision 18931)
@@ -30,19 +30,19 @@
 
 		/*Object virtual functions definitions*/
+		Object *copy();
+		void    DeepEcho();
 		void    Echo();
-		void    DeepEcho();
 		int     Id();
 		int     ObjectEnum();
-		Object *copy();
 
 		/*Constraint virtual functions definitions*/
+		void ActivatePenaltyMethod(void);
 		void ConstrainNode(Nodes* nodes,Parameters* parameters);
 		bool InAnalysis(int analysis_type);
-		void ActivatePenaltyMethod(void);
 		void PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters){_error_("not implemented yet");};
 
 		/*SpcDynamic management*/
+		int        GetDof();
 		int        GetNodeId();
-		int        GetDof();
 		IssmDouble GetValue();
 		void       SetDynamicConstraint(Nodes  *nodes,IssmDouble *yg_serial);
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp	(revision 18930)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp	(revision 18931)
@@ -36,34 +36,4 @@
 
 /*Object virtual functions definitions:*/
-void SpcStatic::Echo(void){/*{{{*/
-
-	_printf_("SpcStatic:\n");
-	_printf_("   sid: " << sid << "\n");
-	_printf_("   nodeid: " << nodeid << "\n");
-	_printf_("   dof: " << dof << "\n");
-	_printf_("   value: " << value << "\n");
-	_printf_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
-	return;
-}
-/*}}}*/
-void SpcStatic::DeepEcho(void){/*{{{*/
-
-	_printf_("SpcStatic:\n");
-	_printf_("   sid: " << sid << "\n");
-	_printf_("   nodeid: " << nodeid << "\n");
-	_printf_("   dof: " << dof << "\n");
-	_printf_("   value: " << value << "\n");
-	_printf_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
-	return;
-}		
-/*}}}*/
-int SpcStatic::Id(void){ return sid; }/*{{{*/
-/*}}}*/
-int SpcStatic::ObjectEnum(void){/*{{{*/
-
-	return SpcStaticEnum;
-
-}
-/*}}}*/
 Object* SpcStatic::copy() {/*{{{*/
 	
@@ -79,13 +49,38 @@
 }
 /*}}}*/
+void    SpcStatic::DeepEcho(void){/*{{{*/
+
+	_printf_("SpcStatic:\n");
+	_printf_("   sid: " << sid << "\n");
+	_printf_("   nodeid: " << nodeid << "\n");
+	_printf_("   dof: " << dof << "\n");
+	_printf_("   value: " << value << "\n");
+	_printf_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
+	return;
+}		
+/*}}}*/
+void    SpcStatic::Echo(void){/*{{{*/
+
+	_printf_("SpcStatic:\n");
+	_printf_("   sid: " << sid << "\n");
+	_printf_("   nodeid: " << nodeid << "\n");
+	_printf_("   dof: " << dof << "\n");
+	_printf_("   value: " << value << "\n");
+	_printf_("   analysis_type: " << EnumToStringx(analysis_type) << "\n");
+	return;
+}
+/*}}}*/
+int     SpcStatic::Id(void){ return sid; }/*{{{*/
+/*}}}*/
+int     SpcStatic::ObjectEnum(void){/*{{{*/
+
+	return SpcStaticEnum;
+
+}
+/*}}}*/
 
 /*Constraint virtual functions definitions: */
 void SpcStatic::ActivatePenaltyMethod(void){/*{{{*/
 	   this->penalty = true;
-}
-/*}}}*/
-bool SpcStatic::InAnalysis(int in_analysis_type){/*{{{*/
-	if (in_analysis_type==this->analysis_type) return true;
-	else return false;
 }
 /*}}}*/
@@ -103,11 +98,16 @@
 }
 /*}}}*/
+bool SpcStatic::InAnalysis(int in_analysis_type){/*{{{*/
+	if (in_analysis_type==this->analysis_type) return true;
+	else return false;
+}
+/*}}}*/
 
 /*SpcStatic functions*/
-int SpcStatic::GetDof(){/*{{{*/
+int        SpcStatic::GetDof(){/*{{{*/
 	return dof;
 }
 /*}}}*/
-int   SpcStatic::GetNodeId(){/*{{{*/
+int        SpcStatic::GetNodeId(){/*{{{*/
 
 	return nodeid;
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp	(revision 18930)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp	(revision 18931)
@@ -51,5 +51,13 @@
 
 /*Object virtual functions definitions:*/
-void SpcTransient::Echo(void){/*{{{*/
+Object* SpcTransient::copy() {/*{{{*/
+	return new SpcTransient(sid,nodeid,dof,nsteps,times,values,analysis_type);
+}
+/*}}}*/
+void    SpcTransient::DeepEcho(void){/*{{{*/
+	this->Echo();
+}		
+/*}}}*/
+void    SpcTransient::Echo(void){/*{{{*/
 
 	int i;
@@ -67,20 +75,12 @@
 }
 /*}}}*/
-void SpcTransient::DeepEcho(void){/*{{{*/
-	this->Echo();
-}		
-/*}}}*/
-int  SpcTransient::Id(void){/*{{{*/
+int     SpcTransient::Id(void){/*{{{*/
 	return sid;
 }
 /*}}}*/
-int SpcTransient::ObjectEnum(void){/*{{{*/
+int     SpcTransient::ObjectEnum(void){/*{{{*/
 
 	return SpcTransientEnum;
 
-}
-/*}}}*/
-Object* SpcTransient::copy() {/*{{{*/
-	return new SpcTransient(sid,nodeid,dof,nsteps,times,values,analysis_type);
 }
 /*}}}*/
@@ -89,10 +89,4 @@
 void SpcTransient::ActivatePenaltyMethod(void){/*{{{*/
 	   this->penalty = true;
-}
-/*}}}*/
-bool SpcTransient::InAnalysis(int in_analysis_type){/*{{{*/
-
-	if (in_analysis_type==this->analysis_type) return true;
-	else return false;
 }
 /*}}}*/
@@ -145,4 +139,10 @@
 }
 /*}}}*/
+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){/*{{{*/
 
@@ -203,9 +203,9 @@
 
 /*SpcTransient functions*/
-int SpcTransient::GetDof(){/*{{{*/
+int        SpcTransient::GetDof(){/*{{{*/
 	return dof;
 }
 /*}}}*/
-int   SpcTransient::GetNodeId(){/*{{{*/
+int        SpcTransient::GetNodeId(){/*{{{*/
 
 	return nodeid;
Index: /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h	(revision 18930)
+++ /issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h	(revision 18931)
@@ -31,12 +31,12 @@
 		/*}}}*/
 		/*Object virtual functions definitions:{{{ */
-		void  Echo();
-		void  DeepEcho();
-		int   Id(); 
-		int   ObjectEnum();
 		Object* copy();
+		void    DeepEcho();
+		void    Echo();
+		int     Id(); 
+		int     ObjectEnum();
 		/*}}}*/
 		/*Constraint virtual functions definitions: {{{*/
-		void ActivatePenaltyMethod(void);
+		void   ActivatePenaltyMethod(void);
 		void   ConstrainNode(Nodes* nodes,Parameters* parameters);
 		bool   InAnalysis(int analysis_type);
@@ -44,6 +44,6 @@
 		/*}}}*/
 		/*SpcTransient management:{{{ */
-		int    GetNodeId();
-		int    GetDof();
+		int        GetDof();
+		int        GetNodeId();
 		IssmDouble GetValue();
 		/*}}}*/