Changeset 16521

Timestamp:

10/22/13 14:18:40 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed some warnings from compiler

Location:

issm/trunk-jpl/src/c

Files:

• bamg/BamgQuadtree.cpp (modified) (1 diff)
• bamg/Mesh.cpp (modified) (7 diffs)
• classes/Elements/PentaRef.cpp (modified) (1 diff)
• kml/KMLFileReadUtils.cpp (modified) (19 diffs)
• modules/Exp2Kmlx/Exp2Kmlx.cpp (modified) (1 diff)
• modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (modified) (1 diff)
• modules/ModelProcessorx/Damage/CreateLoadsDamage.cpp (modified) (1 diff)
• modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (modified) (1 diff)
• modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (modified) (1 diff)
• modules/ModelProcessorx/StressbalanceSIA/CreateConstraintsStressbalanceSIA.cpp (modified) (1 diff)
• modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (modified) (1 diff)
• modules/Shp2Kmlx/Shp2Kmlx.cpp (modified) (1 diff)
• shared/TriMesh/TriMeshUtils.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp

@@ -350 +350 @@
 
                                         /*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*/

issm/trunk-jpl/src/c/bamg/Mesh.cpp

@@ -1152 +1152 @@
 
                 //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 +2761 @@
                         vertices=new BamgVertex[maxnbv];
                         _assert_(vertices);
-                        orderedvertices=new (BamgVertex* [maxnbv]);
+                        orderedvertices=new BamgVertex* [maxnbv];
                         _assert_(orderedvertices);
                         triangles=new Triangle[maxnbt];
@@ -3010 +3010 @@
                         _error_("!Gh.nbe");
                 }
-                Edge **e= new (Edge* [Gh.nbe]);
+                Edge **e= new Edge* [Gh.nbe];
 
                 long i;
@@ -3115 +3115 @@
                         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 +4967 @@
                          }
                         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 +5109 @@
                         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 +5122 @@
                                  tt1 = Next(tt2);
                                  ret =0;}
+                        }
 
                 }

issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp

@@ -1226 +1226 @@
         if(*Jdet<0) _error_("negative jacobian determinant!");
 }
-/*}}}*
+/*}}}*/
 /*FUNCTION PentaRef::GetSegmentJacobianDeterminant{{{*/
 void PentaRef::GetSegmentJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,GaussPenta* gauss){

issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp

@@ -314 +314 @@
 
         /*  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 +358 @@
 /*  get additional token and compare to closing tag  */
 
-        if (ktag)
+        if(ktag){
                 if (!(kstr=KMLFileToken(fid,
                                                                 NULL,NULL)) ||
@@ -365 +365 @@
                         (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
                   {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
-                else
+                else{
                         xDelete<char>(kstr);
+                }
+        }
 
 //      _printf0_("KMLFileTokenParse -- " << ktag << "=" << *pival << ".\n");
@@ -392 +394 @@
 /*  get additional token and compare to closing tag  */
 
-        if (ktag)
+        if(ktag){
                 if (!(kstr=KMLFileToken(fid,
                                                                 NULL,NULL)) ||
@@ -401 +403 @@
                 else
                         xDelete<char>(kstr);
+        }
 
 //      _printf0_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << ".\n");
@@ -453 +456 @@
 /*  get additional token and compare to closing tag  */
 
-        if (ktag)
+        if(ktag){
                 if (!(kstr=KMLFileToken(fid,
                                                                 NULL,NULL)) ||
@@ -462 +465 @@
                 else
                         xDelete<char>(kstr);
+        }
 
 //      _printf0_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\".\n");
@@ -487 +491 @@
 /*  get additional token and compare to closing tag  */
 
-        if (ktag)
+        if(ktag){
                 if (!(kstr=KMLFileToken(fid,
                                                                 NULL,NULL)) ||
@@ -496 +500 @@
                 else
                         xDelete<char>(kstr);
+        }
 
 //      _printf0_("KMLFileTokenParse -- " << ktag << "=" << *pfval << ".\n");
@@ -521 +526 @@
 /*  get additional token and compare to closing tag  */
 
-        if (ktag)
+        if(ktag){
                 if (!(kstr=KMLFileToken(fid,
                                                                 NULL,NULL)) ||
@@ -530 +535 @@
                 else
                         xDelete<char>(kstr);
+        }
 
 //      _printf0_("KMLFileTokenParse -- " << ktag << "=" << *pdval << ".\n");
@@ -554 +560 @@
                 _error_("KMLFileTokenParse -- Missing double [m] field for " << ktag << ".\n");
 
-        if (!*pdval)
+        if(!*pdval){
                 if (maxlen)
                         *pdval=xNew<IssmPDouble>(maxlen            );
                 else
                         *pdval=xNew<IssmPDouble>((strlen(kstr)+1)/2);
+        }
 
 /*  loop through string to get all values  */
@@ -585 +592 @@
 /*  get additional token and compare to closing tag  */
 
-        if (ktag)
+        if(ktag){
                 if (!(kstr=KMLFileToken(fid,
                                                                 NULL,NULL)) ||
@@ -594 +601 @@
                 else
                         xDelete<char>(kstr);
+        }
 
 //      _printf0_("KMLFileTokenParse -- " << ktag << "=...\n");
@@ -620 +628 @@
                 _error_("KMLFileTokenParse -- Missing double [m x n] field for " << ktag << ".\n");
 
-        if (!*pdval)
+        if(!*pdval){
                 if (maxlen)
                         *pdval=xNew<IssmPDouble>(maxlen*n          );
                 else
                         *pdval=xNew<IssmPDouble>((strlen(kstr)+1)/2);
+        }
 
 /*  loop through string to get all values  */
@@ -655 +664 @@
 /*  get additional token and compare to closing tag  */
 
-        if (ktag)
+        if(ktag){
                 if (!(kstr=KMLFileToken(fid,
                                                                 NULL,NULL)) ||
@@ -664 +673 @@
                 else
                         xDelete<char>(kstr);
+        }
 
 //      _printf0_("KMLFileTokenParse -- " << ktag << "=...\n");
@@ -673 +683 @@
 /*}}}*/
 /*FUNCTION  KMLFileTagSkip {{{*/
-int KMLFileTagSkip(char* ktag,
-                                   FILE* fid){
+int KMLFileTagSkip(char* ktag, FILE* fid){
 
         char*   kstr;
@@ -685 +694 @@
 /*  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<char>(kstr);

issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp

@@ -86 +86 @@
         sprintf(klsty->color     ,"ff000000");
         sprintf(klsty->colormode ,"normal");
-        klsty->width     ,lwidth;
+        klsty->width     =lwidth;
         kpsty =new KML_PolyStyle();
         sprintf(kpsty->color     ,"00ffffff");

issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

@@ -99 +99 @@
 
                         /*Inside convex but outside mesh*/
-                        if (reft[it]<0 & isdefault){
+                        if (reft[it]<0 && isdefault){
                                 for(j=0;j<N_data;j++) data_interp[i*N_data+j]=defaultvalue;
                                 continue;

issm/trunk-jpl/src/c/modules/ModelProcessorx/Damage/CreateLoadsDamage.cpp

@@ -19 +19 @@
 
                 /*keep only this partition's nodes:*/
-                if((iomodel->my_vertices[i]==1)){
+                if(iomodel->my_vertices[i]){
                         if (xIsNan<IssmDouble>(iomodel->Data(DamageSpcdamageEnum)[i])){ //No penalty applied on spc nodes!
                                 loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,DamageEvolutionAnalysisEnum));

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp

@@ -24 +24 @@
                 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<int>(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));
                         }       

issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp

@@ -20 +20 @@
 
         for(int i=0;i<iomodel->numberofvertices;i++){
-                if((iomodel->my_vertices[i]==1)){
+                if(iomodel->my_vertices[i]){
                         if (reCast<int>(iomodel->Data(MeshVertexonbedEnum)[i])){
                                 loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,MeltingAnalysisEnum));

issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceSIA/CreateConstraintsStressbalanceSIA.cpp

@@ -38 +38 @@
                 /*keep only this partition's nodes:*/
                 if((iomodel->my_vertices[i])){
-                        if (!reCast<int,IssmDouble>(iomodel->Data(FlowequationVertexEquationEnum)[i])==SIAApproximationEnum){
+                        if (reCast<int,IssmDouble>(iomodel->Data(FlowequationVertexEquationEnum)[i])!=SIAApproximationEnum){
 
                                 constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,StressbalanceSIAAnalysisEnum));

issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

@@ -21 +21 @@
 
                 /*keep only this partition's nodes:*/
-                if((iomodel->my_vertices[i]==1)){
+                if(iomodel->my_vertices[i]){
                         if (xIsNan<IssmDouble>(iomodel->Data(ThermalSpctemperatureEnum)[i])){ //No penalty applied on spc nodes!
                                 loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,ThermalAnalysisEnum));

issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

@@ -223 +223 @@
         sprintf(klsty->color     ,"ff000000");
         sprintf(klsty->colormode ,"normal");
-        klsty->width     ,lwidth;
+        klsty->width     =lwidth;
         kpsty =new KML_PolyStyle();
         sprintf(kpsty->color     ,"00ffffff");

issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp

@@ -474 +474 @@
                                 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];