Index: /issm/trunk-jpl/src/m/modules/Chaco.m =================================================================== --- /issm/trunk-jpl/src/m/modules/Chaco.m (revision 20874) +++ /issm/trunk-jpl/src/m/modules/Chaco.m (revision 20875) @@ -9,5 +9,5 @@ % ewgts: weights for all edges % x,y,z: coordinates for inertial method -% options: architecture and partitioning options +% options: architecture and partitioning options % nparts: number of parts options % goal: desired set sizes Index: /issm/trunk-jpl/src/m/modules/ContourToMesh.m =================================================================== --- /issm/trunk-jpl/src/m/modules/ContourToMesh.m (revision 20874) +++ /issm/trunk-jpl/src/m/modules/ContourToMesh.m (revision 20875) @@ -2,5 +2,5 @@ %CONTOURTOMESH - Flag the elements or nodes inside a contour % -% Usage: +% Usage: % [in_nod,in_elem]=ContourToMesh(index,x,y,contourname,interptype,edgevalue); % Index: /issm/trunk-jpl/src/m/modules/ElementConnectivity.m =================================================================== --- /issm/trunk-jpl/src/m/modules/ElementConnectivity.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/ElementConnectivity.m (revision 20875) @@ -0,0 +1,14 @@ +function elementconnectivity = ElementConnectivity(elements,nodeconnectivity); +%ELEMENTCONNECTIVITY - Build element connectivity using node connectivity and elements +% +% Usage: +% elementconnectivity = ElementConnectivity(elements,nodeconnectivity); + +% Check usage +if nargin~=2 + help ElementConnectivity + error('Wrong usage (see above)'); +end + +% Call mex module +elementconnectivity = ElementConnectivity_matlab(elements,nodeconnectivity); Index: /issm/trunk-jpl/src/m/modules/ElementConnectivity.py =================================================================== --- /issm/trunk-jpl/src/m/modules/ElementConnectivity.py (revision 20875) +++ /issm/trunk-jpl/src/m/modules/ElementConnectivity.py (revision 20875) @@ -0,0 +1,14 @@ +from ElementConnectivity_python import ElementConnectivity_python + +def ElementConnectivity(elements,nodeconnectivity): + """ + ELEMENTCONNECTIVITY - Build element connectivity using node connectivity and elements + + Usage: + elementconnectivity = ElementConnectivity(elements,nodeconnectivity); + """ + #Call mex module + elementconnectivity = ElementConnectivity_python(elements,nodeconnectivity); + + #Return + return elementconnectivity Index: /issm/trunk-jpl/src/m/modules/EnumToString.m =================================================================== --- /issm/trunk-jpl/src/m/modules/EnumToString.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/EnumToString.m (revision 20875) @@ -0,0 +1,14 @@ +function enumstring = EnumToString(enum); +%ENUMTOSTRING - Convert an enum (int) to a string +% +% Usage: +% enumstring = EnumToString(enum); + +% Check usage +if nargin~=1 + help EnumToString + error('Wrong usage (see above)'); +end + +% Call mex module +enumstring = EnumToString_matlab(enum); Index: /issm/trunk-jpl/src/m/modules/EnumToString.py =================================================================== --- /issm/trunk-jpl/src/m/modules/EnumToString.py (revision 20875) +++ /issm/trunk-jpl/src/m/modules/EnumToString.py (revision 20875) @@ -0,0 +1,15 @@ +from EnumToString_python import EnumToString_python + +def EnumToString(enum): + """ + ENUMTOSTRING - Convert an enum (int) to a string + + Usage: + enumstring = EnumToString(enum); + """ + + # Call mex module + enumstring = EnumToString_python(enum); + + # Return + return enumstring Index: /issm/trunk-jpl/src/m/modules/Exp2Kml.m =================================================================== --- /issm/trunk-jpl/src/m/modules/Exp2Kml.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/Exp2Kml.m (revision 20875) @@ -0,0 +1,39 @@ +function [ret] = Exp2Kml(varargin); +%EXP2KML - Converts a file from exp to kml format +% +% Usage: +% [ret]=Exp2Kml(filexp,filkml,sgn,'param nam',param,...); +% +% filexp: file name of the exp file to be read (string) +% filkml: file name of the kml file to be written (string) +% sgn: sign for hemisphere (double, +1 (north) or -1 (south)) +% +% central_meridian: central meridian (double, optional, but must specify with sp) +% standard_parallel: standard parallel (double, optional, but must specify with cm) +% holes: flag for treatment of multiple profiles (string, optional, 'yes' for holes) +% +% ret: return code (non-zero for warning) +% +% Examples: +% [ret]=Exp2Kml('file.exp','file.kml', 1); +% [ret]=Exp2Kml('file.exp','file.kml', 1,'central_meridian',45,'standard_parallel',70,'holes','yes'); +% [ret]=Exp2Kml('file.exp','file.kml',-1,'central_meridian',0, 'standard_parallel',71,'holes','yes'); + +% Check usage +if nargin~=3 && nargin~=7 && nargin~=9 + help Exp2Kml + error('Wrong usage (see above)'); +end + +% Call mex module depending on number of arguments +switch nargin + case 3 + [ret]=Exp2Kml_matlab(varargin{1},varargin{2},varargin{3}); + case 7 + [ret]=Exp2Kml_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7}); + case 9 + [ret]=Exp2Kml_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7},varargin{8},varargin{9}); + otherwise + error(['Exp2Kml not supported yet']); +end + Index: /issm/trunk-jpl/src/m/modules/ExpSimplify.m =================================================================== --- /issm/trunk-jpl/src/m/modules/ExpSimplify.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/ExpSimplify.m (revision 20875) @@ -0,0 +1,30 @@ +function ExpSimplify(varargin); +%EXPSIMPLIFY - Simplify an Exp contour +% +% Usage: +% ExpSimplify(expfile,tol); +% +% expfile: name of the expfile +% tol: tolerance (maximal euclidean distance allowed between the new line and a vertex) +% min: minimum number of vertices to save contours in an exp file (default is 3) [OPTIONAL] +% +% Example: +% ExpSimplify('file.exp',100); +% ExpSimplify('file.exp',100,'min','4'); + +% Check usage +if nargin~=2 && nargin~=4 + help ExpSimplify + error('Wrong usage (see above)'); +end + +% Call mex module +switch nargin + case 2 + ExpSimplify_matlab(varargin{1},varargin{2}); + case 4 + ExpSimplify_matlab(varargin{1},varargin{2},varargin{3},varargin{4}); + otherwise + error('Exp2Kml not supported yet'); +end + Index: /issm/trunk-jpl/src/m/modules/ExpToLevelSet.m =================================================================== --- /issm/trunk-jpl/src/m/modules/ExpToLevelSet.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/ExpToLevelSet.m (revision 20875) @@ -0,0 +1,21 @@ +function distance = ExpToLevelSet(x,y,contourname); +%EXPTOLEVELSET - Determine levelset distance between a contour and a cloud of points +% +% Usage: +% distance=ExpToLevelSet(x,y,contourname); +% +% x,y: cloud point +% contourname: name of .exp file containing the contours +% distance: distance vector representing a levelset where the 0 level is one of the contour segments +% +% Example: +% distance=ExpToLevelSet(md.mesh.x,md.mesh.y,'Contour.exp'); + +% Check usage +if nargin~=3 + help ExpToLevelSet + error('Wrong usage (see above)'); +end + +% Call mex module +distance = ExpToLevelSet_matlab(x,y,contourname); Index: /issm/trunk-jpl/src/m/modules/InterpFromGridToMesh.m =================================================================== --- /issm/trunk-jpl/src/m/modules/InterpFromGridToMesh.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/InterpFromGridToMesh.m (revision 20875) @@ -0,0 +1,23 @@ +function data_mesh = InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,default_value); +%INTERPFROMGRIDTOMESH - Interpolation from a grid onto a list of points +% +% Usage: +% data_mesh=InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,default_value); +% +% data: matrix holding the data to be interpolated onto the mesh +% x,y: coordinates of matrix data (x and y must be in increasing order) +% x_mesh,y_mesh: coordinates of the points onto which we interpolate +% default_value: vector of mesh interpolated data +% +% Example: +% load('velocities.mat'); +% md.inversion.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.mesh.x,md.mesh.y,0); + +% Check usage +if nargin~=6 + help InterpFromGridToMesh + error('Wrong usage (see above)'); +end + +% Call mex module +data_mesh=InterpFromGridToMesh_matlab(x,y,data,x_mesh,y_mesh,default_value); Index: /issm/trunk-jpl/src/m/modules/InterpFromGridToMesh.py =================================================================== --- /issm/trunk-jpl/src/m/modules/InterpFromGridToMesh.py (revision 20875) +++ /issm/trunk-jpl/src/m/modules/InterpFromGridToMesh.py (revision 20875) @@ -0,0 +1,22 @@ +from InterpFromGridToMesh_python import InterpFromGridToMesh_python + +def InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,default_value): + """ + INTERPFROMGRIDTOMESH - Interpolation from a grid onto a list of points + + Usage: + data_mesh=InterpFromGridToMesh(x,y,data,x_mesh,y_mesh,default_value); + + data: matrix holding the data to be interpolated onto the mesh + x,y: coordinates of matrix data (x and y must be in increasing order) + x_mesh,y_mesh: coordinates of the points onto which we interpolate + default_value: vector of mesh interpolated data + + Example: + load('velocities.mat'); + md.inversion.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.mesh.x,md.mesh.y,0); + """ + # Call mex module + data_mesh=InterpFromGridToMesh_python(x,y,data,x_mesh,y_mesh,default_value); + # Return + return data_mesh Index: /issm/trunk-jpl/src/m/modules/InterpFromMesh2d.m =================================================================== --- /issm/trunk-jpl/src/m/modules/InterpFromMesh2d.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/InterpFromMesh2d.m (revision 20875) @@ -0,0 +1,38 @@ +function data_prime=InterpFromMesh2d(varargin); +%INTERPFROMMESH2D +% +% Usage: +% data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime); +% or data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value); +% or data_prime=InterpFromMesh2d(index,x,y,data,x_prime,y_prime,default_value,contourname); +% +% x,y: coordinates of the nodes where data is defined +% index: index of the mesh where data is defined +% data: vector holding the data to be interpolated onto the points +% x_prime,y_prime: coordinates of the mesh vertices onto which we interpolate +% default_value: a scalar or vector of size length(x_prime) +% 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. +% +% data_prime: vector of prime interpolated data + +% Check usage +if nargin~=6 && nargin~=7 && nargin~=8 + help InterpFromMesh2d + error('Wrong usage (see above)'); +end + +% Call mex module +switch nargin + case 6 + data_prime=InterpFromMesh2d_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6}); + case 7 + data_prime=InterpFromMesh2d_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7}); + case 8 + data_prime=InterpFromMesh2d_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7},varargin{8}); + otherwise + error('InterpFromMesh2d not supported'); +end + + + Index: /issm/trunk-jpl/src/m/modules/InterpFromMeshToGrid.m =================================================================== --- /issm/trunk-jpl/src/m/modules/InterpFromMeshToGrid.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/InterpFromMeshToGrid.m (revision 20875) @@ -0,0 +1,20 @@ +function [x_m,y_m,griddata] = InterpFromMeshToGrid(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value); +%INTERPFROMMESHTOGRID - Interpolation of a data defined on a mesh onto a grid +% +% This function is a multi-threaded mex file that interpolates a field defined on a triangular +% mesh onto a regular grid. +% +% index,x,y: delaunay triangulation defining the mesh +% meshdata: vertex values of data to be interpolated +% +% xmin,ymax,posting,nlines,ncols: parameters that define the grid +% default_value: value of points located out of the mesh + +% Check usage +if nargin~=11 + help InterpFromMeshToGrid + error('Wrong usage (see above)'); +end + +% Call mex module +[x_m,y_m,griddata] = InterpFromMeshToGrid_matlab(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value); Index: /issm/trunk-jpl/src/m/modules/InterpFromMeshToGrid.py =================================================================== --- /issm/trunk-jpl/src/m/modules/InterpFromMeshToGrid.py (revision 20875) +++ /issm/trunk-jpl/src/m/modules/InterpFromMeshToGrid.py (revision 20875) @@ -0,0 +1,19 @@ +from InterpFromMeshToGrid_python import InterpFromMeshToGrid_python + +def InterpFromMeshToGrid(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value): + """ + INTERPFROMMESHTOGRID - Interpolation of a data defined on a mesh onto a grid + + This function is a multi-threaded mex file that interpolates a field defined + on a triangular mesh onto a regular grid + + index,x,y: delaunay triangulation defining the mesh + meshdata: vertex values of data to be interpolated + + xmin,ymax,posting,nlines,ncols: parameters that define the grid + default_value: value of points located out of the mesh + """ + # Call mex module + [x_m,y_m,griddata]=InterpFromMeshToGrid_python(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value); + # Return + return [x_m,y_m,griddate]; Index: /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh2d.m =================================================================== --- /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh2d.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh2d.m (revision 20875) @@ -0,0 +1,28 @@ +function data_interp = InterpFromMeshToMesh2d(varargin); +%INTERPFROMMESHTOMESH2D - Interpolation from a 2d triangular mesh onto a list of points +% +% Usage: +% data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp); +% or data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp,OPTIONS); +% +% index: index of the mesh where data is defined +% x,y: coordinates of the nodes where data is defined +% data: matrix holding the data to be interpolated onto the mesh (one column per field) +% x_interp,y_interp: coordinates of the points onto which we interpolate +% data_interp: vector of mesh interpolated data +% Available options: +% default: default value if point is outsite of triangulation (instead of linear interpolation) +% +% Example: +% load('temperature.mat'); +% md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y); +% md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y,'default',253); + +% Check usage +if nargin~=6 && nargin~=8 + help InterpFromMeshToMesh2d + error('Wrong usage (see above)'); +end + +% Call mex module +data_interp=InterpFromMeshToMesh2d_matlab(varargin{:}); Index: /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh2d.py =================================================================== --- /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh2d.py (revision 20875) +++ /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh2d.py (revision 20875) @@ -0,0 +1,27 @@ +import InterpFromMeshToMesh2d_python from InterpFromMeshToMesh2d_python + +def InterpFromMeshToMesh2d(*args): + """ + INTERPFROMMESHTOMESH2D - Interpolation from a 2d triangular mesh onto a list of points + + Usage: + data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp); + or data_interp=InterpFromMeshToMesh2d(index,x,y,data,x_interp,y_interp,OPTIONS); + + index: index of the mesh where data is defined + x,y: coordinates of the nodes where data is defined + data: matrix holding the data to be interpolated onto the mesh (one column per field) + x_interp,y_interp: coordinates of the points onto which we interpolate + data_interp: vector of mesh interpolated data + Available options: + default: default value if point is outsite of triangulation (instead of linear interpolation) + + Example: + load('temperature.mat'); + md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y); + md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y,'default',253); + """ + # Call mex module + data_interp = InterpFromMeshToMesh2d_python(*args); + # Return + return data_interp Index: /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh3d.m =================================================================== --- /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh3d.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh3d.m (revision 20875) @@ -0,0 +1,24 @@ +function data_prime = InterpFromMeshToMesh3d(index,x,y,z,data,x_prime,y_prime,z_prime,default_value); +%INTERPFROMMESHTOMESH3D - Interpolation from a 3d hexahedron mesh onto a list of points +% +% Usage: +% index: index of the mesh where data is defined +% x,y,z: coordinates of the nodes where data is defined +% data: matrix holding the data to be interpolated onto the mesh +% x_prime,y_prime,z_prime: coordinates of the points onto which we interpolate +% default_value: default value if no data is found (holes) +% data_prime: vector of mesh interpolated data +% +% Example: +% load('temperature.mat'); +% md.initialization.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.mesh.x,md.mesh.y,md.mesh.z,253); + +% Check usage +if nargin~=9 + help InterpFromMeshToMesh3d + error('Wrong usage (see above)'); +end + +% Call mex module +data_prime=InterpFromMeshToMesh3d_matlab(index,x,y,z,data,x_prime,y_prime,z_prime,default_value); + Index: /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh3d.py =================================================================== --- /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh3d.py (revision 20875) +++ /issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh3d.py (revision 20875) @@ -0,0 +1,22 @@ +from InterpFromMeshToMesh3d_python import InterpFromMeshToMesh3d_python + +def InterpFromMeshToMesh3d(index,x,y,z,data,x_prime,y_prime,z_prime,default_value): + """ + INTERPFROMMESHTOMESH3D - Interpolation from a 3d hexahedron mesh onto a list of points + + Usage: + index: index of the mesh where data is defined + x,y,z: coordinates of the nodes where data is defined + data: matrix holding the data to be interpolated onto the mesh + x_prime,y_prime,z_prime: coordinates of the points onto which we interpolate + default_value: default value if no data is found (holes) + data_prime: vector of mesh interpolated data + + Example: + load('temperature.mat'); + md.initialization.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.mesh.x,md.mesh.y,md.mesh.z,253); + """ +# Call mex module +data_prime = InterpFromMeshToMesh3d_python(index,x,y,z,data,x_prime,y_prime,z_prime,default_value); +# Return +return data_prime Index: /issm/trunk-jpl/src/m/modules/IssmConfig.m =================================================================== --- /issm/trunk-jpl/src/m/modules/IssmConfig.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/IssmConfig.m (revision 20875) @@ -0,0 +1,14 @@ +function value = IssmConfig(string); +%ISSMCONFIG +% +% Usage: +% value = IssmConfig('string'); + +% Check usage +if nargin~=1 + help IssmConfig + error('Wrong usage (see above)'); +end + +% Call mex module +value = IssmConfig_matlab(string); Index: /issm/trunk-jpl/src/m/modules/IssmConfig.py =================================================================== --- /issm/trunk-jpl/src/m/modules/IssmConfig.py (revision 20875) +++ /issm/trunk-jpl/src/m/modules/IssmConfig.py (revision 20875) @@ -0,0 +1,15 @@ +from IssmConfig_python import IssmConfig_python + +def IssmConfig(string): + """ + ISSMCONFIG + + Usage: + value = IssmConfig('string'); + """ + + # Call mex module + value = IssmConfig_python(string); + # Return + return value; + Index: /issm/trunk-jpl/src/m/modules/KMLFileRead.m =================================================================== --- /issm/trunk-jpl/src/m/modules/KMLFileRead.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/KMLFileRead.m (revision 20875) @@ -0,0 +1,39 @@ +function [ierror] = KMLFileRead(varargin); +%KMLFILEREAD - KML File Reader module +% +% This module reads a KML File. +% +% Usage: +% [ierror]=KMLFileRead(kmlfile,'param name',param,...); +% +% kmlfile: file name of kml file to be read (char) +% echo: echo command (char, optional, 'off'/'on') +% deepecho: deep echo command (char, optional, 'off'/'stdout'/kmlfile +% write: write command (char, optiona, 'off'/'stdout'/kmlfile +% +% ierror: return code (non-zero for error) +% +% Examples: +% [ierror]=KMLFileRead('file.kml','deepecho','on'); +% [ierror]=KMLFileRead('filin.kml','echo','on','write','filout.kml'); + +% Check usage +if nargin~=1 && nargin~=3 && nargin~=5 && nargin~=7 + help KMLFileRead + error('Wrong usage (see above)'); +end + +% Call mex module +switch nargin + case 1 + [ierror]=KMLFileRead_matlab(varargin{1}); + case 3 + [ierror]=KMLFileRead_matlab(varargin{1},varargin{2},varargin{3}); + case 5 + [ierror]=KMLFileRead_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5}); + case 7 + [ierror]=KMLFileRead_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7}); + otherwise + [ierror]=['Error using KMLFileRead']; +end + Index: /issm/trunk-jpl/src/m/modules/KMLMeshWrite.m =================================================================== --- /issm/trunk-jpl/src/m/modules/KMLMeshWrite.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/KMLMeshWrite.m (revision 20875) @@ -0,0 +1,32 @@ +function ierror = KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile); +% KMLMESHWRITE - KML mesh writer module: +% +% This module writes the mesh of a model as KML polygons into the specified KML file. +% +% Usage: +% ierror=KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile); +% +% name: model name (string, may be empty) +% notes: model notes (string or cell array of strings, may be empty) +% elem: elements (double array) +% nodecon: nodal connectivity array (double array, may be empty) +% lat: nodal latititudes (double vector) +% long: nodal longitudes (double vector) +% part: nodal partitions (double vector, may be empty) +% data: nodal or element data (double vector, may be empty) +% cmap: color map (double nx3 array, may be empty) +% kmlfile: KML file name (string) +% +% ierror: error flag (double, non-zero for error) +% +% Example: +% KMLMeshWrite(md.name,md.notes,md.elements,md.nodeconnectivity,md.lat,md.long,md.part,md.fm_criterion,options.cmap,filekml); + +% Check usage +if nargin~=10 + help KMLMeshWrite + error('Wrong usage (see above)'); +end + +% Call mex module +ierror = KMLMeshWrite_matlab(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile); Index: /issm/trunk-jpl/src/m/modules/KMLOverlay.m =================================================================== --- /issm/trunk-jpl/src/m/modules/KMLOverlay.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/KMLOverlay.m (revision 20875) @@ -0,0 +1,35 @@ +function ierror = KMLOverlay(varargin); +% KMLOverlay - KML file overlay module: +% +% This module reads a list of image files and writes a KML or KMZ overlay file. +% +% Usage: +% ierror=KMLOverlay(kmlfile,'param name',param,...); +% +% kmlfile: KML or KMZ file name (string) +% +% lataxis: latitude axis (double vector [south north], required) +% longaxis: longitude axis (double vector [west east], required) +% images: relative or http image file names (string or array of strings or cell array of strings, required) +% zip: flag to zip the doc.kml and image files into kmzfile (double, non-zero for kmz) +% +% ierror: error flag (double, non-zero for error) +% +% Example: +% KMLOverlay(kmlfile,'lataxis',[south north],'longaxis',[west east],'images',{'file1.png','http://issm/file2.png'},'zip',1); + +% Check usage +if nargin~=7 && nargin~=9 + help KMLOverlay + error('Wrong usage (see above)'); +end + +% Call mex module +switch nargin + case 7 + ierror=KMLOverlay_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7}); + case 9 + ierror=KMLOverlay_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7},varargin{8},varargin{9}); + otherwise + ierror=-1; % ERROR (non-zero) +end Index: /issm/trunk-jpl/src/m/modules/Kml2Exp.m =================================================================== --- /issm/trunk-jpl/src/m/modules/Kml2Exp.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/Kml2Exp.m (revision 20875) @@ -0,0 +1,38 @@ +function [ret] = Kml2Exp(varargin); +% KML2EXP - kml to exp file conversion module: +% +% This module converts a file from kml to exp format. +% +% Usage: +% [ret]=Kml2Exp(filexp,filkml,sgn,'param name',param,...); +% +% filkml: file name of kml file to be read (char) +% filexp: file name of exp file to be written (char) +% sgn: sign for hemisphere (double, +1 (north) or -1 (south)) +% +% central_meridian: central meridian (double, optional, but must specify with sp) +% standard_parallel: standard parallel (double, optional, but must specify with cm) +% +% ret: return code (non-zero for warning) +% +% Examples: +% [ret]=Kml2Exp('file.kml','file.exp', 1); +% [ret]=Kml2Exp('file.kml','file.exp', 1,'central_meridian',45,'standard_parallel',70); +% [ret]=Kml2Exp('file.kml','file.exp',-1,'central_meridian', 0,'standard_parallel',71); + +% Check usage +if nargin~=3 && nargin~=7 + help Kml2Exp + error('Wrong usage (see above)'); +end + +% Call mex module +switch nargin + case 3 + [ret]=Kml2Exp_matlab(varargin{1},varargin{2},varargin{3}); + case 7 + [ret]=Kml2Exp_matlab(varargin{1},varargin{2},varargin{3},varargin{4},varargin{5},varargin{6},varargin{7}); + otherwise + [ret]=['Kml2Exp error']; +end + Index: /issm/trunk-jpl/src/m/modules/Kriging.m =================================================================== --- /issm/trunk-jpl/src/m/modules/Kriging.m (revision 20875) +++ /issm/trunk-jpl/src/m/modules/Kriging.m (revision 20875) @@ -0,0 +1,22 @@ +function predictions = Kriging(x,y,observations,x_interp,y_interp,varargin); +%KRIGING - Linear predictor +% Usage: predictions = Kriging(x,y,observations,x_interp,y_interp,'options'); +% +% available options: +% -'model': Available variogram models 'gaussian' (default),'spherical','power','exponential' +% -'nugget': nugget effect (default 0.2) +% -'range': for gaussian, spherical and exponential models (default sqrt(3)) +% -'sill': for gaussian, spherical and exponential models (default 1) +% -'slope': for power model (default 1) +% -'power': for power model (default 1) +% -'searchradius': search radius for each prediction (default is observations span) +% -'boxlength': minimum length of quadtree boxes (useful to decrease the number of observations) +% -'maxdata': minimum number of observations for a prediction (default is 50) +% -'mindata': maximum number of observations for a prediction (default is 1) +% -'maxtrimming': maximum trimming value (default is -1.e+21) +% -'mintrimming': minimum trimming value (default is +1.e+21) +% -'minspacing': minimum distance between observation (default is 0.01) +% -'numthreads': number of threads, default is "<