Changeset 28252

Timestamp:

05/03/24 10:37:17 (11 months ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing compiler warnings

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• modules/SurfaceMassBalancex/Gembx.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -3304 +3304 @@
         /*build friction object, used later on: */
         /*dim=4 is special for HO, which is actually 2.5D*/
-        Friction* friction=new Friction(element,dim==3?2.5:1.0);
+        Friction* friction=NULL;
+        if(dim==3)
+         friction = new Friction(element, 2.5); 
+        else
+         friction = new Friction(element, 1); 
 
         /*Recover portion of element that is grounded*/

issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp

@@ -661 +661 @@
                         IssmDouble aice=0.0;
                         int lice=0;
-                        for(int l=0;(l<m & d[l]<dPHC-Dtol);l++){
+                        for(int l=0;(l<m && d[l]<dPHC-Dtol);l++){
                                 depthsnow=depthsnow+dz[l];
                                 lice=l+1;