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/classes/objects/Params/TransientParam.cpp

    r12832 r13101  
    9999void  TransientParam::GetParameterValue(IssmDouble* pdouble,IssmDouble time){
    100100
    101         double output;
     101        IssmDouble output;
    102102        bool   found;
    103103
    … …  
    136136                }
    137137        }
    138         if(!found)_error2_("did not find time interval on which to interpolate values");
     138        if(!found)_error_("did not find time interval on which to interpolate values");
    139139        *pdouble=output;
    140140}
Note: See TracChangeset for help on using the changeset viewer.