source: issm/oecreview/Archive/11025-11228/ISSM-11069-11070.diff

Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/isnan.h
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/isnan.h     (revision 11069)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/isnan.h     (revision 11070)
@@ -7,6 +7,7 @@
 
 #ifdef _INTEL_WIN_
 int isnan(double X);
+#define NAN 0.0/0.0
 #endif
 
 #endif
Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp  (revision 11069)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp  (revision 11070)
@@ -66,7 +66,7 @@
                case SurfaceforcingsAblationRateEnum:     scale=yts;break; //m/yr
                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;
        }
        return scale;
Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp   (revision 11069)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp   (revision 11070)
@@ -4901,7 +4901,7 @@
        for(i=0;i<numdof;i++){
                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
  
        }
 
Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/IntInput.cpp
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 11069)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 11070)
@@ -189,7 +189,7 @@
 void IntInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
 
        /*square min of an integer is the square of the integer itself: */
-       *psquaremin=pow(value,2);
+       *psquaremin=pow((double)value,2);
 }
 /*}}}*/
 /*FUNCTION IntInput::Scale{{{1*/