Changeset 5024

Timestamp:

08/06/10 13:31:09 (15 years ago)

Author:

Mathieu Morlighem

Message:

No more expread required to call ContourToNodes

Location:

issm/trunk/src/m

Files:

• classes/public/BasinConstrain.m (modified) (1 diff)
• classes/public/BasinConstrain2.m (modified) (1 diff)
• classes/public/BasinConstrainShelf.m (modified) (1 diff)
• classes/public/contourenvelope.m (modified) (1 diff)
• classes/public/contourmassbalance.m (modified) (1 diff)
• classes/public/geography2.m (modified) (2 diffs)
• classes/public/mesh/meshbamg.m (modified) (1 diff)
• classes/public/mesh/meshexprefine.m (modified) (1 diff)
• classes/public/mesh/meshyams.m (modified) (2 diffs)
• classes/public/mesh/rifts/meshprocessoutsiderifts.m (modified) (1 diff)
• classes/public/mesh/rifts/meshprocessrifts.m (modified) (1 diff)
• classes/public/modeldefault/defaultparams.m (modified) (2 diffs)
• classes/public/plot/processmesh.m (modified) (2 diffs)
• utils/BC/SetIceShelfBC.m (modified) (1 diff)
• utils/BC/SetMarineIceSheetBC.m (modified) (1 diff)
• utils/Geometry/FlagElements.m (modified) (4 diffs)

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

@@ -33 +33 @@
                 end
                 %ok, flag elements and nodes
-                [gridondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,expread(domain,1),'element and node',2);
+                [gridondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2);
         end
         if invert,

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

@@ -33 +33 @@
                 end
                 %ok, flag elements and nodes
-                [gridondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,expread(domain,1),'element and node',2);
+                [gridondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2);
         end
         if invert,

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

@@ -33 +33 @@
                 end
                 %ok, flag elements and nodes
-                [gridondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,expread(domain,1),'element and node',2);
+                [gridondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2);
         end
         if invert,

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

@@ -34 +34 @@
 if nargin==2,
         %get flag list of elements and nodes inside the contour
-        nodein=ContourToMesh(md.elements,md.x,md.y,expread(file,1),'node',1);
+        nodein=ContourToMesh(md.elements,md.x,md.y,file,'node',1);
         elemin=(sum(nodein(md.elements),2)==size(md.elements,2));
         %modify element connectivity

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

@@ -22 +22 @@
 
 %get flag list of elements and nodes inside the contour
-nodein=ContourToMesh(md.elements,md.x,md.y,expread(file,1),'node',1);
+nodein=ContourToMesh(md.elements,md.x,md.y,file,'node',1);
 elemin=(sum(nodein(md.elements),2)==size(md.elements,2));
 

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

@@ -15 +15 @@
 %recover elements and grids on land.
 if ischar(landname),
-        [gridonland,elementonland]=ContourToMesh(elements,x,y,expread(landname,1),'element and node',2);
+        [gridonland,elementonland]=ContourToMesh(elements,x,y,landname,'element and node',2);
 elseif isfloat(landname),
         if size(landname,1)~=md.numberofelements,
@@ -48 +48 @@
                 yelem=y(md.elements)*weights{i}/sum(weights{i});
         end
-        baryonland=ContourToNodes(xelem,yelem,expread(landname,1),1);
+        baryonland=ContourToNodes(xelem,yelem,landname,1);
         pos=find(~baryonland); elementonland(pos)=0;
         pos=find(baryonland); elementonland(pos)=1;

issm/trunk/src/m/classes/public/mesh/meshbamg.m

@@ -97 +97 @@
         %set gridonwater field
         if ~strcmp(groundeddomain,'N/A'),
-                gridground=ContourToMesh(md.elements,md.x,md.y,expread(groundeddomain,1),'node',2);
+                gridground=ContourToMesh(md.elements,md.x,md.y,groundeddomain,'node',2);
                 md.gridonwater=ones(md.numberofgrids,1);
                 md.gridonwater(find(gridground))=0;

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

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

issm/trunk/src/m/classes/public/mesh/meshyams.m

@@ -81 +81 @@
         %set gridonwater field
         if ~strcmp(groundeddomain,'N/A'),
-                gridground=ContourToMesh(md.elements,md.x,md.y,expread(groundeddomain,1),'node',2);
+                gridground=ContourToMesh(md.elements,md.x,md.y,groundeddomain,'node',2);
                 md.gridonwater=ones(md.numberofgrids,1);
                 md.gridonwater(find(gridground))=0;
@@ -120 +120 @@
 md.elementonsurface=ones(md.numberofelements,1);
 if ~strcmp(groundeddomain,'N/A'),
-        gridground=ContourToMesh(md.elements,md.x,md.y,expread(groundeddomain,1),'node',2);
+        gridground=ContourToMesh(md.elements,md.x,md.y,groundeddomain,'node',2);
         md.gridonwater=ones(md.numberofgrids,1);
         md.gridonwater(find(gridground))=0;

issm/trunk/src/m/classes/public/mesh/rifts/meshprocessoutsiderifts.m

@@ -12 +12 @@
         
         %first, flag nodes that belong to the domain outline
-        flags=ContourToMesh(md.elements,md.x,md.y,expread(domainoutline,1),'node',0);
+        flags=ContourToMesh(md.elements,md.x,md.y,domainoutline,'node',0);
 
         rift=md.rifts(i);

issm/trunk/src/m/classes/public/mesh/rifts/meshprocessrifts.m

@@ -45 +45 @@
 
 %In case we have rifts that open up the domain outline, we need to open them: 
-flags=ContourToMesh(md.elements,md.x,md.y,expread(domainoutline,1),'node',0);
+flags=ContourToMesh(md.elements,md.x,md.y,domainoutline,'node',0);
 found=0;
 for i=1:md.numrifts,

issm/trunk/src/m/classes/public/modeldefault/defaultparams.m

@@ -52 +52 @@
                 
         %zones of high md.drag
-        %[rhighmd.drag_coefficient]=ArgusContourToMesh(md.elements,md.x,md.y,expread('HighDrag.exp',1),'node');
+        %[rhighmd.drag_coefficient]=ArgusContourToMesh(md.elements,md.x,md.y,'HighDrag.exp','node');
         %pos=find(highmd.drag);md.drag_coefficient(pos)=10^3;
 
@@ -79 +79 @@
 
         %zones of shear margin softening
-        %[rweakb]=ArgusContourToMesh(md.elements,md.x,md.y,expread('Weakmd.BPIG.exp',1),'node');
+        %[rweakb]=ArgusContourToMesh(md.elements,md.x,md.y,'Weakmd.BPIG.exp','node');
         %pos=find(weakb);md.rheology_B(pos)=.3*md.rheology_B(pos);
                 

issm/trunk/src/m/classes/public/plot/processmesh.m

@@ -27 +27 @@
         if (md.dim==2);
                 is2d=1;
-        else
+        elseif (md.dim==3),
                 if getfieldvalue(options,'layer',0)>=1,
                         is2d=1;
@@ -33 +33 @@
                         is2d=0;
                 end
+        else
+                error(['dim = ' num2str(md.dim) ' not supported yet']);
         end
 

issm/trunk/src/m/utils/BC/SetIceShelfBC.m

@@ -19 +19 @@
         icefrontfile=varargin{1};
         if ~exist(icefrontfile), error(['SetIceShelfBC error message: ice front file ' icefrontfile ' not found']); end
-        gridinsideicefront=ContourToMesh(md.elements,md.x,md.y,expread(icefrontfile,1),'node',2);
+        gridinsideicefront=ContourToMesh(md.elements,md.x,md.y,icefrontfile,'node',2);
         gridonicefront=double(md.gridonboundary & gridinsideicefront);
 elseif nargin==1,

issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m

@@ -23 +23 @@
                 error(['SetMarineIceSheetBC error message: ice front file ' icefrontfile ' not found']);
         end
-        gridinsideicefront=ContourToMesh(md.elements,md.x,md.y,expread(icefrontfile,1),'node',2);
+        gridinsideicefront=ContourToMesh(md.elements,md.x,md.y,icefrontfile,'node',2);
         gridonicefront=double(md.gridonboundary & gridinsideicefront);
 else

issm/trunk/src/m/utils/Geometry/FlagElements.m

@@ -1 @@
-function flag=FlagElements(md,area),
-%FLAGELEMENTS - flag the elements in an area
+function flag=FlagElements(md,region),
+%FLAGELEMENTS - flag the elements in an region
 %
-%   The area can be given with an exp file, a list of elements.
+%   The region can be given with an exp file, a list of elements.
 %
 %   Usage: 
-%      flag=FlagElements(md,area);
+%      flag=FlagElements(md,region);
 %
 %   Example:
@@ -14 +14 @@
 %      flag=FlagElements(md,md.elementonicesheet);
 
-        if ischar(area),
-                if isempty(area),
+        if ischar(region),
+                if isempty(region),
                         flag=zeros(md.numberofelements,1);
                         invert=0;
-                elseif strcmpi(area,'all')
+                elseif strcmpi(region,'all')
                         flag=ones(md.numberofelements,1);
                         invert=0;
                 else
                         %make sure that we actually don't want the elements outside the domain outline!
-                        if strcmpi(area(1),'~'),
-                                area=area(2:length(area));
+                        if strcmpi(region(1),'~'),
+                                region=region(2:length(region));
                                 invert=1;
                         else
@@ -30 +30 @@
                         end
 
-                        %does the area domain outline exist or do we have to look for xlim,ylim in basinzoom?
-                        if ~exist(area,'file'),
-                                [xlim,ylim]=basinzoom(area);
+                        %does the region domain outline exist or do we have to look for xlim,ylim in basinzoom?
+                        if ~exist(region,'file'),
+                                [xlim,ylim]=basinzoom(region);
                                 flag_nodes=double(md.x<xlim(2) & md.x>xlim(1) &  md.y<ylim(2) & md.y>ylim(1));
                                 flag=prod(flag_nodes(md.elements),2);
                         else
                                 %ok, flag elements
-                                flag=ContourToMesh(md.elements(:,1:3),md.x,md.y,expread(area,1),'element',1);
+                                flag=ContourToMesh(md.elements(:,1:3),md.x,md.y,region,'element',1);
                         end
                 end
@@ -43 +43 @@
                         flag=~flag;
                 end
-        elseif isfloat(area),
-                if size(area,1)~=md.numberofelements,
+        elseif isfloat(region),
+                if size(region,1)~=md.numberofelements,
                         help FlagElements
-                        error('Flaglist for area must be of same size as number of elements in model');
+                        error('Flaglist for region must be of same size as number of elements in model');
                 end
-                flag=area;
+                flag=region;
         else
-                error('Invalid area option option');
+                error('Invalid region option option');
         end
 end