Changeset 21452

Timestamp:

12/23/16 15:37:10 (8 years ago)

Author:

schlegel

Message:

CHG: add shape file option to mesh calls

Location:

issm/trunk-jpl/src/m/mesh

Files:

• bamg.m (modified) (1 diff)
• rifts/rifttipsonmesh.m (modified) (1 diff)

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

@@ -122 +122 @@
                 %Check that file exists
                 riftfile=getfieldvalue(options,'rifts');
+                [pathr,namer,extr]=fileparts(riftfile);
                 if ~exist(riftfile,'file')
                         error(['bamg error message: file ' riftfile ' not found ']);
-                end
-                rift=expread(riftfile);
+                elseif strcmp(extr,'.exp'),
+                        rift=expread(riftfile);
+                elseif strcmp(extr,'.shp'),
+                        rift=shpread(riftfile);
+                end
 
                 for i=1:length(rift),

issm/trunk-jpl/src/m/mesh/rifts/rifttipsonmesh.m

@@ -4 +4 @@
 
 %read rifts from outline file
-rifts=expread(riftoutline);
+%rifts=expread(riftoutline);
+[pathr,namer,extr]=fileparts(riftoutline);
+if strcmp(extr,'.exp'),
+        rifts=expread(riftoutline);
+elseif strcmp(extr,'.shp'),
+        rifts=shpread(riftoutline);
+end
 
 tips=[];