Index: /issm/trunk/src/c/objects/Inputs/IntInput.cpp
===================================================================
--- /issm/trunk/src/c/objects/Inputs/IntInput.cpp	(revision 3787)
+++ /issm/trunk/src/c/objects/Inputs/IntInput.cpp	(revision 3788)
@@ -135,5 +135,7 @@
 /*}}}*/
 /*FUNCTION IntInput::GetParameterValue(int* pvalue){{{1*/
-void IntInput::GetParameterValue(int* pvalue){ISSMERROR(" not supported yet!");}
+void IntInput::GetParameterValue(int* pvalue){
+	ISSMERROR(" not supported yet!");
+}
 /*}}}*/
 /*FUNCTION IntInput::GetParameterValue(double* pvalue){{{1*/
Index: /issm/trunk/src/c/objects/Loads/Icefront.cpp
===================================================================
--- /issm/trunk/src/c/objects/Loads/Icefront.cpp	(revision 3787)
+++ /issm/trunk/src/c/objects/Loads/Icefront.cpp	(revision 3788)
@@ -139,5 +139,5 @@
 
 /*Object marshall*/
-/*FUNCTION Icefront Configure {{{1*/
+/*FUNCTION Icefront::Configure {{{1*/
 void  Icefront::Configure(DataSet* elementsin,DataSet* loadsin,DataSet* nodesin,DataSet* verticesin,DataSet* materialsin,Parameters* parametersin){
 
@@ -152,5 +152,5 @@
 }
 /*}}}*/
-/*FUNCTION Icefront copy {{{1*/
+/*FUNCTION Icefront::copy {{{1*/
 Object* Icefront::copy() {
 	return new Icefront(this->id,&this->hnodes,&this->helement,&this->hmatpar,this->parameters,this->inputs);
@@ -201,10 +201,18 @@
 }
 /*}}}*/
-/*FUNCTION Icefront Echo {{{1*/
+/*FUNCTION Icefront::Echo {{{1*/
 void Icefront::Echo(void){
-	this->DeepEcho();
-}
-/*}}}*/
-/*FUNCTION Icefront Enum {{{1*/
+	printf("Icefront:\n");
+	printf("   id: %i\n",id);
+	hnodes.Echo();
+	helement.Echo();
+	hmatpar.Echo();
+	printf("   parameters\n");
+	parameters->Echo();
+	printf("   inputs\n");
+	inputs->Echo();
+}
+/*}}}*/
+/*FUNCTION Icefront::Enum {{{1*/
 int Icefront::Enum(void){
 
@@ -213,5 +221,5 @@
 }
 /*}}}*/
-/*FUNCTION Icefront Id {{{1*/
+/*FUNCTION Icefront::Id {{{1*/
 int    Icefront::Id(void){ return id; }
 /*}}}*/
@@ -265,5 +273,5 @@
 }
 /*}}}*/
-/*FUNCTION Icefront MyRank {{{1*/
+/*FUNCTION Icefront::MyRank {{{1*/
 int    Icefront::MyRank(void){ 
 	extern int my_rank;
@@ -273,5 +281,5 @@
 
 /*Object functions*/
-/*FUNCTION Icefront CreateKMatrix {{{1*/
+/*FUNCTION Icefront::CreateKMatrix {{{1*/
 
 void  Icefront::CreateKMatrix(Mat Kgg,int analysis_type,int sub_analysis_type){
@@ -283,5 +291,5 @@
 }
 /*}}}*/
-/*FUNCTION Icefront CreatePVector {{{1*/
+/*FUNCTION Icefront::CreatePVector {{{1*/
 void  Icefront::CreatePVector(Vec pg, int analysis_type,int sub_analysis_type){
 
@@ -312,5 +320,5 @@
 }
 /*}}}*/
-/*FUNCTION Icefront CreatePVectorDiagnosticHoriz {{{1*/
+/*FUNCTION Icefront::CreatePVectorDiagnosticHoriz {{{1*/
 void Icefront::CreatePVectorDiagnosticHoriz( Vec pg,  int analysis_type,int sub_analysis_type){
 	
@@ -322,10 +330,11 @@
 		CreatePVectorDiagnosticHorizSegment(pg,analysis_type,sub_analysis_type);
 	}
-	else{
+	else if (type==QuadIceFrontEnum){
 		CreatePVectorDiagnosticHorizQuad(pg,analysis_type,sub_analysis_type);
 	}
+	else ISSMERROR("type %i not supported",type);
 }	
 /*}}}*/
-/*FUNCTION Icefront CreatePVectorDiagnosticHorizSegment{{{1*/
+/*FUNCTION Icefront::CreatePVectorDiagnosticHorizSegment{{{1*/
 void Icefront::CreatePVectorDiagnosticHorizSegment( Vec pg,int analysis_type,int sub_analysis_type){
 
@@ -420,5 +429,5 @@
 }
 /*}}}*/
-/*FUNCTION Icefront CreatePVectorDiagnosticHorizQuad {{{1*/
+/*FUNCTION Icefront::CreatePVectorDiagnosticHorizQuad {{{1*/
 void Icefront::CreatePVectorDiagnosticHorizQuad( Vec pg,int analysis_type,int sub_analysis_type){
 
@@ -558,5 +567,5 @@
 }
 /*}}}*/
-/*FUNCTION Icefront CreatePVectorDiagnosticStokes {{{1*/
+/*FUNCTION Icefront::CreatePVectorDiagnosticStokes {{{1*/
 void Icefront::CreatePVectorDiagnosticStokes( Vec pg,int analysis_type,int sub_analysis_type){
 
@@ -695,9 +704,9 @@
 }
 /*}}}*/
-/*FUNCTION Icefront DistributeNumDofs {{{1*/
+/*FUNCTION Icefront::DistributeNumDofs {{{1*/
 void  Icefront::DistributeNumDofs(int* numdofspernode,int analysis_type,int sub_analysis_type){return;}
 		
 /*}}}*/
-/*FUNCTION Icefront GetDofList{{{1*/
+/*FUNCTION Icefront::GetDofList{{{1*/
 
 void  Icefront::GetDofList(int* doflist,int* pnumberofdofspernode){
@@ -735,15 +744,15 @@
 }
 /*}}}*/
-/*FUNCTION Icefront PenaltyCreateKMatrix {{{1*/
+/*FUNCTION Icefront::PenaltyCreateKMatrix {{{1*/
 void  Icefront::PenaltyCreateKMatrix(Mat Kgg,double kmax,int analysis_type,int sub_analysis_type){
 	/*do nothing: */
 }
 /*}}}*/
-/*FUNCTION Icefront PenaltyCreatePVector{{{1*/
+/*FUNCTION Icefront::PenaltyCreatePVector{{{1*/
 void  Icefront::PenaltyCreatePVector(Vec pg,double kmax,int analysis_type,int sub_analysis_type){
 	/*do nothing: */
 }
 /*}}}*/
-/*FUNCTION Icefront QuadPressureLoad {{{1*/
+/*FUNCTION Icefront::QuadPressureLoad {{{1*/
 void Icefront::QuadPressureLoad(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, 
 		                              double* normal1,double* normal2,double* normal3,double* normal4,double* xyz_list){
@@ -1006,5 +1015,5 @@
 }
 /*}}}*/
-/*FUNCTION Icefront QuadPressureLoadStokes {{{1*/
+/*FUNCTION Icefront::QuadPressureLoadStokes {{{1*/
 void Icefront::QuadPressureLoadStokes(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, 
 		                              double* normal1,double* normal2,double* normal3,double* normal4,double* xyz_list){
@@ -1266,5 +1275,5 @@
 }
 /*}}}*/
-/*FUNCTION Icefront SegmentPressureLoad {{{1*/
+/*FUNCTION Icefront::SegmentPressureLoad {{{1*/
 
 void Icefront::SegmentPressureLoad(double* pe_g,double rho_water,double rho_ice,double gravity, double* thickness_list, double* bed_list, double* normal,double length){