Changeset 41

Timestamp:

04/24/09 14:08:55 (16 years ago)

Author:

Mathieu Morlighem

Message:

moved ArgusContour to Contour

Location:

issm/trunk/src/m/classes/public

Files:

• ThicknessCorrection.m (modified) (1 diff)
• domaintomesh.m (modified) (1 diff)
• geography.m (modified) (2 diffs)
• meshexprefine.m (modified) (1 diff)
• modelextract.m (modified) (1 diff)
• recover_areas.m (modified) (1 diff)

issm/trunk/src/m/classes/public/ThicknessCorrection.m

@@ -19 +19 @@
 end
 
-in=ArgusContourToMesh(md.elements,md.x,md.y,expread(filename,1),'node',1);
+in=ContourToMesh(md.elements,md.x,md.y,expread(filename,1),'node',1);
 pos_shelf=find(in & ~md.gridonicesheet);
 pos_sheet=find(in & md.gridonicesheet);

issm/trunk/src/m/classes/public/domaintomesh.m

@@ -29 +29 @@
 end
 
-[rinterp]=ArgusContourToMesh(md.elements,md.x,md.y,expread(domainname,1),interptype,1);
+[rinterp]=ContourToMesh(md.elements,md.x,md.y,expread(domainname,1),interptype,1);
 interp=IMdb('select matrix from rinterp');
 IMdb('drop rinterp');

issm/trunk/src/m/classes/public/geography.m

@@ -50 +50 @@
         elementoniceshelf=ones(md.numberofelements,1);
 else
-        [gridoniceshelf,elementoniceshelf]=ArgusContourToMesh(elements,x,y,expread(iceshelfname,1),'element and node',2);
+        [gridoniceshelf,elementoniceshelf]=ContourToMesh(elements,x,y,expread(iceshelfname,1),'element and node',2);
 end
 
@@ -57 +57 @@
         elementonicesheet=zeros(md.numberofelements,1);
 else
-        [gridonicesheet,elementonicesheet]=ArgusContourToMesh(elements,x,y,expread(icesheetname,1),'element and node',2);
+        [gridonicesheet,elementonicesheet]=ContourToMesh(elements,x,y,expread(icesheetname,1),'element and node',2);
 end
 

issm/trunk/src/m/classes/public/meshexprefine.m

@@ -39 +39 @@
 
 %Read domainname file into a matlab array (x,y):
-refinearea=ArgusContourToMesh(md.elements,md.x,md.y,expread(domainname,1),'element',1);
+refinearea=ContourToMesh(md.elements,md.x,md.y,expread(domainname,1),'element',1);
 aires=area(md);
 

issm/trunk/src/m/classes/public/modelextract.m

@@ -43 +43 @@
                 %ok, flag_elem elements
                 A=expread(area,1);
-                flag_elem=ArgusContourToMesh(md1.elements(:,1:3),md1.x,md1.y,A,'element',1);
+                flag_elem=ContourToMesh(md1.elements(:,1:3),md1.x,md1.y,A,'element',1);
                 %check that the elements do not cross the contour -> flag as 0
                 pos=find(flag_elem);

issm/trunk/src/m/classes/public/recover_areas.m

@@ -60 +60 @@
                         end
                         %ok, flag elements
-                        flag=ArgusContourToMesh(md.elements(:,1:3),md.x,md.y,expread(area,1),'element',1);
+                        flag=ContourToMesh(md.elements(:,1:3),md.x,md.y,expread(area,1),'element',1);
                 end
                 if invert,