source: issm/oecreview/Archive/12678-13393/ISSM-12992-12993.diff

Last change on this file was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393

File size: 1.7 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp (revision 12992)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp (revision 12993)
5@@ -65,7 +65,7 @@
6 if (!( (nlhs==6) || (nrhs==5))){
7 mexPrintf(" %s format error.\n", __FUNCT__);
8 TriMeshProcessRiftsUsage();
9- _error_("bad usage");
10+ _error2_("bad usage");
11 }
12
13 /*Fetch index_in: */
14@@ -80,7 +80,7 @@
15 }
16 }
17 else{
18- _error_("first argument should be the element list");
19+ _error2_("first argument should be the element list");
20 }
21
22 /*Fetch x_in: */
23@@ -93,7 +93,7 @@
24 }
25 }
26 else{
27- _error_("second argument should be the x corrdinate list");
28+ _error2_("second argument should be the x corrdinate list");
29 }
30
31 /*Fetch y_in: */
32@@ -105,7 +105,7 @@
33 }
34 }
35 else{
36- _error_("third argument should be the y corrdinate list");
37+ _error2_("third argument should be the y corrdinate list");
38 }
39
40 /*Fetch segments_in: */
41@@ -120,7 +120,7 @@
42 }
43 }
44 else{
45- _error_("fourth argument should be the segments list");
46+ _error2_("fourth argument should be the segments list");
47 }
48
49 /*Fetch segment markers: */
50@@ -132,7 +132,7 @@
51 }
52 }
53 else{
54- _error_("fourth argument should be the segmentmarkers list");
55+ _error2_("fourth argument should be the segmentmarkers list");
56 }
57
58 /*First, do some fixing on the existing mesh: we do not want any element belonging entirely to the segment list (ie:
Note: See TracBrowser for help on using the repository browser.