source: issm/oecreview/Archive/12321-12677/ISSM-12515-12516.diff

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

Added 12321-12677
File size: 52.5 KB
RevLine 
[12679]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/NodeConnectivity/NodeConnectivity.cpp
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/NodeConnectivity/NodeConnectivity.cpp (revision 12515)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/NodeConnectivity/NodeConnectivity.cpp (revision 12516)
5@@ -36,7 +36,7 @@
6 }
7
8 void NodeConnectivityUsage(void) {
9- _printf_(true,"\n");
10- _printf_(true," usage: connectivity = %s(elements, numnodes);\n",__FUNCT__);
11- _printf_(true,"\n");
12+ if(true) _pprintLine_("");
13+ if(true) _pprintLine_(" usage: connectivity = " << __FUNCT__ << "(elements, numnodes);");
14+ if(true) _pprintLine_("");
15 }
16Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/BamgConvertMesh/BamgConvertMesh.cpp
17===================================================================
18--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/BamgConvertMesh/BamgConvertMesh.cpp (revision 12515)
19+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/BamgConvertMesh/BamgConvertMesh.cpp (revision 12516)
20@@ -76,11 +76,11 @@
21
22 void BamgConvertMeshUsage(void)
23 {
24- _printf_(true,"BAMGCONVERTMESH - convert [x y index] to a bamg geom and mesh geom");
25- _printf_(true,"\n");
26- _printf_(true," Usage:\n");
27- _printf_(true," [bamggeom bamgmesh]=BamgConvertMesh(index,x,y);\n");
28- _printf_(true," index: index of the mesh\n");
29- _printf_(true," x,y: coordinates of the nodes\n");
30- _printf_(true,"\n");
31+ if(true) _pprintString_("BAMGCONVERTMESH - convert [x y index] to a bamg geom and mesh geom");
32+ if(true) _pprintLine_("");
33+ if(true) _pprintLine_(" Usage:");
34+ if(true) _pprintLine_(" [bamggeom bamgmesh]=BamgConvertMesh(index,x,y);");
35+ if(true) _pprintLine_(" index: index of the mesh");
36+ if(true) _pprintLine_(" x,y: coordinates of the nodes");
37+ if(true) _pprintLine_("");
38 }
39Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp
40===================================================================
41--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp (revision 12515)
42+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp (revision 12516)
43@@ -112,23 +112,23 @@
44 }
45
46 void KMLOverlayUsage(void){
47- _printf_(true,"KMLOverlay - KML file overlay module:\n");
48- _printf_(true,"\n");
49- _printf_(true," This module reads a list of image files and writes a KML or KMZ overlay file.\n");
50- _printf_(true,"\n");
51- _printf_(true," Usage:\n");
52- _printf_(true," ierror=KMLOverlay(kmlfile,'param name',param,...);\n");
53- _printf_(true,"\n");
54- _printf_(true," kmlfile KML or KMZ file name (string)\n");
55- _printf_(true,"\n");
56- _printf_(true," lataxis latitude axis (double vector [south north], required)\n");
57- _printf_(true," longaxis longitude axis (double vector [west east], required)\n");
58- _printf_(true," images relative or http image file names (string or array of strings or cell array of strings, required)\n");
59- _printf_(true," zip flag to zip the doc.kml and image files into kmzfile (double, non-zero for kmz)\n");
60- _printf_(true,"\n");
61- _printf_(true," ierror error flag (double, non-zero for error)\n");
62- _printf_(true,"\n");
63- _printf_(true," Example:\n");
64- _printf_(true," KMLOverlay(kmlfile,'lataxis',[south north],'longaxis',[west east],'images',{'file1.png','http://issm/file2.png'},'zip',1);\n");
65- _printf_(true,"\n");
66+ if(true) _pprintLine_("KMLOverlay - KML file overlay module:");
67+ if(true) _pprintLine_("");
68+ if(true) _pprintLine_(" This module reads a list of image files and writes a KML or KMZ overlay file.");
69+ if(true) _pprintLine_("");
70+ if(true) _pprintLine_(" Usage:");
71+ if(true) _pprintLine_(" ierror=KMLOverlay(kmlfile,'param name',param,...);");
72+ if(true) _pprintLine_("");
73+ if(true) _pprintLine_(" kmlfile KML or KMZ file name (string)");
74+ if(true) _pprintLine_("");
75+ if(true) _pprintLine_(" lataxis latitude axis (double vector [south north], required)");
76+ if(true) _pprintLine_(" longaxis longitude axis (double vector [west east], required)");
77+ if(true) _pprintLine_(" images relative or http image file names (string or array of strings or cell array of strings, required)");
78+ if(true) _pprintLine_(" zip flag to zip the doc.kml and image files into kmzfile (double, non-zero for kmz)");
79+ if(true) _pprintLine_("");
80+ if(true) _pprintLine_(" ierror error flag (double, non-zero for error)");
81+ if(true) _pprintLine_("");
82+ if(true) _pprintLine_(" Example:");
83+ if(true) _pprintLine_(" KMLOverlay(kmlfile,'lataxis',[south north],'longaxis',[west east],'images',{'file1.png','http://issm/file2.png'},'zip',1);");
84+ if(true) _pprintLine_("");
85 }
86Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp
87===================================================================
88--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (revision 12515)
89+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (revision 12516)
90@@ -97,23 +97,23 @@
91
92 void InterpFromMeshToMesh3dUsage(void)
93 {
94- _printf_(true,"INTERPFROMMESHTOMESH3D - interpolation from a 3d hexahedron mesh onto a list of point\n");
95- _printf_(true,"\n");
96- _printf_(true," This function is a multi-threaded mex file that interpolates a field\n");
97- _printf_(true," defined on a triangular mesh onto a list of point\n");
98- _printf_(true,"\n");
99- _printf_(true," Usage:\n");
100- _printf_(true," data_prime=InterpFromMeshToMesh3d(index,x,y,z,data,x_prime,y_prime,z_prime,default_value);\n");
101- _printf_(true,"\n");
102- _printf_(true," index: index of the mesh where data is defined\n");
103- _printf_(true," x,y,z: coordinates of the nodes where data is defined\n");
104- _printf_(true," data: matrix holding the data to be interpolated onto the mesh.\n");
105- _printf_(true," x_prime,y_prime,z_prime: coordinates of the points onto which we interpolate.\n");
106- _printf_(true," default_value: default value if no data is found (holes).\n");
107- _printf_(true," data_prime: vector of mesh interpolated data.\n");
108- _printf_(true,"\n");
109- _printf_(true," Example:\n");
110- _printf_(true," load('temperature.mat');\n");
111- _printf_(true," md.initialization.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.mesh.x,md.mesh.y,md.mesh.z,253);\n");
112- _printf_(true,"\n");
113+ if(true) _pprintLine_("INTERPFROMMESHTOMESH3D - interpolation from a 3d hexahedron mesh onto a list of point");
114+ if(true) _pprintLine_("");
115+ if(true) _pprintLine_(" This function is a multi-threaded mex file that interpolates a field");
116+ if(true) _pprintLine_(" defined on a triangular mesh onto a list of point");
117+ if(true) _pprintLine_("");
118+ if(true) _pprintLine_(" Usage:");
119+ if(true) _pprintLine_(" data_prime=InterpFromMeshToMesh3d(index,x,y,z,data,x_prime,y_prime,z_prime,default_value);");
120+ if(true) _pprintLine_("");
121+ if(true) _pprintLine_(" index: index of the mesh where data is defined");
122+ if(true) _pprintLine_(" x,y,z: coordinates of the nodes where data is defined");
123+ if(true) _pprintLine_(" data: matrix holding the data to be interpolated onto the mesh.");
124+ if(true) _pprintLine_(" x_prime,y_prime,z_prime: coordinates of the points onto which we interpolate.");
125+ if(true) _pprintLine_(" default_value: default value if no data is found (holes).");
126+ if(true) _pprintLine_(" data_prime: vector of mesh interpolated data.");
127+ if(true) _pprintLine_("");
128+ if(true) _pprintLine_(" Example:");
129+ if(true) _pprintLine_(" load('temperature.mat');");
130+ if(true) _pprintLine_(" md.initialization.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.mesh.x,md.mesh.y,md.mesh.z,253);");
131+ if(true) _pprintLine_("");
132 }
133Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Ll2xy/Ll2xy.cpp
134===================================================================
135--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Ll2xy/Ll2xy.cpp (revision 12515)
136+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Ll2xy/Ll2xy.cpp (revision 12516)
137@@ -73,26 +73,26 @@
138 }
139
140 void Ll2xyUsage(void){
141- _printf_(true,"Ll2xy - lat/long to x/y coordinate transformation module:\n");
142- _printf_(true,"\n");
143- _printf_(true," This module transforms lat/long to x/y coordinates.\n");
144- _printf_(true,"\n");
145- _printf_(true," Usage:\n");
146- _printf_(true," [x,y]=Ll2xy(lat,lon,sgn,'param name',param,...);\n");
147- _printf_(true,"\n");
148- _printf_(true," lat latitude coordinates (double vector)\n");
149- _printf_(true," lon longitude coordinates (double vector)\n");
150- _printf_(true," sgn sign for hemisphere (double, +1 (north) or -1 (south))\n");
151- _printf_(true,"\n");
152- _printf_(true," central_meridian central meridian (double, optional, but must specify with sp)\n");
153- _printf_(true," standard_parallel standard parallel (double, optional, but must specify with cm)\n");
154- _printf_(true,"\n");
155- _printf_(true," x x coordinates (double vector)\n");
156- _printf_(true," y y coordinates (double vector)\n");
157- _printf_(true,"\n");
158- _printf_(true," Examples:\n");
159- _printf_(true," [x,y]=Ll2xy(lat,lon, 1);\n");
160- _printf_(true," [x,y]=Ll2xy(lat,lon, 1,'central_meridian',45,'standard_parallel',70);\n");
161- _printf_(true," [x,y]=Ll2xy(lat,lon,-1,'central_meridian', 0,'standard_parallel',71);\n");
162- _printf_(true,"\n");
163+ if(true) _pprintLine_("Ll2xy - lat/long to x/y coordinate transformation module:");
164+ if(true) _pprintLine_("");
165+ if(true) _pprintLine_(" This module transforms lat/long to x/y coordinates.");
166+ if(true) _pprintLine_("");
167+ if(true) _pprintLine_(" Usage:");
168+ if(true) _pprintLine_(" [x,y]=Ll2xy(lat,lon,sgn,'param name',param,...);");
169+ if(true) _pprintLine_("");
170+ if(true) _pprintLine_(" lat latitude coordinates (double vector)");
171+ if(true) _pprintLine_(" lon longitude coordinates (double vector)");
172+ if(true) _pprintLine_(" sgn sign for hemisphere (double, +1 (north) or -1 (south))");
173+ if(true) _pprintLine_("");
174+ if(true) _pprintLine_(" central_meridian central meridian (double, optional, but must specify with sp)");
175+ if(true) _pprintLine_(" standard_parallel standard parallel (double, optional, but must specify with cm)");
176+ if(true) _pprintLine_("");
177+ if(true) _pprintLine_(" x x coordinates (double vector)");
178+ if(true) _pprintLine_(" y y coordinates (double vector)");
179+ if(true) _pprintLine_("");
180+ if(true) _pprintLine_(" Examples:");
181+ if(true) _pprintLine_(" [x,y]=Ll2xy(lat,lon, 1);");
182+ if(true) _pprintLine_(" [x,y]=Ll2xy(lat,lon, 1,'central_meridian',45,'standard_parallel',70);");
183+ if(true) _pprintLine_(" [x,y]=Ll2xy(lat,lon,-1,'central_meridian', 0,'standard_parallel',71);");
184+ if(true) _pprintLine_("");
185 }
186Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/BamgMesher/BamgMesher.cpp
187===================================================================
188--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/BamgMesher/BamgMesher.cpp (revision 12515)
189+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/BamgMesher/BamgMesher.cpp (revision 12516)
190@@ -50,7 +50,7 @@
191 }
192
193 void BamgMesherUsage(void){
194- _printf_(true,"\n");
195- _printf_(true," usage: [bamgmesh,bamggeom]=%s(bamgmesh,bamggeom,bamgoptions);\n",__FUNCT__);
196- _printf_(true,"\n");
197+ if(true) _pprintLine_("");
198+ if(true) _pprintLine_(" usage: [bamgmesh,bamggeom]=" << __FUNCT__ << "(bamgmesh,bamggeom,bamgoptions);");
199+ if(true) _pprintLine_("");
200 }
201Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromGridToMesh/InterpFromGridToMesh.cpp
202===================================================================
203--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromGridToMesh/InterpFromGridToMesh.cpp (revision 12515)
204+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromGridToMesh/InterpFromGridToMesh.cpp (revision 12516)
205@@ -74,22 +74,22 @@
206
207 void InterpFromGridToMeshUsage(void)
208 {
209- _printf_(true,"INTERPFROMGRIDTOMESH - interpolation from a grid onto a list of points\n");
210- _printf_(true,"\n");
211- _printf_(true," This function is a multi-threaded mex file that interpolates a field\n");
212- _printf_(true," defined on a grid onto a list of points\n");
213- _printf_(true,"\n");
214- _printf_(true," Usage:\n");
215- _printf_(true," data_mesh=InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,default_value);\n");
216- _printf_(true,"\n");
217- _printf_(true," data: matrix holding the data to be interpolated onto the mesh.\n");
218- _printf_(true," x,y: coordinates of matrix data. (x and y must be in increasing order)\n");
219- _printf_(true," x_mesh,y_mesh: coordinates of the points onto which we interpolate.\n");
220- _printf_(true," default_value: default value if no data is found (holes).\n");
221- _printf_(true," data_mesh: vector of mesh interpolated data.\n");
222- _printf_(true,"\n");
223- _printf_(true," Example:\n");
224- _printf_(true," load('velocities.mat');\n");
225- _printf_(true," md.inversion.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.mesh.x,md.mesh.y,0);\n");
226- _printf_(true,"\n");
227+ if(true) _pprintLine_("INTERPFROMGRIDTOMESH - interpolation from a grid onto a list of points");
228+ if(true) _pprintLine_("");
229+ if(true) _pprintLine_(" This function is a multi-threaded mex file that interpolates a field");
230+ if(true) _pprintLine_(" defined on a grid onto a list of points");
231+ if(true) _pprintLine_("");
232+ if(true) _pprintLine_(" Usage:");
233+ if(true) _pprintLine_(" data_mesh=InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,default_value);");
234+ if(true) _pprintLine_("");
235+ if(true) _pprintLine_(" data: matrix holding the data to be interpolated onto the mesh.");
236+ if(true) _pprintLine_(" x,y: coordinates of matrix data. (x and y must be in increasing order)");
237+ if(true) _pprintLine_(" x_mesh,y_mesh: coordinates of the points onto which we interpolate.");
238+ if(true) _pprintLine_(" default_value: default value if no data is found (holes).");
239+ if(true) _pprintLine_(" data_mesh: vector of mesh interpolated data.");
240+ if(true) _pprintLine_("");
241+ if(true) _pprintLine_(" Example:");
242+ if(true) _pprintLine_(" load('velocities.mat');");
243+ if(true) _pprintLine_(" md.inversion.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.mesh.x,md.mesh.y,0);");
244+ if(true) _pprintLine_("");
245 }
246Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp
247===================================================================
248--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp (revision 12515)
249+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp (revision 12516)
250@@ -63,17 +63,17 @@
251
252 void InterpFromMeshToGridUsage(void)
253 {
254- _printf_(true,"INTERPFROMMESHTOGRID - interpolation of a data defined on a mesh onto a grid\n");
255- _printf_(true,"\n");
256- _printf_(true," This function is a multi-threaded mex file that interpolates a field\n");
257- _printf_(true," defined on a triangular mesh onto a regular grid\n");
258- _printf_(true,"\n");
259- _printf_(true," Usage:\n");
260- _printf_(true," [x_m,y_m,griddata]=InterpFromMeshToGrid(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value)\n");
261- _printf_(true,"\n");
262- _printf_(true," index,x,y: delaunay triangulation defining the mesh.\n");
263- _printf_(true," meshdata: vertex values of data to be interpolated.\n");
264- _printf_(true," xmin,ymax,posting,nlines,ncols: parameters that define the grid\n");
265- _printf_(true," default_value: value of points located out of the mesh.\n");
266- _printf_(true,"\n");
267+ if(true) _pprintLine_("INTERPFROMMESHTOGRID - interpolation of a data defined on a mesh onto a grid");
268+ if(true) _pprintLine_("");
269+ if(true) _pprintLine_(" This function is a multi-threaded mex file that interpolates a field");
270+ if(true) _pprintLine_(" defined on a triangular mesh onto a regular grid");
271+ if(true) _pprintLine_("");
272+ if(true) _pprintLine_(" Usage:");
273+ if(true) _pprintLine_(" [x_m,y_m,griddata]=InterpFromMeshToGrid(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value)");
274+ if(true) _pprintLine_("");
275+ if(true) _pprintLine_(" index,x,y: delaunay triangulation defining the mesh.");
276+ if(true) _pprintLine_(" meshdata: vertex values of data to be interpolated.");
277+ if(true) _pprintLine_(" xmin,ymax,posting,nlines,ncols: parameters that define the grid");
278+ if(true) _pprintLine_(" default_value: value of points located out of the mesh.");
279+ if(true) _pprintLine_("");
280 }
281Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/KMLFileRead/KMLFileRead.cpp
282===================================================================
283--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/KMLFileRead/KMLFileRead.cpp (revision 12515)
284+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/KMLFileRead/KMLFileRead.cpp (revision 12516)
285@@ -106,24 +106,24 @@
286 }
287
288 void KMLFileReadUsage(void){
289- _printf_(true,"KMLFileRead - KML file reader module:\n");
290- _printf_(true,"\n");
291- _printf_(true," This module reads a KML file.\n");
292- _printf_(true,"\n");
293- _printf_(true," Usage:\n");
294- _printf_(true," [ierror]=KMLFileRead(kmlfile,'param name',param,...);\n");
295- _printf_(true,"\n");
296- _printf_(true," kmlfile file name of kml file to be read (char)\n");
297- _printf_(true,"\n");
298- _printf_(true," echo echo command (char, optional, 'off'/'on')\n");
299- _printf_(true," deepecho deep echo command (char, optional, 'off'/'on')\n");
300- _printf_(true," write write command (char, optional, 'off'/'stdout'/kmlfile)\n");
301- _printf_(true,"\n");
302- _printf_(true," ierror return code (non-zero for error)\n");
303- _printf_(true,"\n");
304- _printf_(true," Examples:\n");
305- _printf_(true," [ierror]=KMLFileRead('file.kml','deepecho','on');\n");
306- _printf_(true," [ierror]=KMLFileRead('filin.kml','echo','on','write','filout.kml');\n");
307- _printf_(true,"\n");
308+ if(true) _pprintLine_("KMLFileRead - KML file reader module:");
309+ if(true) _pprintLine_("");
310+ if(true) _pprintLine_(" This module reads a KML file.");
311+ if(true) _pprintLine_("");
312+ if(true) _pprintLine_(" Usage:");
313+ if(true) _pprintLine_(" [ierror]=KMLFileRead(kmlfile,'param name',param,...);");
314+ if(true) _pprintLine_("");
315+ if(true) _pprintLine_(" kmlfile file name of kml file to be read (char)");
316+ if(true) _pprintLine_("");
317+ if(true) _pprintLine_(" echo echo command (char, optional, 'off'/'on')");
318+ if(true) _pprintLine_(" deepecho deep echo command (char, optional, 'off'/'on')");
319+ if(true) _pprintLine_(" write write command (char, optional, 'off'/'stdout'/kmlfile)");
320+ if(true) _pprintLine_("");
321+ if(true) _pprintLine_(" ierror return code (non-zero for error)");
322+ if(true) _pprintLine_("");
323+ if(true) _pprintLine_(" Examples:");
324+ if(true) _pprintLine_(" [ierror]=KMLFileRead('file.kml','deepecho','on');");
325+ if(true) _pprintLine_(" [ierror]=KMLFileRead('filin.kml','echo','on','write','filout.kml');");
326+ if(true) _pprintLine_("");
327 }
328
329Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Shp2Kml/Shp2Kml.cpp
330===================================================================
331--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Shp2Kml/Shp2Kml.cpp (revision 12515)
332+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Shp2Kml/Shp2Kml.cpp (revision 12516)
333@@ -76,25 +76,25 @@
334 }
335
336 void Shp2KmlUsage(void){
337- _printf_(true,"Shp2Kml - shp to kml file conversion module:\n");
338- _printf_(true,"\n");
339- _printf_(true," This module converts a file from shp to kml format.\n");
340- _printf_(true,"\n");
341- _printf_(true," Usage:\n");
342- _printf_(true," [ret]=Shp2Kml(filshp,filkml,sgn,'param name',param,...);\n");
343- _printf_(true,"\n");
344- _printf_(true," filshp file name of shp file to be read (char, extension optional)\n");
345- _printf_(true," filkml file name of kml file to be written (char)\n");
346- _printf_(true," sgn sign for hemisphere (double, +1 (north); -1 (south); or 0 (no translation))\n");
347- _printf_(true,"\n");
348- _printf_(true," central_meridian central meridian (double, optional, but must specify with sp)\n");
349- _printf_(true," standard_parallel standard parallel (double, optional, but must specify with cm)\n");
350- _printf_(true,"\n");
351- _printf_(true," ret return code (non-zero for warning)\n");
352- _printf_(true,"\n");
353- _printf_(true," Examples:\n");
354- _printf_(true," [ret]=Shp2Kml('file.shp','file.kml', 0);\n");
355- _printf_(true," [ret]=Shp2Kml('file.shp','file.kml', 1,'central_meridian',45,'standard_parallel',70);\n");
356- _printf_(true," [ret]=Shp2Kml('file.shp','file.kml',-1,'central_meridian', 0,'standard_parallel',71);\n");
357- _printf_(true,"\n");
358+ if(true) _pprintLine_("Shp2Kml - shp to kml file conversion module:");
359+ if(true) _pprintLine_("");
360+ if(true) _pprintLine_(" This module converts a file from shp to kml format.");
361+ if(true) _pprintLine_("");
362+ if(true) _pprintLine_(" Usage:");
363+ if(true) _pprintLine_(" [ret]=Shp2Kml(filshp,filkml,sgn,'param name',param,...);");
364+ if(true) _pprintLine_("");
365+ if(true) _pprintLine_(" filshp file name of shp file to be read (char, extension optional)");
366+ if(true) _pprintLine_(" filkml file name of kml file to be written (char)");
367+ if(true) _pprintLine_(" sgn sign for hemisphere (double, +1 (north); -1 (south); or 0 (no translation))");
368+ if(true) _pprintLine_("");
369+ if(true) _pprintLine_(" central_meridian central meridian (double, optional, but must specify with sp)");
370+ if(true) _pprintLine_(" standard_parallel standard parallel (double, optional, but must specify with cm)");
371+ if(true) _pprintLine_("");
372+ if(true) _pprintLine_(" ret return code (non-zero for warning)");
373+ if(true) _pprintLine_("");
374+ if(true) _pprintLine_(" Examples:");
375+ if(true) _pprintLine_(" [ret]=Shp2Kml('file.shp','file.kml', 0);");
376+ if(true) _pprintLine_(" [ret]=Shp2Kml('file.shp','file.kml', 1,'central_meridian',45,'standard_parallel',70);");
377+ if(true) _pprintLine_(" [ret]=Shp2Kml('file.shp','file.kml',-1,'central_meridian', 0,'standard_parallel',71);");
378+ if(true) _pprintLine_("");
379 }
380Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Exp2Kml/Exp2Kml.cpp
381===================================================================
382--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Exp2Kml/Exp2Kml.cpp (revision 12515)
383+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Exp2Kml/Exp2Kml.cpp (revision 12516)
384@@ -72,27 +72,27 @@
385 }
386
387 void Exp2KmlUsage(void){
388- _printf_(true,"Exp2Kml - exp to kml file conversion module:\n");
389- _printf_(true,"\n");
390- _printf_(true," This module converts a file from exp to kml format.\n");
391- _printf_(true,"\n");
392- _printf_(true," Usage:\n");
393- _printf_(true," [ret]=Exp2Kml(filexp,filkml,sgn,'param name',param,...);\n");
394- _printf_(true,"\n");
395- _printf_(true," filexp file name of exp file to be read (char)\n");
396- _printf_(true," filkml file name of kml file to be written (char)\n");
397- _printf_(true," sgn sign for hemisphere (double, +1 (north) or -1 (south))\n");
398- _printf_(true,"\n");
399- _printf_(true," central_meridian central meridian (double, optional, but must specify with sp)\n");
400- _printf_(true," standard_parallel standard parallel (double, optional, but must specify with cm)\n");
401- _printf_(true," holes flag for treatment of multiple profiles (char, optional, 'yes' for holes))\n");
402- _printf_(true,"\n");
403- _printf_(true," ret return code (non-zero for warning)\n");
404- _printf_(true,"\n");
405- _printf_(true," Examples:\n");
406- _printf_(true," [ret]=Exp2Kml('file.exp','file.kml', 1);\n");
407- _printf_(true," [ret]=Exp2Kml('file.exp','file.kml', 1,'central_meridian',45,'standard_parallel',70,'holes','yes');\n");
408- _printf_(true," [ret]=Exp2Kml('file.exp','file.kml',-1,'central_meridian', 0,'standard_parallel',71,'holes','yes');\n");
409- _printf_(true,"\n");
410+ if(true) _pprintLine_("Exp2Kml - exp to kml file conversion module:");
411+ if(true) _pprintLine_("");
412+ if(true) _pprintLine_(" This module converts a file from exp to kml format.");
413+ if(true) _pprintLine_("");
414+ if(true) _pprintLine_(" Usage:");
415+ if(true) _pprintLine_(" [ret]=Exp2Kml(filexp,filkml,sgn,'param name',param,...);");
416+ if(true) _pprintLine_("");
417+ if(true) _pprintLine_(" filexp file name of exp file to be read (char)");
418+ if(true) _pprintLine_(" filkml file name of kml file to be written (char)");
419+ if(true) _pprintLine_(" sgn sign for hemisphere (double, +1 (north) or -1 (south))");
420+ if(true) _pprintLine_("");
421+ if(true) _pprintLine_(" central_meridian central meridian (double, optional, but must specify with sp)");
422+ if(true) _pprintLine_(" standard_parallel standard parallel (double, optional, but must specify with cm)");
423+ if(true) _pprintLine_(" holes flag for treatment of multiple profiles (char, optional, 'yes' for holes))");
424+ if(true) _pprintLine_("");
425+ if(true) _pprintLine_(" ret return code (non-zero for warning)");
426+ if(true) _pprintLine_("");
427+ if(true) _pprintLine_(" Examples:");
428+ if(true) _pprintLine_(" [ret]=Exp2Kml('file.exp','file.kml', 1);");
429+ if(true) _pprintLine_(" [ret]=Exp2Kml('file.exp','file.kml', 1,'central_meridian',45,'standard_parallel',70,'holes','yes');");
430+ if(true) _pprintLine_(" [ret]=Exp2Kml('file.exp','file.kml',-1,'central_meridian', 0,'standard_parallel',71,'holes','yes');");
431+ if(true) _pprintLine_("");
432 }
433
434Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Kml2Exp/Kml2Exp.cpp
435===================================================================
436--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Kml2Exp/Kml2Exp.cpp (revision 12515)
437+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Kml2Exp/Kml2Exp.cpp (revision 12516)
438@@ -65,26 +65,26 @@
439 }
440
441 void Kml2ExpUsage(void){
442- _printf_(true,"Kml2Exp - kml to exp file conversion module:\n");
443- _printf_(true,"\n");
444- _printf_(true," This module converts a file from kml to exp format.\n");
445- _printf_(true,"\n");
446- _printf_(true," Usage:\n");
447- _printf_(true," [ret]=Kml2Exp(filexp,filkml,sgn,'param name',param,...);\n");
448- _printf_(true,"\n");
449- _printf_(true," filkml file name of kml file to be read (char)\n");
450- _printf_(true," filexp file name of exp file to be written (char)\n");
451- _printf_(true," sgn sign for hemisphere (double, +1 (north) or -1 (south))\n");
452- _printf_(true,"\n");
453- _printf_(true," central_meridian central meridian (double, optional, but must specify with sp)\n");
454- _printf_(true," standard_parallel standard parallel (double, optional, but must specify with cm)\n");
455- _printf_(true,"\n");
456- _printf_(true," ret return code (non-zero for warning)\n");
457- _printf_(true,"\n");
458- _printf_(true," Examples:\n");
459- _printf_(true," [ret]=Kml2Exp('file.kml','file.exp', 1);\n");
460- _printf_(true," [ret]=Kml2Exp('file.kml','file.exp', 1,'central_meridian',45,'standard_parallel',70);\n");
461- _printf_(true," [ret]=Kml2Exp('file.kml','file.exp',-1,'central_meridian', 0,'standard_parallel',71);\n");
462- _printf_(true,"\n");
463+ if(true) _pprintLine_("Kml2Exp - kml to exp file conversion module:");
464+ if(true) _pprintLine_("");
465+ if(true) _pprintLine_(" This module converts a file from kml to exp format.");
466+ if(true) _pprintLine_("");
467+ if(true) _pprintLine_(" Usage:");
468+ if(true) _pprintLine_(" [ret]=Kml2Exp(filexp,filkml,sgn,'param name',param,...);");
469+ if(true) _pprintLine_("");
470+ if(true) _pprintLine_(" filkml file name of kml file to be read (char)");
471+ if(true) _pprintLine_(" filexp file name of exp file to be written (char)");
472+ if(true) _pprintLine_(" sgn sign for hemisphere (double, +1 (north) or -1 (south))");
473+ if(true) _pprintLine_("");
474+ if(true) _pprintLine_(" central_meridian central meridian (double, optional, but must specify with sp)");
475+ if(true) _pprintLine_(" standard_parallel standard parallel (double, optional, but must specify with cm)");
476+ if(true) _pprintLine_("");
477+ if(true) _pprintLine_(" ret return code (non-zero for warning)");
478+ if(true) _pprintLine_("");
479+ if(true) _pprintLine_(" Examples:");
480+ if(true) _pprintLine_(" [ret]=Kml2Exp('file.kml','file.exp', 1);");
481+ if(true) _pprintLine_(" [ret]=Kml2Exp('file.kml','file.exp', 1,'central_meridian',45,'standard_parallel',70);");
482+ if(true) _pprintLine_(" [ret]=Kml2Exp('file.kml','file.exp',-1,'central_meridian', 0,'standard_parallel',71);");
483+ if(true) _pprintLine_("");
484 }
485
486Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/TriaSearch/TriaSearch.cpp
487===================================================================
488--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/TriaSearch/TriaSearch.cpp (revision 12515)
489+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/TriaSearch/TriaSearch.cpp (revision 12516)
490@@ -55,12 +55,12 @@
491
492 void TriaSearchUsage(void)
493 {
494- _printf_(true,"TriaSearch- find triangle holding a point (x0,y0) in a mesh\n");
495- _printf_(true,"\n");
496- _printf_(true," Usage:\n");
497- _printf_(true," tria=TriaSearch(index,x,y,x0,y0);\n");
498- _printf_(true," index,x,y: mesh triangulatrion\n");
499- _printf_(true," x0,y0: coordinates of the point for which we are trying to find a triangle\n");
500- _printf_(true," x0,y0 can be an array of points\n");
501- _printf_(true,"\n");
502+ if(true) _pprintLine_("TriaSearch- find triangle holding a point (x0,y0) in a mesh");
503+ if(true) _pprintLine_("");
504+ if(true) _pprintLine_(" Usage:");
505+ if(true) _pprintLine_(" tria=TriaSearch(index,x,y,x0,y0);");
506+ if(true) _pprintLine_(" index,x,y: mesh triangulatrion");
507+ if(true) _pprintLine_(" x0,y0: coordinates of the point for which we are trying to find a triangle");
508+ if(true) _pprintLine_(" x0,y0 can be an array of points");
509+ if(true) _pprintLine_("");
510 }
511Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InternalFront/InternalFront.cpp
512===================================================================
513--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InternalFront/InternalFront.cpp (revision 12515)
514+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InternalFront/InternalFront.cpp (revision 12516)
515@@ -93,7 +93,7 @@
516 }
517
518 void InternalFrontUsage(void) {
519- _printf_(true,"\n");
520- _printf_(true," usage: icefront = %s(md);\n",__FUNCT__);
521- _printf_(true,"\n");
522+ if(true) _pprintLine_("");
523+ if(true) _pprintLine_(" usage: icefront = " << __FUNCT__ << "(md);");
524+ if(true) _pprintLine_("");
525 }
526Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMesh2d/InterpFromMesh2d.cpp
527===================================================================
528--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMesh2d/InterpFromMesh2d.cpp (revision 12515)
529+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMesh2d/InterpFromMesh2d.cpp (revision 12516)
530@@ -153,17 +153,17 @@
531
532 void InterpFromMesh2dUsage(void)
533 {
534- _printf_(true," usage:\n");
535- _printf_(true," data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime);\n\n");
536- _printf_(true," or data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value);\n\n");
537- _printf_(true," or data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value,contourname);\n\n");
538- _printf_(true," where:\n");
539- _printf_(true," x,y: coordinates of the nodes where data is defined\n");
540- _printf_(true," index: index of the mesh where data is defined\n");
541- _printf_(true," data - vector holding the data to be interpolated onto the points.\n");
542- _printf_(true," x_prime,y_prime: coordinates of the mesh vertices onto which we interpolate.\n");
543- _printf_(true," default_value: a scalar or vector of size length(x_prime).\n");
544- _printf_(true," contourname: linear interpolation will happen on all x_interp,y_interp inside the contour, default value will be adopted on the rest of the mesh.\n");
545- _printf_(true," data_prime: vector of prime interpolated data.\n");
546- _printf_(true,"\n");
547+ if(true) _pprintLine_(" usage:");
548+ if(true) _pprintLine_(" data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime);\n");
549+ if(true) _pprintLine_(" or data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value);\n");
550+ if(true) _pprintLine_(" or data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value,contourname);\n");
551+ if(true) _pprintLine_(" where:");
552+ if(true) _pprintLine_(" x,y: coordinates of the nodes where data is defined");
553+ if(true) _pprintLine_(" index: index of the mesh where data is defined");
554+ if(true) _pprintLine_(" data - vector holding the data to be interpolated onto the points.");
555+ if(true) _pprintLine_(" x_prime,y_prime: coordinates of the mesh vertices onto which we interpolate.");
556+ if(true) _pprintLine_(" default_value: a scalar or vector of size length(x_prime).");
557+ if(true) _pprintLine_(" contourname: linear interpolation will happen on all x_interp,y_interp inside the contour, default value will be adopted on the rest of the mesh.");
558+ if(true) _pprintLine_(" data_prime: vector of prime interpolated data.");
559+ if(true) _pprintLine_("");
560 }
561Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/ElementConnectivity/ElementConnectivity.cpp
562===================================================================
563--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/ElementConnectivity/ElementConnectivity.cpp (revision 12515)
564+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/ElementConnectivity/ElementConnectivity.cpp (revision 12516)
565@@ -36,7 +36,7 @@
566 }
567
568 void ElementConnectivityUsage(void) {
569- _printf_(true,"\n");
570- _printf_(true," usage: elementconnectivity = %s(elements, nodeconnectivity);\n",__FUNCT__);
571- _printf_(true,"\n");
572+ if(true) _pprintLine_("");
573+ if(true) _pprintLine_(" usage: elementconnectivity = " << __FUNCT__ << "(elements, nodeconnectivity);");
574+ if(true) _pprintLine_("");
575 }
576Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Kriging/Kriging.cpp
577===================================================================
578--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Kriging/Kriging.cpp (revision 12515)
579+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Kriging/Kriging.cpp (revision 12516)
580@@ -53,21 +53,21 @@
581 }
582
583 void KrigingUsage(void){
584- _printf_(true,"\n");
585- _printf_(true," usage: predictions=%s(x,y,observations,x_interp,y_interp,'options');\n",__FUNCT__);
586- _printf_(true," available options:\n");
587- _printf_(true," -'model': Available variogram models 'gaussian' (default),'spherical','power','exponential'\n");
588- _printf_(true," -'nugget': nugget effect (default 0.2)\n");
589- _printf_(true," -'range': for gaussian, spherical and exponential models (default sqrt(3))\n");
590- _printf_(true," -'sill': for gaussian, spherical and exponential models (default 1)\n");
591- _printf_(true," -'slope': for power model (default 1)\n");
592- _printf_(true," -'power': for power model (default 1)\n");
593- _printf_(true," -'searchradius': search radius for each prediction (default is observations span)\n");
594- _printf_(true," -'boxlength': minimum length of quadtree boxes (useful to decrease the number of observations)\n");
595- _printf_(true," -'maxdata': minimum number of observations for a prediction (default is 50)\n");
596- _printf_(true," -'mindata': maximum number of observations for a prediction (default is 1)\n");
597- _printf_(true," -'maxtrimming': maximum trimming value (default is -1.e+21)\n");
598- _printf_(true," -'mintrimming': minimum trimming value (default is +1.e+21)\n");
599- _printf_(true," -'minspacing': minimum distance between observation (default is 0.01)\n");
600- _printf_(true,"\n");
601+ if(true) _pprintLine_("");
602+ if(true) _pprintLine_(" usage: predictions=" << __FUNCT__ << "(x,y,observations,x_interp,y_interp,'options');");
603+ if(true) _pprintLine_(" available options:");
604+ if(true) _pprintLine_(" -'model': Available variogram models 'gaussian' (default),'spherical','power','exponential'");
605+ if(true) _pprintLine_(" -'nugget': nugget effect (default 0.2)");
606+ if(true) _pprintLine_(" -'range': for gaussian, spherical and exponential models (default sqrt(3))");
607+ if(true) _pprintLine_(" -'sill': for gaussian, spherical and exponential models (default 1)");
608+ if(true) _pprintLine_(" -'slope': for power model (default 1)");
609+ if(true) _pprintLine_(" -'power': for power model (default 1)");
610+ if(true) _pprintLine_(" -'searchradius': search radius for each prediction (default is observations span)");
611+ if(true) _pprintLine_(" -'boxlength': minimum length of quadtree boxes (useful to decrease the number of observations)");
612+ if(true) _pprintLine_(" -'maxdata': minimum number of observations for a prediction (default is 50)");
613+ if(true) _pprintLine_(" -'mindata': maximum number of observations for a prediction (default is 1)");
614+ if(true) _pprintLine_(" -'maxtrimming': maximum trimming value (default is -1.e+21)");
615+ if(true) _pprintLine_(" -'mintrimming': minimum trimming value (default is +1.e+21)");
616+ if(true) _pprintLine_(" -'minspacing': minimum distance between observation (default is 0.01)");
617+ if(true) _pprintLine_("");
618 }
619Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/EnumToString/EnumToString.cpp
620===================================================================
621--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/EnumToString/EnumToString.cpp (revision 12515)
622+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/EnumToString/EnumToString.cpp (revision 12516)
623@@ -26,7 +26,7 @@
624
625 void EnumToStringUsage(void)
626 {
627- _printf_(true,"\n");
628- _printf_(true," usage: %sstring = EnumToString(enum);\n",__FUNCT__);
629- _printf_(true,"\n");
630+ if(true) _pprintLine_("");
631+ if(true) _pprintLine_(" usage: " << __FUNCT__ << "string = EnumToString(enum);");
632+ if(true) _pprintLine_("");
633 }
634Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/StringToEnum/StringToEnum.cpp
635===================================================================
636--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/StringToEnum/StringToEnum.cpp (revision 12515)
637+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/StringToEnum/StringToEnum.cpp (revision 12516)
638@@ -26,7 +26,7 @@
639
640 void StringToEnumUsage(void)
641 {
642- _printf_(true,"\n");
643- _printf_(true," usage: %senum = StringToEnum(string);\n",__FUNCT__);
644- _printf_(true,"\n");
645+ if(true) _pprintLine_("");
646+ if(true) _pprintLine_(" usage: " << __FUNCT__ << "enum = StringToEnum(string);");
647+ if(true) _pprintLine_("");
648 }
649Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/BamgTriangulate/BamgTriangulate.cpp
650===================================================================
651--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/BamgTriangulate/BamgTriangulate.cpp (revision 12515)
652+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/BamgTriangulate/BamgTriangulate.cpp (revision 12516)
653@@ -48,11 +48,11 @@
654
655 void BamgTriangulateUsage(void)
656 {
657- _printf_(true,"BAMGTRIANGULATE - Delaunay Triangulation of a list of points");
658- _printf_(true,"\n");
659- _printf_(true," Usage:\n");
660- _printf_(true," index=BamgTriangulate(x,y);\n");
661- _printf_(true," index: index of the triangulation\n");
662- _printf_(true," x,y: coordinates of the nodes\n");
663- _printf_(true,"\n");
664+ if(true) _pprintString_("BAMGTRIANGULATE - Delaunay Triangulation of a list of points");
665+ if(true) _pprintLine_("");
666+ if(true) _pprintLine_(" Usage:");
667+ if(true) _pprintLine_(" index=BamgTriangulate(x,y);");
668+ if(true) _pprintLine_(" index: index of the triangulation");
669+ if(true) _pprintLine_(" x,y: coordinates of the nodes");
670+ if(true) _pprintLine_("");
671 }
672Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
673===================================================================
674--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp (revision 12515)
675+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp (revision 12516)
676@@ -92,28 +92,28 @@
677 void InterpFromMeshToMesh2dUsage(void)//{{{1
678
679 {
680- _printf_(true,"INTERFROMMESHTOMESH2D - interpolation from a 2d triangular mesh onto a list of point\n");
681- _printf_(true,"\n");
682- _printf_(true," This function is a multi-threaded mex file that interpolates a field\n");
683- _printf_(true," defined on a triangular mesh onto a list of point\n");
684- _printf_(true,"\n");
685- _printf_(true," Usage:\n");
686- _printf_(true," data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp);\n");
687- _printf_(true," or data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp,default_value,contourname);\n");
688- _printf_(true,"\n");
689- _printf_(true," index: index of the mesh where data is defined\n");
690- _printf_(true," x,y: coordinates of the nodes where data is defined\n");
691- _printf_(true," data: matrix holding the data to be interpolated onto the mesh. (one column per field)\n");
692- _printf_(true," x_interp,y_interp: coordinates of the points onto which we interpolate.\n");
693- _printf_(true," if default_value and contourname not specified: linear interpolation will happen on all x_interp,y_interp.\n");
694- _printf_(true," if (default_value,contourname) specified: linear interpolation will happen on all x_interp,y_interp inside the contour, default value will be adopted on the rest of the mesh.\n");
695- _printf_(true," note that default_value is either a scalar, or a vector of size length(x_interp)\n");
696- _printf_(true," data_interp: vector of mesh interpolated data.\n");
697- _printf_(true,"\n");
698- _printf_(true," Example:\n");
699- _printf_(true," load('temperature.mat');\n");
700- _printf_(true," md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y);\n");
701- _printf_(true," md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y,253,'Contour.exp');\n");
702- _printf_(true,"\n");
703+ if(true) _pprintLine_("INTERFROMMESHTOMESH2D - interpolation from a 2d triangular mesh onto a list of point");
704+ if(true) _pprintLine_("");
705+ if(true) _pprintLine_(" This function is a multi-threaded mex file that interpolates a field");
706+ if(true) _pprintLine_(" defined on a triangular mesh onto a list of point");
707+ if(true) _pprintLine_("");
708+ if(true) _pprintLine_(" Usage:");
709+ if(true) _pprintLine_(" data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp);");
710+ if(true) _pprintLine_(" or data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp,default_value,contourname);");
711+ if(true) _pprintLine_("");
712+ if(true) _pprintLine_(" index: index of the mesh where data is defined");
713+ if(true) _pprintLine_(" x,y: coordinates of the nodes where data is defined");
714+ if(true) _pprintLine_(" data: matrix holding the data to be interpolated onto the mesh. (one column per field)");
715+ if(true) _pprintLine_(" x_interp,y_interp: coordinates of the points onto which we interpolate.");
716+ if(true) _pprintLine_(" if default_value and contourname not specified: linear interpolation will happen on all x_interp,y_interp.");
717+ if(true) _pprintLine_(" if (default_value,contourname) specified: linear interpolation will happen on all x_interp,y_interp inside the contour, default value will be adopted on the rest of the mesh.");
718+ if(true) _pprintLine_(" note that default_value is either a scalar, or a vector of size length(x_interp)");
719+ if(true) _pprintLine_(" data_interp: vector of mesh interpolated data.");
720+ if(true) _pprintLine_("");
721+ if(true) _pprintLine_(" Example:");
722+ if(true) _pprintLine_(" load('temperature.mat');");
723+ if(true) _pprintLine_(" md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y);");
724+ if(true) _pprintLine_(" md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y,253,'Contour.exp');");
725+ if(true) _pprintLine_("");
726 }
727 //}}}
728Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Xy2ll/Xy2ll.cpp
729===================================================================
730--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Xy2ll/Xy2ll.cpp (revision 12515)
731+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Xy2ll/Xy2ll.cpp (revision 12516)
732@@ -72,27 +72,27 @@
733 }
734
735 void Xy2llUsage(void){
736- _printf_(true,"Xy2ll - x/y to lat/long coordinate transformation module:\n");
737- _printf_(true,"\n");
738- _printf_(true," This module transforms x/y to lat/long coordinates.\n");
739- _printf_(true,"\n");
740- _printf_(true," Usage:\n");
741- _printf_(true," [lat,lon]=Xy2ll(x,y,sgn,'param name',param,...);\n");
742- _printf_(true,"\n");
743- _printf_(true," x x coordinates (double vector)\n");
744- _printf_(true," y y coordinates (double vector)\n");
745- _printf_(true," sgn sign for hemisphere (double, +1 (north) or -1 (south))\n");
746- _printf_(true,"\n");
747- _printf_(true," central_meridian central meridian (double, optional, but must specify with sp)\n");
748- _printf_(true," standard_parallel standard parallel (double, optional, but must specify with cm)\n");
749- _printf_(true,"\n");
750- _printf_(true," lat latitude coordinates (double vector)\n");
751- _printf_(true," lon longitude coordinates (double vector)\n");
752- _printf_(true,"\n");
753- _printf_(true," Examples:\n");
754- _printf_(true," [lat,lon]=Xy2ll(x,y, 1);\n");
755- _printf_(true," [lat,lon]=Xy2ll(x,y, 1,'central_meridian',45,'standard_parallel',70);\n");
756- _printf_(true," [lat,lon]=Xy2ll(x,y,-1,'central_meridian', 0,'standard_parallel',71);\n");
757- _printf_(true,"\n");
758+ if(true) _pprintLine_("Xy2ll - x/y to lat/long coordinate transformation module:");
759+ if(true) _pprintLine_("");
760+ if(true) _pprintLine_(" This module transforms x/y to lat/long coordinates.");
761+ if(true) _pprintLine_("");
762+ if(true) _pprintLine_(" Usage:");
763+ if(true) _pprintLine_(" [lat,lon]=Xy2ll(x,y,sgn,'param name',param,...);");
764+ if(true) _pprintLine_("");
765+ if(true) _pprintLine_(" x x coordinates (double vector)");
766+ if(true) _pprintLine_(" y y coordinates (double vector)");
767+ if(true) _pprintLine_(" sgn sign for hemisphere (double, +1 (north) or -1 (south))");
768+ if(true) _pprintLine_("");
769+ if(true) _pprintLine_(" central_meridian central meridian (double, optional, but must specify with sp)");
770+ if(true) _pprintLine_(" standard_parallel standard parallel (double, optional, but must specify with cm)");
771+ if(true) _pprintLine_("");
772+ if(true) _pprintLine_(" lat latitude coordinates (double vector)");
773+ if(true) _pprintLine_(" lon longitude coordinates (double vector)");
774+ if(true) _pprintLine_("");
775+ if(true) _pprintLine_(" Examples:");
776+ if(true) _pprintLine_(" [lat,lon]=Xy2ll(x,y, 1);");
777+ if(true) _pprintLine_(" [lat,lon]=Xy2ll(x,y, 1,'central_meridian',45,'standard_parallel',70);");
778+ if(true) _pprintLine_(" [lat,lon]=Xy2ll(x,y,-1,'central_meridian', 0,'standard_parallel',71);");
779+ if(true) _pprintLine_("");
780 }
781
782Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.cpp
783===================================================================
784--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.cpp (revision 12515)
785+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.cpp (revision 12516)
786@@ -117,27 +117,27 @@
787 }
788
789 void KMLMeshWriteUsage(void){
790- _printf_(true,"KMLMeshWrite - KML mesh writer module:\n");
791- _printf_(true,"\n");
792- _printf_(true," This module writes the mesh of a model as KML polygons into the specified KML file.\n");
793- _printf_(true,"\n");
794- _printf_(true," Usage:\n");
795- _printf_(true," ierror=KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);\n");
796- _printf_(true,"\n");
797- _printf_(true," name model name (string, may be empty)\n");
798- _printf_(true," notes model notes (string or cell array of strings, may be empty)\n");
799- _printf_(true," elem elements (double array)\n");
800- _printf_(true," nodecon nodal connectivity array (double array, may be empty)\n");
801- _printf_(true," lat nodal latititudes (double vector)\n");
802- _printf_(true," long nodal longitudes (double vector)\n");
803- _printf_(true," part nodal partitions (double vector, may be empty)\n");
804- _printf_(true," data nodal or element data (double vector, may be empty)\n");
805- _printf_(true," cmap color map (double nx3 array, may be empty)\n");
806- _printf_(true," kmlfile KML file name (string)\n");
807- _printf_(true,"\n");
808- _printf_(true," ierror error flag (double, non-zero for error)\n");
809- _printf_(true,"\n");
810- _printf_(true," Example:\n");
811- _printf_(true," KMLMeshWrite(md.name,md.notes,md.elements,md.nodeconnectivity,md.lat,md.long,md.part,md.fm_criterion,options.cmap,filekml);\n");
812- _printf_(true,"\n");
813+ if(true) _pprintLine_("KMLMeshWrite - KML mesh writer module:");
814+ if(true) _pprintLine_("");
815+ if(true) _pprintLine_(" This module writes the mesh of a model as KML polygons into the specified KML file.");
816+ if(true) _pprintLine_("");
817+ if(true) _pprintLine_(" Usage:");
818+ if(true) _pprintLine_(" ierror=KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);");
819+ if(true) _pprintLine_("");
820+ if(true) _pprintLine_(" name model name (string, may be empty)");
821+ if(true) _pprintLine_(" notes model notes (string or cell array of strings, may be empty)");
822+ if(true) _pprintLine_(" elem elements (double array)");
823+ if(true) _pprintLine_(" nodecon nodal connectivity array (double array, may be empty)");
824+ if(true) _pprintLine_(" lat nodal latititudes (double vector)");
825+ if(true) _pprintLine_(" long nodal longitudes (double vector)");
826+ if(true) _pprintLine_(" part nodal partitions (double vector, may be empty)");
827+ if(true) _pprintLine_(" data nodal or element data (double vector, may be empty)");
828+ if(true) _pprintLine_(" cmap color map (double nx3 array, may be empty)");
829+ if(true) _pprintLine_(" kmlfile KML file name (string)");
830+ if(true) _pprintLine_("");
831+ if(true) _pprintLine_(" ierror error flag (double, non-zero for error)");
832+ if(true) _pprintLine_("");
833+ if(true) _pprintLine_(" Example:");
834+ if(true) _pprintLine_(" KMLMeshWrite(md.name,md.notes,md.elements,md.nodeconnectivity,md.lat,md.long,md.part,md.fm_criterion,options.cmap,filekml);");
835+ if(true) _pprintLine_("");
836 }
837Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Chaco/Chaco.cpp
838===================================================================
839--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Chaco/Chaco.cpp (revision 12515)
840+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/modules/Chaco/Chaco.cpp (revision 12516)
841@@ -131,7 +131,7 @@
842 }
843
844 void ChacoUsage(void){
845- _printf_(true,"\n");
846- _printf_(true,"Usage: [assgn] = Chaco(A,vwgts,ewgts,x,y,z,options,nparts,goal);\n");
847- _printf_(true,"\n");
848+ if(true) _pprintLine_("");
849+ if(true) _pprintLine_("Usage: [assgn] = Chaco(A,vwgts,ewgts,x,y,z,options,nparts,goal);");
850+ if(true) _pprintLine_("");
851 }
Note: See TracBrowser for help on using the repository browser.