Changeset 21217

Timestamp:

09/21/16 20:29:30 (8 years ago)

Author:

glperez

Message:

FIX: Changed type of isX to fix issue with converting double to bool in AD builds..

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (2 diffs)

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

@@ -2246 +2246 @@
 
         /*Intermediary variables: {{{*/
-    IssmDouble isinitialized;
-    IssmDouble isrestart;
-    IssmDouble zTop,dzTop,zMax,zMin,zY,dzMin;
+   bool       isinitialized;
+   bool       isrestart;
+   IssmDouble zTop,dzTop,zMax,zMin,zY,dzMin;
         IssmDouble Tmean; 
         IssmDouble C; 
@@ -2266 +2266 @@
         IssmDouble lhf, shf, dayEC;
         IssmDouble initMass;
-    IssmDouble sumR, sumM, sumEC, sumP, sumW,sumMassAdd;
-    IssmDouble sumdz_add;
-    IssmDouble sumMass,dMass;
+   IssmDouble sumR, sumM, sumEC, sumP, sumW,sumMassAdd;
+   IssmDouble sumdz_add;
+   IssmDouble sumMass,dMass;
         bool isgraingrowth,isalbedo,isshortwave,isthermal,isaccumulation,ismelt,isdensification,isturbulentflux;
         IssmDouble init_scaling;