Index: /issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp =================================================================== --- /issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp (revision 16521) @@ -350,5 +350,5 @@ /*if the next box exists:*/ - if (b=b->b[k]){ + if((b=b->b[k])){ /*Get size (hb) and coordinates of the current sub-box lowest left corner*/ Index: /issm/trunk-jpl/src/c/bamg/Mesh.cpp =================================================================== --- /issm/trunk-jpl/src/c/bamg/Mesh.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/bamg/Mesh.cpp (revision 16521) @@ -1152,5 +1152,5 @@ //some checks - if (( infvertexindex <0 ) && (detOld <0) || ( infvertexindex >=0 ) && (detOld >0) ){ + if(((infvertexindex <0 ) && (detOld <0)) || ((infvertexindex >=0) && (detOld >0)) ){ _error_("inconsistent configuration (Contact ISSM developers)"); } @@ -2761,5 +2761,5 @@ vertices=new BamgVertex[maxnbv]; _assert_(vertices); - orderedvertices=new (BamgVertex* [maxnbv]); + orderedvertices=new BamgVertex* [maxnbv]; _assert_(orderedvertices); triangles=new Triangle[maxnbt]; @@ -3010,5 +3010,5 @@ _error_("!Gh.nbe"); } - Edge **e= new (Edge* [Gh.nbe]); + Edge **e= new Edge* [Gh.nbe]; long i; @@ -3115,5 +3115,5 @@ for (int j=0;j<3;j++){ Triangle &tt = *t.TriangleAdj(j); - if ( ! &tt || it < GetId(tt) && ( tt.link || t.link)){ + if ( (!&tt || it < GetId(tt)) && ( tt.link || t.link)){ BamgVertex &v0 = t[VerticesOfTriangularEdge[j][0]]; BamgVertex &v1 = t[VerticesOfTriangularEdge[j][1]]; @@ -4967,5 +4967,5 @@ } BamgVertex *aa = tc.EdgeVertex(0), *bb = tc.EdgeVertex(1); - if (( aa == &a ) && (bb == &b) || (bb == &a ) && (aa == &b)) { + if (((aa == &a ) && (bb == &b)) ||((bb == &a ) && (aa == &b))){ tc.SetLock(); a.Optim(1,0); @@ -5109,10 +5109,10 @@ detsb=-detsb; - if (ToSwap) + if(ToSwap){ if (dets2 < 0) {// haut dets1 = (ToSwap ? dets1 : detsa) ; detsa = dets2; tt1 = Previous(tt2) ;} - else if (dets2 > 0){// bas + else if(dets2 > 0){// bas dets1 = (ToSwap ? dets1 : detsb) ; detsb = dets2; @@ -5122,4 +5122,5 @@ tt1 = Next(tt2); ret =0;} + } } Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 16521) @@ -1226,5 +1226,5 @@ if(*Jdet<0) _error_("negative jacobian determinant!"); } -/*}}}* +/*}}}*/ /*FUNCTION PentaRef::GetSegmentJacobianDeterminant{{{*/ void PentaRef::GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussPenta* gauss){ Index: /issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp (revision 16521) @@ -314,5 +314,5 @@ /* return next non " =?/>" and move past subsequent " =?/>" */ - while (ktokn=strtok(NULL," =?/>")) { + while((ktokn=strtok(NULL," =?/>"))){ /* return next non quote and move past subsequent quote */ @@ -358,5 +358,5 @@ /* get additional token and compare to closing tag */ - if (ktag) + if(ktag){ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || @@ -365,6 +365,8 @@ (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1))) {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} - else + else{ xDelete(kstr); + } + } // _printf0_("KMLFileTokenParse -- " << ktag << "=" << *pival << ".\n"); @@ -392,5 +394,5 @@ /* get additional token and compare to closing tag */ - if (ktag) + if(ktag){ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || @@ -401,4 +403,5 @@ else xDelete(kstr); + } // _printf0_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << ".\n"); @@ -453,5 +456,5 @@ /* get additional token and compare to closing tag */ - if (ktag) + if(ktag){ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || @@ -462,4 +465,5 @@ else xDelete(kstr); + } // _printf0_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\".\n"); @@ -487,5 +491,5 @@ /* get additional token and compare to closing tag */ - if (ktag) + if(ktag){ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || @@ -496,4 +500,5 @@ else xDelete(kstr); + } // _printf0_("KMLFileTokenParse -- " << ktag << "=" << *pfval << ".\n"); @@ -521,5 +526,5 @@ /* get additional token and compare to closing tag */ - if (ktag) + if(ktag){ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || @@ -530,4 +535,5 @@ else xDelete(kstr); + } // _printf0_("KMLFileTokenParse -- " << ktag << "=" << *pdval << ".\n"); @@ -554,9 +560,10 @@ _error_("KMLFileTokenParse -- Missing double [m] field for " << ktag << ".\n"); - if (!*pdval) + if(!*pdval){ if (maxlen) *pdval=xNew(maxlen ); else *pdval=xNew((strlen(kstr)+1)/2); + } /* loop through string to get all values */ @@ -585,5 +592,5 @@ /* get additional token and compare to closing tag */ - if (ktag) + if(ktag){ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || @@ -594,4 +601,5 @@ else xDelete(kstr); + } // _printf0_("KMLFileTokenParse -- " << ktag << "=...\n"); @@ -620,9 +628,10 @@ _error_("KMLFileTokenParse -- Missing double [m x n] field for " << ktag << ".\n"); - if (!*pdval) + if(!*pdval){ if (maxlen) *pdval=xNew(maxlen*n ); else *pdval=xNew((strlen(kstr)+1)/2); + } /* loop through string to get all values */ @@ -655,5 +664,5 @@ /* get additional token and compare to closing tag */ - if (ktag) + if(ktag){ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || @@ -664,4 +673,5 @@ else xDelete(kstr); + } // _printf0_("KMLFileTokenParse -- " << ktag << "=...\n"); @@ -673,6 +683,5 @@ /*}}}*/ /*FUNCTION KMLFileTagSkip {{{*/ -int KMLFileTagSkip(char* ktag, - FILE* fid){ +int KMLFileTagSkip(char* ktag, FILE* fid){ char* kstr; @@ -685,9 +694,6 @@ /* if next token is a closing tag, compare to input */ - while (kstr=KMLFileToken(fid, - NULL,NULL)) { - if ((kstr[0] == '<') && - (kstr[1] == '/') && - (!strncmp(&(kstr[2]),&(ktag[1]),(strcspn(ktag," >")-1)/sizeof(char)))) { + while((kstr=KMLFileToken(fid,NULL,NULL))){ + if((kstr[0] == '<') && (kstr[1] == '/') && (!strncmp(&(kstr[2]),&(ktag[1]),(strcspn(ktag," >")-1)/sizeof(char)))){ _printf0_("KMLFileTagSkip -- closing tag " << kstr << ".\n"); xDelete(kstr); Index: /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 16521) @@ -86,5 +86,5 @@ sprintf(klsty->color ,"ff000000"); sprintf(klsty->colormode ,"normal"); - klsty->width ,lwidth; + klsty->width =lwidth; kpsty =new KML_PolyStyle(); sprintf(kpsty->color ,"00ffffff"); Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 16521) @@ -99,5 +99,5 @@ /*Inside convex but outside mesh*/ - if (reft[it]<0 & isdefault){ + if (reft[it]<0 && isdefault){ for(j=0;jmy_vertices[i]==1)){ + if(iomodel->my_vertices[i]){ if (xIsNan(iomodel->Data(DamageSpcdamageEnum)[i])){ //No penalty applied on spc nodes! loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,DamageEvolutionAnalysisEnum)); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (revision 16521) @@ -24,10 +24,10 @@ if (iomodel->meshtype==Mesh3DEnum){ /*keep only this partition's nodes:*/ - if((iomodel->my_vertices[i]==1)){ + if(iomodel->my_vertices[i]){ loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,HydrologyDCInefficientAnalysisEnum)); } } else if(reCast(iomodel->Data(MeshVertexonbedEnum)[i])){ - if((iomodel->my_vertices[i]==1)){ + if(iomodel->my_vertices[i]){ loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,HydrologyDCInefficientAnalysisEnum)); } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 16521) @@ -20,5 +20,5 @@ for(int i=0;inumberofvertices;i++){ - if((iomodel->my_vertices[i]==1)){ + if(iomodel->my_vertices[i]){ if (reCast(iomodel->Data(MeshVertexonbedEnum)[i])){ loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,MeltingAnalysisEnum)); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceSIA/CreateConstraintsStressbalanceSIA.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceSIA/CreateConstraintsStressbalanceSIA.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceSIA/CreateConstraintsStressbalanceSIA.cpp (revision 16521) @@ -38,5 +38,5 @@ /*keep only this partition's nodes:*/ if((iomodel->my_vertices[i])){ - if (!reCast(iomodel->Data(FlowequationVertexEquationEnum)[i])==SIAApproximationEnum){ + if (reCast(iomodel->Data(FlowequationVertexEquationEnum)[i])!=SIAApproximationEnum){ constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,StressbalanceSIAAnalysisEnum)); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 16521) @@ -21,5 +21,5 @@ /*keep only this partition's nodes:*/ - if((iomodel->my_vertices[i]==1)){ + if(iomodel->my_vertices[i]){ if (xIsNan(iomodel->Data(ThermalSpctemperatureEnum)[i])){ //No penalty applied on spc nodes! loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,ThermalAnalysisEnum)); Index: /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 16521) @@ -223,5 +223,5 @@ sprintf(klsty->color ,"ff000000"); sprintf(klsty->colormode ,"normal"); - klsty->width ,lwidth; + klsty->width =lwidth; kpsty =new KML_PolyStyle(); sprintf(kpsty->color ,"00ffffff"); Index: /issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp (revision 16520) +++ /issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp (revision 16521) @@ -474,6 +474,6 @@ node3=segments[3*k+0]-1; node4=segments[3*k+1]-1; /*We are trying to find 2 elements, where position of node3 == position of node1, and position of node4 == position of node2*/ - if ( (x[node3]==x[node1]) && (y[node3]==y[node1]) && (x[node4]==x[node2]) && (y[node4]==y[node2]) - || (x[node3]==x[node2]) && (y[node3]==y[node2]) && (x[node4]==x[node1]) && (y[node4]==y[node1]) ){ + if ( ((x[node3]==x[node1]) && (y[node3]==y[node1]) && (x[node4]==x[node2]) && (y[node4]==y[node2])) + || ((x[node3]==x[node2]) && (y[node3]==y[node2]) && (x[node4]==x[node1]) && (y[node4]==y[node1])) ){ /*We found the corresponding element: */ pairs[2*j+1]=segments[3*k+2];