Changeset 28253

Timestamp:

05/03/24 11:45:49 (12 months ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing compiler warnings

Location:

issm/trunk-jpl/src/c

Files:

• classes/Loads/Friction.cpp (modified) (1 diff)
• classes/Loads/Friction.h (modified) (2 diffs)
• modules/SurfaceMassBalancex/Gembx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

@@ -101 +101 @@
 /*}}}*/
 Friction::Friction(Element* element_in,int dim) : Friction(element_in) {/*{{{*/
-        this->apply_dim = reCast<IssmDouble>(dim);
+        this->apply_dim = reCast<IssmPDouble>(dim);
 }
 /*}}}*/
-Friction::Friction(Element* element_in,IssmDouble dim) : Friction(element_in) {/*{{{*/
+Friction::Friction(Element* element_in,IssmPDouble dim) : Friction(element_in) {/*{{{*/
         this->apply_dim = dim;
 }

issm/trunk-jpl/src/c/classes/Loads/Friction.h

@@ -21 +21 @@
                 int         domaintype;
                 int         linearize;
-                IssmDouble  apply_dim;
+                IssmPDouble apply_dim;
                 Input      *vx_input;
                 Input      *vy_input;
@@ -32 +32 @@
                 Friction(Element* element_in);
                 Friction(Element* element_in, int dim);
-                Friction(Element* element_in, IssmDouble dim);
+                Friction(Element* element_in, IssmPDouble dim);
                 ~Friction();
 

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

@@ -228 +228 @@
         IssmDouble z1=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++){
                 z1=z1+dz[l]*d[l]; //mm
                 lice=l+1;
@@ -665 +665 @@
                                 lice=l+1;
                         }
-                        if (depthsnow<=0.1+Dtol & lice<m & d[lice]>=dPHC-Dtol){
+                        if (depthsnow<=0.1+Dtol && lice<m && d[lice]>=dPHC-Dtol){
                                 aice = ai_max + (as_min - ai_max)*(d[lice]-dIce)/(dPHC-dIce);
                                 a[0]= aice + max(a[0]-aice,0.0)*(depthsnow/0.1);