Changeset 16258

Timestamp:

09/26/13 12:40:46 (11 years ago)

Author:

Eric.Larour

Message:

CHG: modified bamg to accept shape files

Location:

issm/trunk-jpl/src/m

Files:

• mesh/bamg.m (modified) (1 diff)
• shp/shpread.m (modified) (1 diff)

issm/trunk-jpl/src/m/mesh/bamg.m

@@ -64 +64 @@
         domainfile=getfieldvalue(options,'domain');
         if ~exist(domainfile,'file') error(['bamg error message: file ' domainfile ' not found']); end
-        domain=expread(domainfile);
+        
+        %read domain according to its extension: 
+        [path,name,ext]=fileparts(domainfile);
+        if strcmp(ext,'.exp'),
+                domain=expread(domainfile);
+        elseif strcmp(ext,'.shp'),
+                domain=shpread(domainfile);
+        else
+                error(['bamg error message: file ' domainfile ' format not supported (.shp or .exp)']);
+        end
 
         %Build geometry 

issm/trunk-jpl/src/m/shp/shpread.m

@@ -31 +31 @@
 for i=1:length(shp),
         if strcmpi(shp(i).Geometry,'Polygon'),
-                x=shp(i).X; y=shp(i).Y;
+                x=shp(i).X'; y=shp(i).Y';
                 ids=find(isnan(x));
                 x(ids)=[]; y(ids)=[];