Changeset 7304

Timestamp:

02/03/11 16:16:06 (14 years ago)

Author:

Eric.Larour

Message:

Bunch of nice routines for exp and kml files.
Plus, modelextract can now rely on a basin name

Location:

issm/trunk/src/m/utils

Files:

• Basins/basinzoom.m (modified) (2 diffs)
• Geometry/FlagElements.m (modified) (1 diff)
• Kml/kml2exp.m (modified) (1 diff)
• Kml/kml2expg.m (added)

issm/trunk/src/m/utils/Basins/basinzoom.m

@@ -1 @@
-function varargout=basinzoom(options)
+function varargout=basinzoom(varargin)
 %ANTZOOM - zoom on a basin in Antarctica or Greenland.
 %
@@ -9 +9 @@
 
 %recover some options, and set defaults
+
+%is varargin an options database already?
+if nargin==0,
+        options=pairoptions(varargin{:});
+elseif (isa(varargin{1},'plotoptions') | isa(varargin{1},'pairoptions')),
+        %do nothing to the varargin: 
+        options=varargin{1};
+else
+        %process varargin for options: 
+        options=pairoptions(varargin{:});
+end
 
 unitmultiplier=getfieldvalue(options,'unit',NaN);

issm/trunk/src/m/utils/Geometry/FlagElements.m

@@ -32 +32 @@
                         %does the region domain outline exist or do we have to look for xlim,ylim in basinzoom?
                         if ~exist(region,'file'),
-                                [xlim,ylim]=basinzoom(region);
+                                [xlim,ylim]=basinzoom('basin',region);
                                 flag_nodes=double(md.x<xlim(2) & md.x>xlim(1) &  md.y<ylim(2) & md.y>ylim(1));
                                 flag=prod(flag_nodes(md.elements),2);

issm/trunk/src/m/utils/Kml/kml2exp.m

@@ -11 +11 @@
 %First, read polygon kml file.
 structure=kml_shapefile(input);
+        
+%create exp file: 
+domain=struct();
+for i=1:length(structure),
 
-%create exp file: 
-domain.name=structure.name;
-domain.density=1;
-domain.x=structure.X;
-domain.y=structure.Y;
+        if isfield(structure,'name'),
+                domain(end+1).name=structure(i).name;
+        else
+                domain(end+1).name='NaN';
+        end
+
+        domain(end).density=1;
+        domain(end).x=structure(i).X;
+        domain(end).y=structure(i).Y;
+end
+domain=domain(2:end);
 expwrite(domain,output);