Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16150) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16151) @@ -4544,6 +4544,6 @@ /*Intermediaries*/ - int i,j,found=0; - int friction_type,stabilization; + int i,j,found=0; + int stabilization; IssmDouble Jdet,phi,dt; IssmDouble rho_ice,heatcapacity; @@ -4813,6 +4813,6 @@ /*Intermediaries*/ - int i,j,found=0; - int friction_type,stabilization; + int i,found=0; + int stabilization; IssmDouble Jdet,phi,dt; IssmDouble rho_ice,heatcapacity; @@ -4844,6 +4844,6 @@ Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); Input* temperature_input=NULL; - if (reCast(dt)) temperature_input=inputs->GetInput(TemperatureEnum); _assert_(inputs); - if (stabilization==2) diameter=MinEdgeLength(xyz_list); + if(reCast(dt)) temperature_input=inputs->GetInput(TemperatureEnum); _assert_(inputs); + if(stabilization==2) diameter=MinEdgeLength(xyz_list); /* Start looping on the number of gaussian points: */ @@ -5586,5 +5586,4 @@ IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ IssmDouble eps1[3],eps2[3]; - IssmDouble phi[NUMVERTICES]; IssmDouble dphi[3][NUMVERTICES]; GaussPenta *gauss=NULL; @@ -6159,6 +6158,6 @@ /*dJ/dalpha = ∂L/∂alpha = ∂J/∂alpha + ∂/∂alpha(KU-F)*/ - int i,approximation; - Tria* tria=NULL; + int approximation; + Tria* tria=NULL; /*If on water, skip grad (=0): */ @@ -6213,6 +6212,6 @@ /*Now deal with ∂J/∂alpha*/ - int *responses = NULL; - int num_responses,resp; + int *responses = NULL; + int num_responses,resp; this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum); this->parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum); @@ -8019,5 +8018,4 @@ /*Intermediaries */ - int i,j; int approximation; IssmDouble xyz_list[NUMVERTICES][3]; @@ -8064,5 +8062,5 @@ D_scalar=2*newviscosity*gauss->weight*Jdet; - for (i=0;i<5;i++) D[i*5+i]=D_scalar; + for(int i=0;i<5;i++) D[i*5+i]=D_scalar; TripleMultiply(B,5,numdof,1, @@ -9127,5 +9125,4 @@ /*Intermediaries*/ - int i,j; IssmDouble Jdet; IssmDouble slope[3]; //do not put 2! this goes into GetInputDerivativeValue, which addresses slope[3] also! @@ -9160,5 +9157,5 @@ driving_stress_baseline=matpar->GetRhoIce()*matpar->GetG(); - for(i=0;ivalues[i*NDOF2+0]+= -driving_stress_baseline*slope[0]*Jdet*gauss->weight*basis[i]; pe->values[i*NDOF2+1]+= -driving_stress_baseline*slope[1]*Jdet*gauss->weight*basis[i]; @@ -9372,5 +9369,4 @@ /*Intermediaries*/ int i,j; - int approximation; IssmDouble Jdet,gravity,rho_ice,B,D_scalar_stab,viscosity; IssmDouble forcex,forcey,forcez,diameter,FSreconditioning; @@ -9388,5 +9384,5 @@ IssmDouble dnodalbasis[6][6][3]; IssmDouble SW[6][4][4]; - int p,q,ii; + int p,ii; int c=3; //index of pressure @@ -9463,5 +9459,5 @@ /*Intermediaries*/ - int i,j; + int i; int approximation; IssmDouble Jdet,gravity,rho_ice; @@ -9866,5 +9862,5 @@ /*Intermediaries */ - int i,j,approximation; + int i,j; IssmDouble xyz_list[NUMVERTICES][3]; IssmDouble Jdet; Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16150) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16151) @@ -1860,5 +1860,5 @@ /*Intermediaries*/ - int i,j,t; + int i,t; int tria_vertex_ids[3]; int row; @@ -2418,5 +2418,5 @@ /*Intermediaries*/ - int i,j; + int i; int tria_vertex_ids[3]; IssmDouble nodeinputs[3]; @@ -2429,7 +2429,5 @@ /*Checks if debuging*/ - /*{{{*/ _assert_(iomodel->elements); - /*}}}*/ /*Fetch parameters: */ @@ -2983,5 +2981,4 @@ /*Intermediaries*/ - int i,j; IssmDouble xyz_list[NUMVERTICES][3]; IssmDouble viscosity,newviscosity,oldviscosity; @@ -3027,5 +3024,5 @@ newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); D_scalar=2.*newviscosity*thickness*gauss->weight*Jdet; - for(i=0;i<3;i++) D[i*3+i]=D_scalar; + for(int i=0;i<3;i++) D[i*3+i]=D_scalar; TripleMultiply(B,3,numdof,1, @@ -3051,5 +3048,4 @@ /*Intermediaries*/ bool mainlyfloating; - int i,j; int analysis_type,migration_style; int point1; @@ -3114,5 +3110,5 @@ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); D_scalar=alpha2*gauss->weight*Jdet; - for(i=0;i<2;i++) D[i*2+i]=D_scalar; + for(int i=0;i<2;i++) D[i*2+i]=D_scalar; TripleMultiply(B,2,numdof,1, @@ -6470,5 +6466,4 @@ /*Intermediaries */ int stabilization; - int dim; IssmDouble Jdet,D_scalar,dt,h; IssmDouble vel,vx,vy; @@ -6568,5 +6563,4 @@ /*Intermediaries */ int stabilization; - int dim; IssmDouble Jdet,D_scalar,dt,h; IssmDouble vel,vx,vy; @@ -7015,6 +7009,5 @@ /*Intermediaries */ - int stabilization; - int i,j,dim; + int stabilization,dim; IssmDouble Jdet,vx,vy,dvxdx,dvydy,vel,h; IssmDouble D_scalar; Index: /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 16150) +++ /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 16151) @@ -267,10 +267,9 @@ void TransientInput::GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){ - int i; - IssmDouble* times=NULL; - IssmDouble* values=NULL; - int numsteps; - int count; - bool iscurrenttime_included=false; + int i; + IssmDouble *times = NULL; + IssmDouble *values = NULL; + int numsteps; + bool iscurrenttime_included = false; /*Figure out how many time steps we are going to return: */ Index: /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp (revision 16150) +++ /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp (revision 16151) @@ -634,5 +634,4 @@ int reset_penalties = 0; int found = 0; - int penalty_lock; int new_active; IssmDouble pressure;