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