Changeset 11070

Timestamp:

12/29/11 12:03:38 (13 years ago)

Author:

Eric.Larour

Message:

Windows port: defined NAN in isnan.h header. Also updated
use of pow() routine in the case where both arguments are int. Cast
first to double.

Location:

issm/trunk-jpl/src/c

Files:

• objects/Elements/Tria.cpp (modified) (1 diff)
• objects/Inputs/IntInput.cpp (modified) (1 diff)
• shared/Numerics/UnitConversion.cpp (modified) (1 diff)
• shared/Numerics/isnan.h (modified) (1 diff)

issm/trunk-jpl/src/c/objects/Elements/Tria.cpp

@@ -4902 +4902 @@
                 values[i]=solution[doflist[i]];
                 if(isnan(values[i])) _error_("NaN found in solution vector");
-                if (values[i]<pow(10,-10))values[i]=pow(10,-10); //correcting the water column to positive values
+                if (values[i]<pow((double)10,(double)-10))values[i]=pow((double)10,(double)-10); //correcting the water column to positive values
  
         }

issm/trunk-jpl/src/c/objects/Inputs/IntInput.cpp

@@ -190 +190 @@
 
         /*square min of an integer is the square of the integer itself: */
-        *psquaremin=pow(value,2);
+        *psquaremin=pow((double)value,2);
 }
 /*}}}*/

issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp

@@ -67 +67 @@
                 case SurfaceforcingsMassBalanceEnum:      scale=yts;break; //m/yr
                 case MisfitEnum:      scale=pow(yts,2);break; //(m/yr)^2
-                case MassFluxEnum:    scale=pow(10,-12)*yts;break; // (GigaTon/year)
+                case MassFluxEnum:    scale=pow((double)10,-12)*yts;break; // (GigaTon/year)
                 default: scale=1.0; break;
         }

issm/trunk-jpl/src/c/shared/Numerics/isnan.h

@@ -8 +8 @@
 #ifdef _INTEL_WIN_
 int isnan(double X);
+#define NAN 0.0/0.0
 #endif