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

    r12878 r13101  
    3535        /*Checks*/
    3636        if (M_data!=nods_data && M_data!=nels_data){
    37                 _error2_("data provided should have either " << nods_data << " or " << nels_data << " lines (not " << M_data << ")");
     37                _error_("data provided should have either " << nods_data << " or " << nels_data << " lines (not " << M_data << ")");
    3838        }
    3939
    … …  
    138138                        for (j=0;j<N_data;j++){
    139139                                if (it<0 || it>=nels_data){
    140                                         _error2_("Triangle number " << it << " not in [0 " << nels_data << "], report bug to developers");
     140                                        _error_("Triangle number " << it << " not in [0 " << nels_data << "], report bug to developers");
    141141                                }
    142142                                data_interp[i*N_data+j]=data[N_data*it+j];
Note: See TracChangeset for help on using the changeset viewer.