Index: /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (revision 13762) @@ -20,7 +20,5 @@ void AverageOntoPartitionx(double** paverage, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vertex_response){ - int i,j,k; int dummy; - int npart; double *qmu_part = NULL; @@ -48,5 +46,5 @@ /*loop on each element, and add contribution of the element to the partition (surface weighted average): */ - for(i=0;iSize();i++){ + for(int i=0;iSize();i++){ Element* element=(Element*)elements->GetObjectByOffset(i); element->AverageOntoPartition(partition_contributions,partition_areas,vertex_response,qmu_part); Index: /issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp (revision 13762) @@ -20,6 +20,6 @@ /*intermediary*/ + int i; int noerr=1; - int i,j,num; double costheta=2; double hminaniso=1e-100; Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 13762) @@ -45,5 +45,4 @@ int num_unstable_constraints=0; int converged=0; - int potential; RiftConstrain(&num_unstable_constraints,loads,configuration_type); Index: /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp (revision 13762) @@ -11,8 +11,4 @@ int ContourToMeshx(SeqVec** pin_nod,SeqVec** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue) { - - int noerr=1; - int i; - int m,n; /*Contour:*/ @@ -52,5 +48,5 @@ /*Take care of the case where an element interpolation has been requested: */ if ((strcmp(interptype,"element")==0) || (strcmp(interptype,"element and node")==0)){ - for (n=0;nSetValue(n,value,INS_VAL); @@ -69,4 +65,4 @@ xDelete(in_nod_serial); - return noerr; + return 1; } Index: /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp (revision 13762) @@ -40,7 +40,4 @@ int ContourToNodesx(SeqVec** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue){ - int i; - int m,n; - /*Contour:*/ Contour* contouri=NULL; @@ -56,5 +53,5 @@ /*Loop through all contours: */ if(contours){ - for (i=0;iSize();i++){ + for(int i=0;iSize();i++){ Contour* contour=(Contour*)contours->GetObjectByOffset(i); IsInPoly(flags,contour->x,contour->y,contour->nods,x,y,0,nods,edgevalue); Index: /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 13762) @@ -11,12 +11,9 @@ int HoleFillerx(double** pimageout,double* image, int lines,int samps,int smooth){ - FILE *fp1; - unsigned long filesize; long infinit; double temp; - long i, j, k, l, ii, jj, bytes; + long i, j, k, l, ii, jj; long iii, jjj; - long test, prevlines, prevpix, test1, test2, thresh,counter; - long bell, cycles, leftovers; + long test; float howlong; float nsteps, ssteps, wsteps, esteps; @@ -38,7 +35,4 @@ double* image3=NULL; double* image4=NULL; - - /*Added to original routine: */ - int imageoutsize; /*^^^^^^^^^^^^^ Remove pixels close to the holes ^^^^^^^^^^^^^*/ Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 13762) @@ -30,5 +30,4 @@ double areacoord[3]; double aa,bb; - double data_value; Icoor2 dete[3]; Index: /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 13762) @@ -14,16 +14,13 @@ /*intermediary: */ int i,j; - bool transient = false; - - FILE *fid = NULL; - int code = 0; - int vector_layout = 0; - int counter; - int nods; - IssmDouble* times=NULL; - IssmDouble* values=NULL; - bool spcpresent=false; - int count=0; - int numberofvertices; + bool transient = false; + FILE *fid = NULL; + int code = 0; + int vector_layout = 0; + IssmDouble *times = NULL; + IssmDouble *values = NULL; + bool spcpresent = false; + int count = 0; + int numberofvertices; /*variables being fetched: */ Index: /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 13762) @@ -25,5 +25,5 @@ int sgn,double cm,double sp){ - int i,iret=0; + int iret=0; double *lat=NULL,*lon=NULL; Index: /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp (revision 13762) @@ -9,6 +9,4 @@ * If they do, create a Segment object with the intersection, and add to segments_dataset dataset: */ - int i; - double alpha; double alpha1,alpha2; double beta1,beta2; Index: /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp (revision 13762) @@ -7,5 +7,4 @@ int i,j,k; - int m,n; /*Contour:*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (revision 13762) @@ -10,14 +10,10 @@ void CreateConstraintsBalancethickness(Constraints** pconstraints, IoModel* iomodel){ + /*Fetch parameters: */ int stabilization; - - /*Fetch parameters: */ iomodel->Constant(&stabilization,BalancethicknessStabilizationEnum); - /*Output*/ - Constraints* constraints = NULL; - /*Recover pointer: */ - constraints=*pconstraints; + Constraints* constraints=*pconstraints; /*Create constraints if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (revision 13762) @@ -14,5 +14,4 @@ /*Intermediary*/ - int i; int element; int stabilization; @@ -23,9 +22,6 @@ iomodel->Constant(&numberofedges,MeshNumberofedgesEnum); - /*Output*/ - Loads* loads = NULL; - /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Create loads if they do not exist yet*/ @@ -39,5 +35,5 @@ /*First load data:*/ - for (i=0;iConstant(&dim,MeshDimensionEnum); @@ -36,5 +33,5 @@ /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*Create nodes if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (revision 13762) @@ -13,9 +13,6 @@ void CreateConstraintsBedSlope(Constraints** pconstraints, IoModel* iomodel){ - /*Output*/ - Constraints* constraints = NULL; - /*Recover pointer: */ - constraints=*pconstraints; + Constraints* constraints=*pconstraints; /*Create constraints if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp (revision 13762) @@ -13,9 +13,6 @@ void CreateLoadsBedSlope(Loads** ploads, IoModel* iomodel){ - /*DataSet*/ - Loads* loads = NULL; - /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Create loads if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 13762) @@ -18,14 +18,11 @@ int i; bool continuous_galerkin=true; - int numberofvertices; - - /*DataSets: */ - Nodes* nodes = NULL; /*Fetch parameters: */ + int numberofvertices; iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*Create nodes if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 13762) @@ -14,5 +14,4 @@ /*DataSets*/ - Loads *loads = NULL; Icefront *icefront = NULL; Riftfront *riftfront = NULL; @@ -48,5 +47,5 @@ /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Create loads if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 13762) @@ -21,7 +21,4 @@ bool isstokes,isl1l2,ismacayealpattyn; - /*DataSets: */ - Nodes* nodes = NULL; - /*Fetch parameters: */ iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); @@ -31,5 +28,5 @@ /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*First create nodes*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 13762) @@ -13,9 +13,6 @@ void CreateLoadsDiagnosticHutter(Loads** ploads, IoModel* iomodel){ - /*DataSet*/ - Loads* loads=NULL; - /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Create loads if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 13762) @@ -21,7 +21,4 @@ bool ishutter; - /*DataSets: */ - Nodes* nodes = NULL; - /*Fetch parameters: */ iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); @@ -29,5 +26,5 @@ /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*Create nodes if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 13762) @@ -20,7 +20,4 @@ int numberofvertices; - /*Output*/ - Constraints* constraints = NULL; - /*Fetch parameters: */ iomodel->Constant(&dim,MeshDimensionEnum); @@ -29,5 +26,5 @@ /*Recover pointer: */ - constraints=*pconstraints; + Constraints* constraints=*pconstraints; /*Create constraints if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (revision 13762) @@ -13,9 +13,6 @@ void CreateLoadsDiagnosticVert(Loads** ploads, IoModel* iomodel){ - /*DataSet*/ - Loads* loads=NULL; - /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Create loads if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 13762) @@ -21,7 +21,4 @@ int numberofvertices; - /*DataSets: */ - Nodes* nodes = NULL; - /*Fetch parameters: */ iomodel->Constant(&dim,MeshDimensionEnum); @@ -29,5 +26,5 @@ /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*Create nodes if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 13762) @@ -28,5 +28,4 @@ IssmDouble* times=NULL; IssmDouble* values=NULL; - Constraints* constraints = NULL; /*Fetch parameters: */ @@ -37,5 +36,5 @@ /*Recover pointer: */ - constraints=*pconstraints; + Constraints* constraints=*pconstraints; /*Create constraints if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (revision 13762) @@ -13,9 +13,6 @@ void CreateLoadsEnthalpy(Loads** ploads, IoModel* iomodel){ - /*DataSet*/ - Loads* loads=NULL; - /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Create loads if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 13762) @@ -20,12 +20,9 @@ int numberofvertices; - /*DataSets: */ - Nodes* nodes = NULL; - /*Fetch parameters: */ iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*Create nodes if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp (revision 13762) @@ -14,9 +14,6 @@ void CreateConstraintsHydrology(Constraints** pconstraints, IoModel* iomodel){ - /*Output*/ - Constraints *constraints = NULL; - /*Recover pointer: */ - constraints=*pconstraints; + Constraints* constraints=*pconstraints; /*Create constraints if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateLoadsHydrology.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateLoadsHydrology.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateLoadsHydrology.cpp (revision 13762) @@ -13,12 +13,6 @@ void CreateLoadsHydrology(Loads** ploads, IoModel* iomodel){ - /*Intermediary*/ - int i; - - /*DataSet*/ - Loads* loads = NULL; - /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Create loads if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp (revision 13762) @@ -20,12 +20,9 @@ int numberofvertices; - /*DataSets: */ - Nodes* nodes = NULL; - /*Fetch parameters: */ iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*Create nodes if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 13762) @@ -13,13 +13,6 @@ void CreateConstraintsMelting(Constraints** pconstraints, IoModel* iomodel){ - /*Intermediary*/ - int i; - int count; - - /*Intermediary*/ - Constraints* constraints = NULL; - /*Recover pointer: */ - constraints=*pconstraints; + Constraints* constraints=*pconstraints; /*Create constraints if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 13762) @@ -14,12 +14,6 @@ /*Intermediary*/ - int i; - int dim; - int numberofvertices; - - /*DataSet*/ - Loads* loads = NULL; - - /*Fetch parameters: */ + int dim; + int numberofvertices; iomodel->Constant(&dim,MeshDimensionEnum); iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); @@ -29,5 +23,5 @@ /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Create loads if they do not exist yet*/ @@ -38,5 +32,5 @@ CreateSingleNodeToElementConnectivity(iomodel); - for (i=0;imy_vertices[i]==1)){ if (reCast(iomodel->Data(MeshVertexonbedEnum)[i])){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 13762) @@ -20,12 +20,9 @@ int numberofvertices; - /*DataSets: */ - Nodes* nodes = NULL; - /*Fetch parameters: */ iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*Create nodes if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 13762) @@ -10,14 +10,10 @@ void CreateConstraintsPrognostic(Constraints** pconstraints, IoModel* iomodel){ + /*Fetch parameters: */ int stabilization; - - /*Fetch parameters: */ iomodel->Constant(&stabilization,PrognosticStabilizationEnum); - /*Output*/ - Constraints *constraints = NULL; - /*Recover pointer: */ - constraints=*pconstraints; + Constraints* constraints=*pconstraints; /*Create constraints if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 13762) @@ -23,7 +23,4 @@ int numberofelements; - /*DataSet*/ - Loads* loads = NULL; - /*Fetch parameters: */ iomodel->Constant(&stabilization,PrognosticStabilizationEnum); @@ -32,5 +29,5 @@ /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Create loads if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 13762) @@ -26,7 +26,4 @@ int stabilization; - /*DataSets: */ - Nodes* nodes = NULL; - /*Fetch parameters: */ iomodel->Constant(&dim,MeshDimensionEnum); @@ -36,5 +33,5 @@ /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*Create nodes if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (revision 13762) @@ -13,9 +13,6 @@ void CreateConstraintsSurfaceSlope(Constraints** pconstraints, IoModel* iomodel){ - /*Output*/ - Constraints* constraints = NULL; - /*Recover pointer: */ - constraints=*pconstraints; + Constraints* constraints=*pconstraints; /*Create constraints if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp (revision 13762) @@ -13,9 +13,6 @@ void CreateLoadsSurfaceSlope(Loads** ploads, IoModel* iomodel){ - /*DataSet*/ - Loads* loads = NULL; - /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Create loads if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 13762) @@ -16,10 +16,6 @@ /*Intermediary*/ - int i; bool continuous_galerkin=true; int numberofvertices; - - /*DataSets: */ - Nodes* nodes = NULL; /*Fetch parameters: */ @@ -27,5 +23,5 @@ /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*Create nodes if they do not exist yet*/ @@ -38,6 +34,5 @@ iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); - for (i=0;imy_vertices[i]){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 13762) @@ -14,17 +14,10 @@ void CreateConstraintsThermal(Constraints** pconstraints, IoModel* iomodel){ - /*Intermediary*/ - int i; - int count; + /*Fetch parameters: */ int dim; - - /*Output*/ - Constraints* constraints = NULL; - - /*Fetch parameters: */ iomodel->Constant(&dim,MeshDimensionEnum); /*Recover pointer: */ - constraints=*pconstraints; + Constraints* constraints=*pconstraints; /*Create constraints if they do not exist yet*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 13762) @@ -17,11 +17,8 @@ int dim; int numberofvertices; - - /*DataSet*/ - Loads* loads = NULL; Pengrid* pengrid = NULL; /*Recover pointer: */ - loads=*ploads; + Loads* loads=*ploads; /*Fetch parameters: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 13762) @@ -16,16 +16,12 @@ /*Intermediary*/ - int i; bool continuous_galerkin=true; - int numberofvertices; - - /*DataSets: */ - Nodes* nodes = NULL; /*Fetch parameters: */ + int numberofvertices; iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); /*Recover pointer: */ - nodes=*pnodes; + Nodes* nodes=*pnodes; /*Create nodes if they do not exist yet*/ @@ -38,6 +34,5 @@ iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); - for (i=0;imy_vertices[i]){ /*Add node to nodes dataset: */ Index: /issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp (revision 13762) @@ -14,5 +14,4 @@ int noerr=1; int found=0; - int i; /*Do we have any nodes for this analysis type? :*/ Index: /issm/trunk-jpl/src/c/modules/Orthx/Orthx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Orthx/Orthx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/Orthx/Orthx.cpp (revision 13762) @@ -11,5 +11,5 @@ /*intermediary:*/ - IssmDouble norm_new,norm_old,dot_product;; + IssmDouble norm_old,dot_product;; /*Initialize output*/ Index: /issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp (revision 13762) @@ -20,5 +20,4 @@ int global_m,global_n; bool fromlocalsize = true; - int verbose; if(VerboseModule()) _pprintLine_(" Dirichlet lifting applied to load vector"); Index: /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 13762) @@ -15,7 +15,4 @@ void Solverx(Vector** puf, Matrix* Kff, Vector* pf, Vector* uf0,Vector* df, Parameters* parameters){ - - /*Intermediary: */ - int analysis_type; /*output: */ Index: /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (revision 13762) @@ -36,5 +36,4 @@ /*Intermediary: */ int local_m,local_n,global_m,global_n; - int analysis_type; /*Solver */ Index: /issm/trunk-jpl/src/c/modules/TriaSearchx/TriaSearchx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/TriaSearchx/TriaSearchx.cpp (revision 13761) +++ /issm/trunk-jpl/src/c/modules/TriaSearchx/TriaSearchx.cpp (revision 13762) @@ -24,13 +24,8 @@ R2 r; I2 I; - int i,j,k; - int i0,i1,i2; - double areacoord[3]; - double aa,bb; - double data_value; + int i; Icoor2 dete[3]; - int verbose=0; - // read background mesh + /* read background mesh */ Mesh Th(index,x,y,nods,nel); Th.CreateSingleVertexToTriangleConnectivity();