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

Last change on this file since 11232 was 11232, checked in by Eric.Larour, 13 years ago

Archiving changes from 11025 to 11228

File size: 2.5 KB
  • proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/isnan.h

     
    77
    88#ifdef _INTEL_WIN_
    99int isnan(double X);
     10#define NAN 0.0/0.0
    1011#endif
    1112
    1213#endif
  • proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp

     
    6666                case SurfaceforcingsAblationRateEnum:     scale=yts;break; //m/yr
    6767                case SurfaceforcingsMassBalanceEnum:      scale=yts;break; //m/yr
    6868                case MisfitEnum:      scale=pow(yts,2);break; //(m/yr)^2
    69                 case MassFluxEnum:    scale=pow(10,-12)*yts;break; // (GigaTon/year)
     69                case MassFluxEnum:    scale=pow((double)10,-12)*yts;break; // (GigaTon/year)
    7070                default: scale=1.0; break;
    7171        }
    7272        return scale;
  • proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp

     
    49014901        for(i=0;i<numdof;i++){
    49024902                values[i]=solution[doflist[i]];
    49034903                if(isnan(values[i])) _error_("NaN found in solution vector");
    4904                 if (values[i]<pow(10,-10))values[i]=pow(10,-10); //correcting the water column to positive values
     4904                if (values[i]<pow((double)10,(double)-10))values[i]=pow((double)10,(double)-10); //correcting the water column to positive values
    49054905 
    49064906        }
    49074907
  • proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/IntInput.cpp

     
    189189void IntInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    190190
    191191        /*square min of an integer is the square of the integer itself: */
    192         *psquaremin=pow(value,2);
     192        *psquaremin=pow((double)value,2);
    193193}
    194194/*}}}*/
    195195/*FUNCTION IntInput::Scale{{{1*/
Note: See TracBrowser for help on using the repository browser.