Changeset 22946

Timestamp:

07/13/18 15:27:33 (7 years ago)

Author:

Mathieu Morlighem

Message:

BUG: do not convert to exp if structure is an input

Location:

issm/trunk-jpl/src/m/modules

Files:

• ContourToMesh.m (modified) (1 diff)
• ContourToNodes.m (modified) (1 diff)

issm/trunk-jpl/src/m/modules/ContourToMesh.m

@@ -26 +26 @@
 
 %Some conversion of files: 
-[path,name,ext]=fileparts(contourname); 
-if strcmpi(ext,'.shp'),
-        %read contour from shapefile:
-        contour=shpread(contourname); 
+if ischar(contourname),
+        [path,name,ext]=fileparts(contourname); 
+        if strcmpi(ext,'.shp'),
+                %read contour from shapefile
+                contourname=shpread(contourname); 
 
-        %write it to a temporary filename: 
-        contourname=[tempname '.exp'];
-        expwrite(contour,contourname);
+                %FIXME: I don't think we need to convert it to a file, ContourToMesh_matlab should be able to take a structure
+                %write it to a temporary filename: 
+                %contourname=[tempname '.exp'];
+                %expwrite(contour,contourname);
+        end
 end
 

issm/trunk-jpl/src/m/modules/ContourToNodes.m

@@ -21 +21 @@
         if strcmpi(ext,'.shp'),
                 %read contour from shapefile:
-                contour=shpread(contourname); 
+                contourname=shpread(contourname); 
 
+                %FIXME: I don't think we need to convert it to a file, ContourToMesh_matlab should be able to take a structure
                 %write it to a temporary filename: 
-                contourname=tempname; 
-                expwrite(contour,contourname);
+                %contourname=[tempname '.exp'];
+                %expwrite(contour,contourname);
         end
 end