Index: /issm/trunk-jpl/src/c/classes/DofIndexing.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 13761)
@@ -147,6 +147,4 @@
 void DofIndexing::Echo(void){
 
-	int i;
-
 	_printLine_("DofIndexing:");
 	_printLine_("   gsize: " << gsize);
Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 13761)
@@ -484,5 +484,4 @@
 
 
-	int         i;
 	bool        isautodiff      = false;
 	IssmDouble  output_value;
@@ -503,5 +502,5 @@
 
 			/*Go through our dependent variables, and compute the response:*/
-			for(i=0;i<dependent_objects->Size();i++){
+			for(int i=0;i<dependent_objects->Size();i++){
 				DependentObject* dep=(DependentObject*)dependent_objects->GetObjectByOffset(i);
 				dep->Responsex(&output_value,this);
Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/IoModel.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/IoModel.cpp	(revision 13761)
@@ -1082,6 +1082,4 @@
 	int     vector_layout = 0;
 	int     counter;
-	int     nods;
-	int     nel;
 	int     numberofelements;
 
Index: /issm/trunk-jpl/src/c/classes/Patch.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Patch.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/Patch.cpp	(revision 13761)
@@ -109,5 +109,4 @@
 void Patch::Gather(void){
 
-	int         i;
 	int         count;
 	int         my_rank;
@@ -147,5 +146,5 @@
 	/*Now, ask other nodes to send their values: */
 	#ifdef _HAVE_MPI_
-	for (i=1;i<num_procs;i++){
+	for(int i=1;i<num_procs;i++){
 		if (my_rank==i){ 
 			MPI_Send(&this->numrows,1,MPI_INT,0,1,IssmComm::GetComm());   
Index: /issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp	(revision 13761)
@@ -68,5 +68,5 @@
 
 		double Hmin = HUGE_VAL;// the infinie value 
-		int i,j,k,n,i0,i1,i2,i3;
+		int i,j,n,i0,i1,i2,i3;
 
 		/*initialize some variables*/
@@ -500,10 +500,9 @@
 
 		long               i,j,k;
-		int                jj;
 		long              *head_v   = new long[nbv];
 		long              *next_p   = new long[2*nbe];
 		float             *eangle   = new float[nbe];
 		double             eps      = 1e-20;
-		BamgQuadtree           quadtree; // build quadtree to find duplicates
+		BamgQuadtree       quadtree; // build quadtree to find duplicates
 		BamgVertex        *v0       = vertices;
 		GeomVertex *v0g      = (GeomVertex*) (void*)v0;
Index: /issm/trunk-jpl/src/c/classes/bamg/Mesh.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/bamg/Mesh.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/bamg/Mesh.cpp	(revision 13761)
@@ -269,5 +269,5 @@
 		double Hmin = HUGE_VAL;// the infinie value 
 		long i1,i2,i3;
-		long i,j;
+		long i;
 		Metric M1(1);
 		int verbose=0;
@@ -385,5 +385,5 @@
 		if(bamgmesh->Quadrilaterals){
 			if(verbose>5) _printLine_("      processing Quadrilaterals");
-			long i1,i2,i3,i4,iref;
+			long i1,i2,i3,i4;
 			triangles =new Triangle[nbt];
 			for (i=0;i<bamgmesh->QuadrilateralsSize[0];i++){
@@ -4954,5 +4954,5 @@
 
 		/*Intermediaries*/
-		int                i,j,k;
+		int                i,k;
 		int                nbcurves    = 0;
 		int                NbNewPoints,NbEdgeCurve;
Index: /issm/trunk-jpl/src/c/classes/bamg/R2.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/bamg/R2.h	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/bamg/R2.h	(revision 13761)
@@ -39,9 +39,4 @@
 	template <class R,class RR> class P2xP2{
 
-		  private:
-
-			  friend P2<R,RR> operator*(P2<R,RR> c,P2xP2<R,RR> cc){
-				  return P2<R,RR>(c.x*cc.x.x + c.y*cc.y.x, c.x*cc.x.y + c.y*cc.y.y);
-			  } 
 		  public:
 
Index: /issm/trunk-jpl/src/c/classes/kriging/Observation.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/kriging/Observation.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/kriging/Observation.cpp	(revision 13761)
@@ -35,6 +35,4 @@
 void Observation::Echo(void){
 
-	int  bit;
-
 	_printLine_("Observation");
 	_printLine_("   index : " << this->index);
Index: /issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp	(revision 13761)
@@ -36,5 +36,5 @@
 	/*intermediaries*/
 	int i,j,counter;
-	int gsize,fsize,ssize;
+	int gsize,fsize;
 	int* P=NULL;
 	bool found;
@@ -219,5 +219,6 @@
 void ElementVector::Echo(void){
 
-	int i,j;
+	int i;
+
 	_printLine_("Element Vector echo:");
 	_printLine_("   nrows: " << nrows);
Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp	(revision 13761)
@@ -230,13 +230,11 @@
 	int         dofp[1]={3};
 	int         analysis_type,approximation;
-	int         doflist[NUMVERTICES];
 	IssmDouble      xyz_list[NUMVERTICES][3];
 	IssmDouble      xyz_list_tria[3][3];
 	IssmDouble      rho_ice,gravity,stokesreconditioning;
-	IssmDouble      pressure,viscosity,bed,Jdet2d;
+	IssmDouble      pressure,viscosity,Jdet2d;
 	IssmDouble      bed_normal[3];
 	IssmDouble      basalforce[3];
 	IssmDouble      epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/
-	IssmDouble      devstresstensor[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/
 	IssmDouble      stresstensor[6]={0.0};
 	IssmDouble      sigma_xx,sigma_yy,sigma_zz;
@@ -323,5 +321,4 @@
 void  Penta::ComputeStressTensor(){
 
-	int         iv;
 	IssmDouble      xyz_list[NUMVERTICES][3];
 	IssmDouble      pressure,viscosity;
@@ -649,6 +646,4 @@
 void Penta::DeepEcho(void){
 
-	int i;
-
 	_printLine_("Penta:");
 	_printLine_("   id: " << id);
@@ -670,6 +665,4 @@
 	_printLine_("neighboor sids: ");
 	_printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]);
-
-	return;
 }
 /*}}}*/
@@ -792,5 +785,5 @@
 void  Penta::GetDofList(int** pdoflist,int approximation_enum,int setenum){
 
-	int  i,j,count=0;
+	int  i,count=0;
 	int  numberofdofs=0;
 	int* doflist=NULL;
@@ -901,8 +894,4 @@
 void Penta::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){
 
-	/*Intermediaries*/
-	IssmDouble     value[NUMVERTICES];
-	GaussPenta *gauss              = NULL;
-
 	/*Recover input*/
 	Input* input=inputs->GetInput(enumtype);
@@ -913,5 +902,5 @@
 
 	/* Start looping on the number of vertices: */
-	gauss=new GaussPenta();
+	GaussPenta *gauss=new GaussPenta();
 	for (int iv=0;iv<NUMVERTICES;iv++){
 		gauss->GaussVertex(iv);
@@ -926,8 +915,4 @@
 void Penta::GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){
 
-	/*Intermediaries*/
-	IssmDouble     value[NUMVERTICES];
-	GaussPenta *gauss              = NULL;
-
 	/*Recover input*/
 	Input* input=inputs->GetInput(enumtype);
@@ -938,16 +923,14 @@
 	/* Start looping on the number of vertices: */
 	if (input){
-		gauss=new GaussPenta();
+		GaussPenta *gauss=new GaussPenta();
 		for (int iv=0;iv<NUMVERTICES;iv++){
 			gauss->GaussVertex(iv);
 			input->GetInputValue(&pvalue[iv],gauss);
 		}
+		delete gauss;
 	}
 	else{
 		for (int iv=0;iv<NUMVERTICES;iv++) pvalue[iv]=defaultvalue;
 	}
-
-	/*clean-up*/
-	delete gauss;
 }
 /*}}}*/
@@ -1267,5 +1250,5 @@
 
 	/*Intermediaries*/
-	int    i,j,t;
+	int    i,t;
 	int    penta_vertex_ids[6];
 	int    row;
@@ -2989,11 +2972,10 @@
 
 	/*Intermediaries*/
-	int    iv;
 	IssmDouble phi;
 	IssmDouble viscosity;
 	IssmDouble xyz_list[NUMVERTICES][3];
 	IssmDouble epsilon[6];
-	IssmDouble     viscousheating[NUMVERTICES]={0,0,0,0,0,0};
-	IssmDouble     thickness;
+	IssmDouble viscousheating[NUMVERTICES]={0,0,0,0,0,0};
+	IssmDouble thickness;
 	GaussPenta *gauss=NULL;
 
Index: /issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.cpp	(revision 13761)
@@ -880,6 +880,4 @@
 void PentaRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussPenta* gauss){
 
-	int i,j;
-
 	/*The Jacobian is constant over the element, discard the gaussian points. 
 	 * J is assumed to have been allocated of size NDOF2xNDOF2.*/
@@ -897,7 +895,7 @@
 	A3=gauss->coord3;
 
-	xi=A2-A1;
-	eta=SQRT3*A3;
-	zi=gauss->coord4;
+	xi  = A2-A1;
+	eta = SQRT3*A3;
+	zi  = gauss->coord4;
 
 	x1=*(xyz_list+3*0+0);
Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp	(revision 13761)
@@ -43,5 +43,4 @@
 	,TriaHook(nummodels,index+1,iomodel){
 
-		int i;
 		/*id: */
 		this->id=tria_id;
@@ -127,12 +126,11 @@
 void  Tria::AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){
 
-	bool      already=false;
-	int       i,j;
-	int       partition[NUMVERTICES];
-	int       offsetsid[NUMVERTICES];
-	int       offsetdof[NUMVERTICES];
-	IssmDouble    area;
-	IssmDouble    mean;
-	IssmDouble    values[3];
+	bool       already = false;
+	int        i,j;
+	int        partition[NUMVERTICES];
+	int        offsetsid[NUMVERTICES];
+	int        offsetdof[NUMVERTICES];
+	IssmDouble area;
+	IssmDouble mean;
 
 	/*First, get the area: */
@@ -231,5 +229,4 @@
 
 	/*Intermediaries */
-	int        i,j,ig;
 	IssmDouble heatcapacity,latentheat;
 	IssmDouble Jdet,D_scalar;
@@ -248,5 +245,5 @@
 	/* Start looping on the number of gauss  (nodes on the bedrock) */
 	gauss=new GaussTria(2);
-	for (ig=gauss->begin();ig<gauss->end();ig++){
+	for(int ig=gauss->begin();ig<gauss->end();ig++){
 
 		gauss->GaussPoint(ig);
@@ -290,18 +287,17 @@
 	/*Intermediaries */
 	int        stabilization;
-	int        i,j,ig,dim;
-	IssmDouble     Jdettria,DL_scalar,dt,h;
-	IssmDouble     vel,vx,vy,dvxdx,dvydy;
-	IssmDouble     dvx[2],dvy[2];
-	IssmDouble     v_gauss[2]={0.0};
-	IssmDouble     xyz_list[NUMVERTICES][3];
-	IssmDouble     L[NUMVERTICES];
-	IssmDouble     B[2][NUMVERTICES];
-	IssmDouble     Bprime[2][NUMVERTICES];
-	IssmDouble     K[2][2]                        ={0.0};
-	IssmDouble     KDL[2][2]                      ={0.0};
-	IssmDouble     DL[2][2]                        ={0.0};
-	IssmDouble     DLprime[2][2]                   ={0.0};
-	GaussTria *gauss=NULL;
+	int        dim;
+	IssmDouble Jdettria,DL_scalar,dt,h;
+	IssmDouble vel,vx,vy,dvxdx,dvydy;
+	IssmDouble dvx[2],dvy[2];
+	IssmDouble v_gauss[2]={0.0};
+	IssmDouble xyz_list[NUMVERTICES][3];
+	IssmDouble L[NUMVERTICES];
+	IssmDouble B[2][NUMVERTICES];
+	IssmDouble Bprime[2][NUMVERTICES];
+	IssmDouble K[2][2]                        ={0.0};
+	IssmDouble KDL[2][2]                      ={0.0};
+	IssmDouble DL[2][2]                        ={0.0};
+	IssmDouble DLprime[2][2]                   ={0.0};
 
 	/*Initialize Element matrix*/
@@ -326,6 +322,6 @@
 
 	/* Start  looping on the number of gaussian points: */
-	gauss=new GaussTria(2);
-	for (ig=gauss->begin();ig<gauss->end();ig++){
+	GaussTria *gauss=new GaussTria(2);
+	for(int ig=gauss->begin();ig<gauss->end();ig++){
 
 		gauss->GaussPoint(ig);
@@ -785,5 +781,4 @@
 void  Tria::ComputeStressTensor(){
 
-	int         iv;
 	IssmDouble      xyz_list[NUMVERTICES][3];
 	IssmDouble      pressure,viscosity;
@@ -1085,8 +1080,4 @@
 void Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){
 
-	/*Intermediaries*/
-	IssmDouble     value[NUMVERTICES];
-	GaussTria *gauss              = NULL;
-
 	/*Recover input*/
 	Input* input=inputs->GetInput(enumtype);
@@ -1097,5 +1088,5 @@
 
 	/* Start looping on the number of vertices: */
-	gauss=new GaussTria();
+	GaussTria* gauss=new GaussTria();
 	for (int iv=0;iv<NUMVERTICES;iv++){
 		gauss->GaussVertex(iv);
@@ -1110,6 +1101,4 @@
 void Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){
 
-	IssmDouble     value[NUMVERTICES];
-	GaussTria *gauss = NULL;
 	Input     *input = inputs->GetInput(enumtype);
 
@@ -1119,16 +1108,14 @@
 	/* Start looping on the number of vertices: */
 	if (input){
-		gauss=new GaussTria();
+		GaussTria* gauss=new GaussTria();
 		for (int iv=0;iv<NUMVERTICES;iv++){
 			gauss->GaussVertex(iv);
 			input->GetInputValue(&pvalue[iv],gauss);
 		}
+		delete gauss;
 	}
 	else{
 		for (int iv=0;iv<NUMVERTICES;iv++) pvalue[iv]=defaultvalue;
 	}
-
-	/*clean-up*/
-	delete gauss;
 }
 /*}}}*/
@@ -1136,6 +1123,4 @@
 void Tria::GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue,int index){
 
-	IssmDouble     value[NUMVERTICES];
-	GaussTria *gauss = NULL;
 	Input     *input = inputs->GetInput(enumtype);
 
@@ -1145,16 +1130,14 @@
 	/* Start looping on the number of vertices: */
 	if (input){
-		gauss=new GaussTria();
+		GaussTria* gauss=new GaussTria();
 		for (int iv=0;iv<NUMVERTICES;iv++){
 			gauss->GaussVertex(iv);
 			input->GetInputValue(&pvalue[iv],gauss,index);
 		}
+		delete gauss;
 	}
 	else{
 		for (int iv=0;iv<NUMVERTICES;iv++) pvalue[iv]=defaultvalue;
 	}
-
-	/*clean-up*/
-	delete gauss;
 }
 /*}}}*/
@@ -1966,5 +1949,5 @@
 void  Tria::MigrateGroundingLine(IssmDouble* old_floating_ice,IssmDouble* sheet_ungrounding){
 
-	int     i,migration_style,unground;
+	int     i,migration_style;
 	bool    elementonshelf = false;
 	IssmDouble  bed_hydro,yts,gl_melting_rate;
Index: /issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h	(revision 13761)
@@ -258,6 +258,4 @@
 template <> inline void GenericExternalResult<IssmPDouble*>::Echo(void){ /*{{{*/
 
-	int i,j;
-
 	_printLine_("GenericExternalResult<IssmPDouble*>:");
 	this->GenericEcho();
Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp	(revision 13761)
@@ -516,9 +516,7 @@
 
 	/*Intermediaries*/
-	int               i;
-	PentaP1Input *xinputB     = NULL;
-	int               B_numvalues;
-	const int         numnodes    = 6;
-	IssmDouble            AdotBvalues[numnodes];
+	PentaP1Input *xinputB  = NULL;
+	const int     numnodes = 6;
+	IssmDouble    AdotBvalues[numnodes];
 
 	/*Check that inputB is of the same type*/
@@ -527,5 +525,5 @@
 
 	/*Create point wise sum*/
-	for(i=0;i<numnodes;i++){
+	for(int i=0;i<numnodes;i++){
 		_assert_(xinputB->values[i]!=0);
 		AdotBvalues[i]=this->values[i]/xinputB->values[i];
@@ -549,5 +547,4 @@
 	int               i;
 	PentaP1Input *xinputB     = NULL;
-	int               B_numvalues;
 	const int         numnodes    = 6;
 	IssmDouble            minvalues[numnodes];
@@ -580,5 +577,4 @@
 	int               i;
 	PentaP1Input *xinputB     = NULL;
-	int               B_numvalues;
 	const int         numnodes    = 6;
 	IssmDouble            maxvalues[numnodes];
Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_File.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/KML/KML_File.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_File.cpp	(revision 13761)
@@ -90,5 +90,4 @@
 	int          ncom=0;
 	char**       pcom=NULL;
-	KML_Object*  kobj;
 
 /*  get object attributes and check for solo tag  */
Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp	(revision 13761)
@@ -63,5 +63,4 @@
 void  KML_LineStyle::DeepEcho(const char* indent){
 
-	int   i;
 	bool  flag=true;
 
Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp	(revision 13761)
@@ -65,5 +65,4 @@
 void  KML_PolyStyle::DeepEcho(const char* indent){
 
-	int   i;
 	bool  flag=true;
 
Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Friction.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Loads/Friction.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Loads/Friction.cpp	(revision 13761)
@@ -191,5 +191,4 @@
 
 	/*diverse: */
-	int     i;
 	IssmDouble  r,s;
 	IssmDouble  vx,vy,vz,vmag;
@@ -257,5 +256,4 @@
 
 	/*diverse: */
-	int     i;
 	IssmDouble  r,s;
 	IssmDouble  vx,vy,vz,vmag;
Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp	(revision 13761)
@@ -656,5 +656,4 @@
 void  Icefront::GetDofList(int** pdoflist,int approximation_enum,int setenum){
 
-	int i,j;
 	int numberofdofs=0;
 	int count=0;
@@ -678,5 +677,5 @@
 
 	/*Figure out size of doflist: */
-	for(i=0;i<numberofnodes;i++){
+	for(int i=0;i<numberofnodes;i++){
 		numberofdofs+=nodes[i]->GetNumberOfDofs(approximation_enum,setenum);
 	}
@@ -687,5 +686,5 @@
 	/*Populate: */
 	count=0;
-	for(i=0;i<numberofnodes;i++){
+	for(int i=0;i<numberofnodes;i++){
 		nodes[i]->GetDofList(doflist+count,approximation_enum,setenum);
 		count+=nodes[i]->GetNumberOfDofs(approximation_enum,setenum);
Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp	(revision 13761)
@@ -696,5 +696,5 @@
 
 	/* Intermediaries*/
-	int        i,j,ig,index1,index2;
+	int        i,ig,index1,index2;
 	IssmDouble     DL,Jdet,dt,vx,vy,mean_vx,mean_vy,UdotN,thickness;
 	IssmDouble     xyz_list[NUMVERTICES_BOUNDARY][3];
@@ -790,9 +790,9 @@
 
 	/* Intermediaries*/
-	int        i,j,ig,index1,index2;
-	IssmDouble     DL,Jdet,vx,vy,mean_vx,mean_vy,UdotN,thickness;
-	IssmDouble     xyz_list[NUMVERTICES_BOUNDARY][3];
-	IssmDouble     normal[2];
-	IssmDouble     L[numdof];
+	int        i,ig,index1,index2;
+	IssmDouble DL,Jdet,vx,vy,mean_vx,mean_vy,UdotN,thickness;
+	IssmDouble xyz_list[NUMVERTICES_BOUNDARY][3];
+	IssmDouble normal[2];
+	IssmDouble L[numdof];
 	GaussTria *gauss;
 
Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp	(revision 13761)
@@ -44,5 +44,4 @@
 Pengrid::Pengrid(int id, int index, IoModel* iomodel, int in_analysis_type){ //i is the element index
 
-	int i,j;
 	int pengrid_node_id;
 	int pengrid_matpar_id;
Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp	(revision 13761)
@@ -54,6 +54,4 @@
 /*FUNCTION Penpair::Echo {{{*/
 void Penpair::Echo(void){
-
-	int i;
 
 	_printLine_("Penpair:");
Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp	(revision 13761)
@@ -376,11 +376,10 @@
 
 	const int   numdof = NDOF2*NUMVERTICES;
-	int         i,j;
 	int         dofs[1]             = {0};
-	IssmDouble      Ke_gg[4][4];
-	IssmDouble      thickness;
-	IssmDouble      h[2];
-	IssmDouble      penalty_offset;
-	IssmDouble      friction;
+	IssmDouble  Ke_gg[4][4];
+	IssmDouble  thickness;
+	IssmDouble  h[2];
+	IssmDouble  penalty_offset;
+	IssmDouble  friction;
 
 	/*Objects: */
@@ -561,8 +560,6 @@
 
 	const int   numnodes        = 2;
-	IssmDouble      max_penetration;
 	IssmDouble      penetration;
 	int         activate;
-	int         found;
 	int         unstable;
 	IssmDouble      vx1;
@@ -665,5 +662,4 @@
 int   Riftfront::IsMaterialStable(void){
 
-	int found=0;
 	IssmDouble converged=0;
 
@@ -684,7 +680,5 @@
 
 	const int     numnodes=2;
-	IssmDouble        max_penetration;
 	IssmDouble        penetration=0;
-	int           found;
 	IssmDouble      vx1;
 	IssmDouble      vy1;
@@ -735,5 +729,4 @@
 
 	IssmDouble    penetration;
-	int       found;
 
 	/*Objects: */
@@ -769,17 +762,14 @@
 
 	const int   numnodes        = 2;
-	IssmDouble      max_penetration;
-	IssmDouble      penetration;
-	int         activate;
+	IssmDouble  penetration;
 	int         unstable;
-	int         found;
-	IssmDouble      vx1;
-	IssmDouble      vy1;
-	IssmDouble      vx2;
-	IssmDouble      vy2;
+	IssmDouble  vx1;
+	IssmDouble  vy1;
+	IssmDouble  vx2;
+	IssmDouble  vy2;
 
 	/*Objects: */
-	Tria       *tria1           = NULL;
-	Tria       *tria2           = NULL;
+	Tria       *tria1 = NULL;
+	Tria       *tria2 = NULL;
 
 	/*enum of element? */
@@ -823,5 +813,4 @@
 	IssmDouble      penetration;
 	int         unstable;
-	int         found;
 	IssmDouble      vx1;
 	IssmDouble      vy1;
Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp	(revision 13761)
@@ -28,5 +28,4 @@
 
 	/*Intermediaries:*/
-	int    i;
 	int    matice_eid;
 
@@ -583,5 +582,5 @@
 
 	/*input strain rate: */
-	IssmDouble exx,eyy,exy,exz;
+	IssmDouble exx,eyy,exy;
 
 	/*Get visocisty and n*/
Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp	(revision 13761)
@@ -28,5 +28,4 @@
 
 	/*Intermediaries:*/
-	int    i;
 	int    matice_eid;
 
@@ -503,5 +502,5 @@
 
 	/*input strain rate: */
-	IssmDouble exx,eyy,exy,exz;
+	IssmDouble exx,eyy,exy;
 
 	/*Get visocisty and n*/
Index: /issm/trunk-jpl/src/c/classes/objects/Node.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Node.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Node.cpp	(revision 13761)
@@ -438,6 +438,4 @@
 void  Node::ApplyConstraint(int dof,IssmDouble value){
 
-	int index;
-
 	/*Dof should be added in the s set, describing which 
 	 * dofs are constrained to a certain value (dirichlet boundary condition*/
Index: /issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp	(revision 13761)
@@ -55,5 +55,4 @@
 void MatrixParam::DeepEcho(void){
 
-	int i;
 	_printLine_("MatrixParam:");
 	_printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
Index: /issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp	(revision 13761)
@@ -61,10 +61,8 @@
 void TransientParam::DeepEcho(void){
 
-	int i,j;
-
 	_printLine_("TransientParam:");
 	_printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
 	_printLine_("   size: " << this->N);
-	for(i=0;i<this->N;i++){
+	for(int i=0;i<this->N;i++){
 		_printLine_(   "time: " << this->timesteps[i] << " value: " << this->values[i]);
 	}
Index: /issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp	(revision 13760)
+++ /issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp	(revision 13761)
@@ -57,5 +57,4 @@
 void VectorParam::DeepEcho(void){
 
-	int i;
 	_printLine_("VectorParam:");
 	_printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");