Changeset 16269

Timestamp:

09/27/13 16:34:18 (11 years ago)

Author:

Eric.Larour

Message:

CHG: added hook up to use shape file

File:

• issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m (modified) (1 diff)

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m

@@ -23 +23 @@
                 error(['SetMarineIceSheetBC error message: ice front file ' icefrontfile ' not found']);
         end
-        incontour=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2);
+        [path,name,ext]=fileparts(icefrontfile);
+        if strcmp(ext,'.shp'),
+                contours=shpread(icefrontfile);
+        elseif strcmp(ext,'.exp'),
+                contours=expread(icefrontfile);
+        end
+        incontour=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,contours,'node',2);
         vertexonicefront=double(md.mesh.vertexonboundary & incontour);
 else