Ignore:
Timestamp:
08/20/12 17:39:30 (13 years ago)
Author:
cborstad
Message:

merged trunk-jpl through revision 13099 into branch

Location:
issm/branches/trunk-jpl-damage
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-jpl-damage

    • Property svn:ignore

      •  

        old new  
         1projects
        12autom4te.cache
        23aclocal.m4
    • Property svn:mergeinfo changed
      /issm/trunk-jplmerged: 12948-13099

  • issm/branches/trunk-jpl-damage/src/c/Container/Observations.cpp

    r12946 r13101  
    5858        options->Get(&maxtrimming,"maxtrimming",+1.e+21);
    5959        options->Get(&minspacing,"minspacing",0.01);
    60         if(minspacing<=0) _error2_("minspacing must > 0");
     60        if(minspacing<=0) _error_("minspacing must > 0");
    6161
    6262        /*Get Minimum box size*/
    6363        if(options->GetOption("boxlength")){
    6464                options->Get(&minlength,"boxlength");
    65                 if(minlength<=0)_error2_("boxlength should be a positive number");
    66                 maxdepth=int(log(max(xmax-xmin,ymax-ymin)/minlength +1)/log(2.0));
     65                if(minlength<=0)_error_("boxlength should be a positive number");
     66                maxdepth=reCast<int,IssmDouble>(log(max(xmax-xmin,ymax-ymin)/minlength +1)/log(2.0));
    6767        }
    6868        else{
    … …  
    383383        SolverxSeq(&GinvZ, Gamma,obs,n_obs);    // Gamma^-1 Z
    384384#else
    385         _error2_("GSL is required");
     385        _error_("GSL is required");
    386386#endif
    387387
Note: See TracChangeset for help on using the changeset viewer.