Index: /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.cpp (revision 17924) @@ -112,5 +112,5 @@ /*Intermediaries */ const int dim = 2; - int i,row,col,stabilization; + int row,col,stabilization; IssmDouble Jdet,D_scalar; IssmDouble dtau = 1.; @@ -399,5 +399,5 @@ /* Intermediaries */ - int i,k; + int i; IssmDouble dmaxp,dmaxm,val; Element* element; Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 17924) @@ -32,6 +32,4 @@ int stabilization,finiteelement,smb_model; bool dakota_analysis; - bool issmbgradients; - bool ispdd; bool isdelta18o; bool isgroundingline; Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 17924) @@ -119,5 +119,4 @@ /*Intermediaries */ - int input_enum; IssmDouble Jdet,thickness,slope[2]; IssmDouble taud_y,norms,normv,vx,vy; Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17924) @@ -3198,5 +3198,5 @@ /*Intermediaries*/ bool mainlyfloating; - int i,dim,domaintype,epssize; + int dim,domaintype; int migration_style,point1; IssmDouble alpha2,Jdet,fraction1,fraction2; @@ -5260,5 +5260,5 @@ /*Intermediaries*/ - int i,j,approximation; + int i,approximation; int dim=3; IssmDouble Jdet,Jdet2d,FSreconditioning; Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17924) @@ -593,5 +593,5 @@ /*Intermediaries*/ - int i,t,row; + int i,t; IssmDouble time; Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 17924) @@ -286,5 +286,4 @@ void IoModel::StartTrace(void){ - int i; bool autodiff = false; bool keep=false; Index: /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp (revision 17924) @@ -39,9 +39,6 @@ int riftfront_elem_ids[2]; int riftfront_matpar_id; - int riftfront_type; - int riftfront_fill; IssmDouble riftfront_friction; IssmDouble riftfront_fractionincrement; - bool riftfront_shelf; int penalty_lock; Index: /issm/trunk-jpl/src/c/classes/Massfluxatgate.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Massfluxatgate.h (revision 17923) +++ /issm/trunk-jpl/src/c/classes/Massfluxatgate.h (revision 17924) @@ -31,7 +31,7 @@ /*FUNCTION Massfluxatgate() {{{*/ Massfluxatgate(){ - this->name = 0; - this->numsegments = 0; - this->segments = 0; + this->name = 0; + this->numsegments = 0; + this->segments = 0; } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (revision 17924) @@ -21,5 +21,4 @@ Matpar::Matpar(int matpar_mid, IoModel* iomodel){ - bool ispdd; bool isefficientlayer; int hydrology_model,smb_model; Index: /issm/trunk-jpl/src/c/classes/kriging/Observations.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/Observations.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/classes/kriging/Observations.cpp (revision 17924) @@ -353,5 +353,4 @@ int i,j,n_obs; IssmPDouble prediction,error; - IssmPDouble numerator,denominator,ratio; IssmPDouble *x = NULL; IssmPDouble *y = NULL; Index: /issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp (revision 17924) @@ -128,6 +128,5 @@ /*Recover Femmodel*/ - double f; - int intn,solution_type; + int solution_type; FemModel *femmodel = (FemModel*)dzs; Index: /issm/trunk-jpl/src/c/cores/masstransport_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/masstransport_core.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/cores/masstransport_core.cpp (revision 17924) @@ -13,8 +13,7 @@ /*parameters: */ - int i; int numoutputs,domaintype; bool save_results; - bool issmbgradients,ispdd,isdelta18o,isFS,isfreesurface,dakota_analysis; + bool isFS,isfreesurface,dakota_analysis; int solution_type; char** requested_outputs = NULL; Index: /issm/trunk-jpl/src/c/cores/steadystate_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/steadystate_core.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/cores/steadystate_core.cpp (revision 17924) @@ -21,5 +21,4 @@ /*intermediary: */ - int i; int step; Vector* ug = NULL; Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 17924) @@ -20,14 +20,13 @@ /*parameters: */ - int i; IssmDouble starttime,finaltime,dt,yts; - bool isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset,isdamageevolution,ishydrology; - bool save_results,dakota_analysis; - bool time_adapt=false; - int output_frequency; - int domaintype,groundingline_migration,smb_model; - int numoutputs = 0; - Analysis *analysis = NULL; - char** requested_outputs = NULL; + bool isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset,isdamageevolution,ishydrology; + bool save_results,dakota_analysis; + bool time_adapt=false; + int output_frequency; + int domaintype,groundingline_migration; + int numoutputs = 0; + Analysis *analysis = NULL; + char** requested_outputs = NULL; Index: /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 17924) @@ -33,5 +33,4 @@ /*intermediary: */ - bool isnan; int i,j,count,elementnbv,numfacevertices; IssmDouble value; @@ -41,5 +40,5 @@ /*Higher-order finite elements*/ - int v1,v2,v3,v4; + int v1,v2; bool *my_edges = NULL; bool *my_faces = NULL; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp (revision 17924) @@ -149,5 +149,5 @@ bool isv1,isv2; int facenbv,v1,v2; - int id_edge,id_element,id_face; + int id_edge,id_element; int elementnbe; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 17924) @@ -19,8 +19,8 @@ int i,j,m,k; - int numoutputs,domaintype,materialtype,smb_model; + int numoutputs,materialtype,smb_model; char** requestedoutputs = NULL; IssmDouble time; - bool ispdd,isdelta18o; + bool isdelta18o; /*parameters for mass flux:*/ Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiSparseMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiSparseMat.h (revision 17923) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiSparseMat.h (revision 17924) @@ -141,13 +141,10 @@ void Echo(void){ - int my_rank; - int i,j,k; - /*Do a synchronized dump across all the rows: */ - my_rank=IssmComm::GetRank(); - for(i=0;im << "\n"); - for (j=0;jm;j++){ + for(int j=0;jm;j++){ _printf_("row " << j << ":"); this->matrix[j]->Echo(); @@ -190,5 +187,4 @@ int* this_row_cols = NULL; int* this_row_mods = NULL; - doubletype* this_row_values = NULL; int* numvalues_perrow = NULL; int row; @@ -378,5 +374,5 @@ doubletype norm,local_norm; doubletype absolute; - int i,j; + int i; switch(mode){ @@ -421,7 +417,4 @@ void MatMult(IssmAbsVec* Xin,IssmAbsVec* AXin){ - int i,j; - doubletype *X_serial = NULL; - /*A check on the types: */ if(IssmVecTypeFromToolkitOptions()!=MpiEnum)_error_("MatMult operation only possible with 'mpi' vectors"); @@ -432,9 +425,9 @@ /*Serialize input Xin: */ - X_serial=X->ToMPISerial(); + doubletype* X_serial=X->ToMPISerial(); /*Every cpu has a serial version of the input vector. Use it to do the Matrix-Vector multiply *locally and plug it into AXin: */ - for(i=0;im;i++){ + for(int i=0;im;i++){ AX->vector[i]=this->matrix[i]->Mult(X_serial); } Index: /issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp (revision 17923) +++ /issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp (revision 17924) @@ -200,5 +200,5 @@ ISSM_MPI_Comm comm; int num_procs; - int i,j; + int i; int nnz,local_nnz; int *irn_loc = NULL; @@ -217,7 +217,7 @@ /*First, some checks*/ - if (Kff_M!=Kff_N)_error_("stiffness matrix Kff should be square"); - if (uf_M!=Kff_M || uf_M!=pf_M)_error_("solution vector should be the same size as stiffness matrix Kff and load vector pf"); - if (uf_m!=Kff_m || uf_m!=pf_m)_error_("solution vector should be locally the same size as stiffness matrix Kff and load vector pf"); + if(Kff_M!=Kff_N)_error_("stiffness matrix Kff should be square"); + if(uf_M!=Kff_M || uf_M!=pf_M)_error_("solution vector should be the same size as stiffness matrix Kff and load vector pf"); + if(uf_m!=Kff_m || uf_m!=pf_m)_error_("solution vector should be locally the same size as stiffness matrix Kff and load vector pf"); /*Initialize matrix */