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/modules/BamgTriangulate/BamgTriangulate.cpp

    r12878 r13101  
    3232
    3333        /*Check inputs*/
    34         if(y_rows!=nods)         _error2_("x and y do not have the same length");
    35         if(x_cols>1 || y_cols>1) _error2_("x and y should have only one column");
    36         if(nods<3)               _error2_("At least 3 points are required");
     34        if(y_rows!=nods)         _error_("x and y do not have the same length");
     35        if(x_cols>1 || y_cols>1) _error_("x and y should have only one column");
     36        if(nods<3)               _error_("At least 3 points are required");
    3737
    3838        /* Run core computations: */
Note: See TracChangeset for help on using the changeset viewer.