source: issm/oecreview/Archive/20545-21336/ISSM-21105-21106.diff@ 21337

Last change on this file since 21337 was 21337, checked in by Mathieu Morlighem, 8 years ago

CHG: added Archive/20545-21336

File size: 13.6 KB
RevLine 
[21337]1Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am
2===================================================================
3--- ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 21105)
4+++ ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 21106)
5@@ -51,7 +51,6 @@
6 InterpFromMeshToGrid_matlab.la\
7 InterpFromMesh2d_matlab.la\
8 IssmConfig_matlab.la\
9- Ll2xy_matlab.la\
10 NodeConnectivity_matlab.la\
11 M1qn3_matlab.la\
12 MeshPartition_matlab.la\
13@@ -60,8 +59,7 @@
14 PropagateFlagsFromConnectivity_matlab.la\
15 TriMesh_matlab.la\
16 TriMeshProcessRifts_matlab.la\
17- Scotch_matlab.la\
18- Xy2ll_matlab.la
19+ Scotch_matlab.la
20
21 if CHACO
22 lib_LTLIBRARIES += Chaco_matlab.la
23@@ -69,7 +67,7 @@
24 if KRIGING
25 lib_LTLIBRARIES += Kriging_matlab.la
26 endif
27-if KML
28+ifKML
29 lib_LTLIBRARIES += ShpRead_matlab.la
30 endif
31 #}}}
32@@ -194,14 +192,6 @@
33 IssmConfig_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
34 IssmConfig_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
35
36-Xy2ll_matlab_la_SOURCES = ../Xy2ll/Xy2ll.cpp
37-Xy2ll_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
38-Xy2ll_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
39-
40-Ll2xy_matlab_la_SOURCES = ../Ll2xy/Ll2xy.cpp
41-Ll2xy_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
42-Ll2xy_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
43-
44 ExpSimplify_matlab_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp
45 ExpSimplify_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
46 ExpSimplify_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
47Index: ../trunk-jpl/src/m/modules/Xy2ll.m
48===================================================================
49--- ../trunk-jpl/src/m/modules/Xy2ll.m (revision 21105)
50+++ ../trunk-jpl/src/m/modules/Xy2ll.m (revision 21106)
51@@ -1,31 +0,0 @@
52-function [lat,lon] = Xy2ll(varargin);
53-%XY2LL - x/y to lat/long coordinate transformation module:
54-%
55-% This module transforms x/y to lat/long coordinates.
56-%
57-% Usage:
58-% [lat,lon]=Xy2ll(x,y,sgn,'param name',param,...);
59-%
60-% x: x coordinates (double vector)
61-% y: y coordinates (double vector)
62-% sgn: sign for hemisphere (double, +1 (north) or -1 (south))
63-%
64-% central_meridian: central meridian (double, optional, but must specify with sp)
65-% standard_parallel: standard parallel (double, optional, but must specify with cm)
66-%
67-% lat: latitude coordinates (double vector)
68-% lon: longitude coordinates (double vector)
69-%
70-% Examples:
71-% [lat,lon]=Xy2ll(x,y, 1);
72-% [lat,lon]=Xy2ll(x,y, 1,'central_meridian',45,'standard_parallel',70);
73-% [lat,lon]=Xy2ll(x,y,-1,'central_meridian', 0,'standard_parallel',71);
74-
75-% Check usage
76-if nargout~=2 && nargin~=3 && nargin~=7
77- help Xy2ll
78- error('Wrong usage (see above)');
79-end
80-
81-% Call mex module
82-[lat,lon]=Xy2ll_matlab(varargin{:});
83Index: ../trunk-jpl/src/m/modules/KMLMeshWrite.m
84===================================================================
85--- ../trunk-jpl/src/m/modules/KMLMeshWrite.m (revision 21105)
86+++ ../trunk-jpl/src/m/modules/KMLMeshWrite.m (revision 21106)
87@@ -1,32 +0,0 @@
88-function ierror = KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);
89-% KMLMESHWRITE - KML mesh writer module:
90-%
91-% This module writes the mesh of a model as KML polygons into the specified KML file.
92-%
93-% Usage:
94-% ierror=KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);
95-%
96-% name: model name (string, may be empty)
97-% notes: model notes (string or cell array of strings, may be empty)
98-% elem: elements (double array)
99-% nodecon: nodal connectivity array (double array, may be empty)
100-% lat: nodal latititudes (double vector)
101-% long: nodal longitudes (double vector)
102-% part: nodal partitions (double vector, may be empty)
103-% data: nodal or element data (double vector, may be empty)
104-% cmap: color map (double nx3 array, may be empty)
105-% kmlfile: KML file name (string)
106-%
107-% ierror: error flag (double, non-zero for error)
108-%
109-% Example:
110-% KMLMeshWrite(md.name,md.notes,md.elements,md.nodeconnectivity,md.lat,md.long,md.part,md.fm_criterion,options.cmap,filekml);
111-
112-% Check usage
113-if nargin~=10
114- help KMLMeshWrite
115- error('Wrong usage (see above)');
116-end
117-
118-% Call mex module
119-ierror = KMLMeshWrite_matlab(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);
120Index: ../trunk-jpl/src/m/modules/KMLOverlay.m
121===================================================================
122--- ../trunk-jpl/src/m/modules/KMLOverlay.m (revision 21105)
123+++ ../trunk-jpl/src/m/modules/KMLOverlay.m (revision 21106)
124@@ -1,35 +0,0 @@
125-function ierror = KMLOverlay(varargin);
126-% KMLOverlay - KML file overlay module:
127-%
128-% This module reads a list of image files and writes a KML or KMZ overlay file.
129-%
130-% Usage:
131-% ierror=KMLOverlay(kmlfile,'param name',param,...);
132-%
133-% kmlfile: KML or KMZ file name (string)
134-%
135-% lataxis: latitude axis (double vector [south north], required)
136-% longaxis: longitude axis (double vector [west east], required)
137-% images: relative or http image file names (string or array of strings or cell array of strings, required)
138-% zip: flag to zip the doc.kml and image files into kmzfile (double, non-zero for kmz)
139-%
140-% ierror: error flag (double, non-zero for error)
141-%
142-% Example:
143-% KMLOverlay(kmlfile,'lataxis',[south north],'longaxis',[west east],'images',{'file1.png','http://issm/file2.png'},'zip',1);
144-
145-% Check usage
146-if nargin~=7 && nargin~=9
147- help KMLOverlay
148- error('Wrong usage (see above)');
149-end
150-
151-% Call mex module
152-switch nargin
153- case 7
154- ierror=KMLOverlay_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7});
155- case 9
156- ierror=KMLOverlay_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7},varargin{8},varargin{9});
157- otherwise
158- ierror=-1; % ERROR (non-zero)
159-end
160Index: ../trunk-jpl/src/m/modules/Ll2xy.m
161===================================================================
162--- ../trunk-jpl/src/m/modules/Ll2xy.m (revision 21105)
163+++ ../trunk-jpl/src/m/modules/Ll2xy.m (revision 21106)
164@@ -1,40 +0,0 @@
165-function [x,y] = Ll2xy(varargin);
166-%LL2XY - lat/long to x/y coordinate transformation module:
167-%
168-% This module transforms lat/long to x/y coordinates.
169-%
170-% Usage:
171-% [x,y]=Ll2xy(lat,lon,sgn,'param name',param,...);
172-%
173-% lat latitude coordinates (double vector)
174-% lon longitude coordinates (double vector)
175-% sgn sign for hemisphere (double, +1 (north) or -1 (south))
176-%
177-% central_meridian central meridian (double, optional, but must specify with sp)
178-% standard_parallel standard parallel (double, optional, but must specify with cm)
179-%
180-% x x coordinates (double vector)
181-% y y coordinates (double vector)
182-%
183-% Examples:
184-% [x,y]=Ll2xy(lat,lon, 1);
185-% [x,y]=Ll2xy(lat,lon, 1,'central_meridian',45,'standard_parallel',70);
186-% [x,y]=Ll2xy(lat,lon,-1,'central_meridian', 0,'standard_parallel',71);
187-
188-% Check usage
189-if nargin~=3 && nargin~=7
190- help Ll2xy
191- error('Wrong usage (see above)');
192-end
193-
194-% Call mex module
195-switch nargin
196- case 3
197- [x,y]=Ll2xy_matlab(varargin{1},varargin{2},varargin{3});
198- case 7
199- [x,y]=Ll2xy_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7});
200- otherwise
201- error(['Error in Ll2xy', '']);
202-end
203-
204-
205Index: ../trunk-jpl/src/m/modules/KMLFileRead.m
206===================================================================
207--- ../trunk-jpl/src/m/modules/KMLFileRead.m (revision 21105)
208+++ ../trunk-jpl/src/m/modules/KMLFileRead.m (revision 21106)
209@@ -1,39 +0,0 @@
210-function [ierror] = KMLFileRead(varargin);
211-%KMLFILEREAD - KML File Reader module
212-%
213-% This module reads a KML File.
214-%
215-% Usage:
216-% [ierror]=KMLFileRead(kmlfile,'param name',param,...);
217-%
218-% kmlfile: file name of kml file to be read (char)
219-% echo: echo command (char, optional, 'off'/'on')
220-% deepecho: deep echo command (char, optional, 'off'/'stdout'/kmlfile
221-% write: write command (char, optiona, 'off'/'stdout'/kmlfile
222-%
223-% ierror: return code (non-zero for error)
224-%
225-% Examples:
226-% [ierror]=KMLFileRead('file.kml','deepecho','on');
227-% [ierror]=KMLFileRead('filin.kml','echo','on','write','filout.kml');
228-
229-% Check usage
230-if nargin~=1 && nargin~=3 && nargin~=5 && nargin~=7
231- help KMLFileRead
232- error('Wrong usage (see above)');
233-end
234-
235-% Call mex module
236-switch nargin
237- case 1
238- [ierror]=KMLFileRead_matlab(varargin{1});
239- case 3
240- [ierror]=KMLFileRead_matlab(varargin{1},varargin{2},varargin{3});
241- case 5
242- [ierror]=KMLFileRead_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5});
243- case 7
244- [ierror]=KMLFileRead_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7});
245- otherwise
246- [ierror]=['Error using KMLFileRead'];
247-end
248-
249Index: ../trunk-jpl/src/m/modules/Shp2Kml.m
250===================================================================
251--- ../trunk-jpl/src/m/modules/Shp2Kml.m (revision 21105)
252+++ ../trunk-jpl/src/m/modules/Shp2Kml.m (revision 21106)
253@@ -1,30 +0,0 @@
254-function [ret]=Shp2Kml(varargin);
255-% SHP2KML - shp to kml file conversion module:
256-%
257-% This module converts a file from shp to kml format.
258-%
259-% Usage:
260-% [ret]=Shp2Kml(filshp,filkml,sgn,'param name',param,...);
261-%
262-% filshp: file name of shp file to be read (char, extension optional)
263-% filkml: file name of kml file to be written (char)
264-% sgn: sign for hemisphere (double, +1 (north) -1 (south) or 0 (no translation))
265-%
266-% central_meridian: central meridian (double, optional, but must specify with sp)
267-% standard_parallel: standard parallel (double, optional, but must specify with cm)
268-%
269-% ret: return code (non-zero for warning)
270-%
271-% Examples:
272-% [ret]=Shp2Kml('file.shp','file.kml', 0);
273-% [ret]=Shp2Kml('file.shp','file.kml', 1,'central_meridian',45,'standard_parallel',70);
274-% [ret]=Shp2Kml('file.shp','file.kml',-1,'central_meridian', 0,'standard_parallel',71);
275-
276-% Check usage
277-if nargin~=3 && nargin~=7
278- help Shp2Kml
279- error('Wrong usage (see above)');
280-end
281-
282-% Call mex module
283-[ret]=Shp2Kml_matlab(varargin{:});
284Index: ../trunk-jpl/src/m/modules/Exp2Kml.m
285===================================================================
286--- ../trunk-jpl/src/m/modules/Exp2Kml.m (revision 21105)
287+++ ../trunk-jpl/src/m/modules/Exp2Kml.m (revision 21106)
288@@ -1,39 +0,0 @@
289-function [ret] = Exp2Kml(varargin);
290-%EXP2KML - Converts a file from exp to kml format
291-%
292-% Usage:
293-% [ret]=Exp2Kml(filexp,filkml,sgn,'param nam',param,...);
294-%
295-% filexp: file name of the exp file to be read (string)
296-% filkml: file name of the kml file to be written (string)
297-% sgn: sign for hemisphere (double, +1 (north) or -1 (south))
298-%
299-% central_meridian: central meridian (double, optional, but must specify with sp)
300-% standard_parallel: standard parallel (double, optional, but must specify with cm)
301-% holes: flag for treatment of multiple profiles (string, optional, 'yes' for holes)
302-%
303-% ret: return code (non-zero for warning)
304-%
305-% Examples:
306-% [ret]=Exp2Kml('file.exp','file.kml', 1);
307-% [ret]=Exp2Kml('file.exp','file.kml', 1,'central_meridian',45,'standard_parallel',70,'holes','yes');
308-% [ret]=Exp2Kml('file.exp','file.kml',-1,'central_meridian',0, 'standard_parallel',71,'holes','yes');
309-
310-% Check usage
311-if nargin~=3 && nargin~=7 && nargin~=9
312- help Exp2Kml
313- error('Wrong usage (see above)');
314-end
315-
316-% Call mex module depending on number of arguments
317-switch nargin
318- case 3
319- [ret]=Exp2Kml_matlab(varargin{1},varargin{2},varargin{3});
320- case 7
321- [ret]=Exp2Kml_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7});
322- case 9
323- [ret]=Exp2Kml_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7},varargin{8},varargin{9});
324- otherwise
325- error(['Exp2Kml not supported yet']);
326-end
327-
328Index: ../trunk-jpl/src/m/modules/Kml2Exp.m
329===================================================================
330--- ../trunk-jpl/src/m/modules/Kml2Exp.m (revision 21105)
331+++ ../trunk-jpl/src/m/modules/Kml2Exp.m (revision 21106)
332@@ -1,38 +0,0 @@
333-function [ret] = Kml2Exp(varargin);
334-% KML2EXP - kml to exp file conversion module:
335-%
336-% This module converts a file from kml to exp format.
337-%
338-% Usage:
339-% [ret]=Kml2Exp(filexp,filkml,sgn,'param name',param,...);
340-%
341-% filkml: file name of kml file to be read (char)
342-% filexp: file name of exp file to be written (char)
343-% sgn: sign for hemisphere (double, +1 (north) or -1 (south))
344-%
345-% central_meridian: central meridian (double, optional, but must specify with sp)
346-% standard_parallel: standard parallel (double, optional, but must specify with cm)
347-%
348-% ret: return code (non-zero for warning)
349-%
350-% Examples:
351-% [ret]=Kml2Exp('file.kml','file.exp', 1);
352-% [ret]=Kml2Exp('file.kml','file.exp', 1,'central_meridian',45,'standard_parallel',70);
353-% [ret]=Kml2Exp('file.kml','file.exp',-1,'central_meridian', 0,'standard_parallel',71);
354-
355-% Check usage
356-if nargin~=3 && nargin~=7
357- help Kml2Exp
358- error('Wrong usage (see above)');
359-end
360-
361-% Call mex module
362-switch nargin
363- case 3
364- [ret]=Kml2Exp_matlab(varargin{1},varargin{2},varargin{3});
365- case 7
366- [ret]=Kml2Exp_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7});
367- otherwise
368- [ret]=['Kml2Exp error'];
369-end
370-
Note: See TracBrowser for help on using the repository browser.