Changeset 9640

Timestamp:

09/07/11 08:24:03 (14 years ago)

Author:

Mathieu Morlighem

Message:

temporary commit

Location:

issm/trunk/src/m/model

Files:

• mask.m (copied) (copied from issm/trunk/src/m/model/geography.m ) (2 diffs)
• mask2.m (copied) (copied from issm/trunk/src/m/model/geography2.m ) (7 diffs)

issm/trunk/src/m/model/mask.m ¶

@@ -1 @@
-function md=geography(md,iceshelfname,icesheetname)
+function md=setmask(md,floatingicename,groundedicename)
 %GEOGRAPHY - establish boundaries between grounded and floating ice.
 %
-%   By default, ice is considered grounded. The contour iceshelfname defines nodes 
-%   for which ice is floating. The contour icesheetname defines nodes inside an iceshelf, 
+%   By default, ice is considered grounded. The contour floatingicename defines nodes 
+%   for which ice is floating. The contour groundedicename defines nodes inside an floatingice, 
 %   that are grounded (ie: ice rises, islands, etc ...)
 %   All input files are in the Argus format (extension .exp).
 %
 %   Usage:
-%      md=geography(md,iceshelfname,icesheetname)
+%      md=setmask(md,floatingicename,groundedicename)
 %
 %   Examples:
-%      md=geography(md,'all','');
-%      md=geography(md,'Iceshelves.exp','Islands.exp');
+%      md=setmask(md,'all','');
+%      md=setmask(md,'Iceshelves.exp','Islands.exp');
 
 %some checks on list of arguments
 if ((nargin~=3) | (nargout~=1)),
-        help geography
-        error('geography error message');
+        help mask
+        error('mask error message');
 end
 
@@ -25 +25 @@
 elements=md.elements;
 
-%Assign elementoniceshelf, elementonicesheet, nodeonicesheet and nodeoniceshelf. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{1
-elementoniceshelf=FlagElements(md,iceshelfname);
-elementonicesheet=FlagElements(md,icesheetname);
+%Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{1
+elementonfloatingice=FlagElements(md,floatingicename);
+elementongroundedice=FlagElements(md,groundedicename);
 
-%Because icesheet nodes and elements can be included into an iceshelf, we need to update. Remember, all the previous 
+%Because groundedice nodes and elements can be included into an floatingice, we need to update. Remember, all the previous 
 %arrays come from domain outlines that can intersect one another: 
-elementoniceshelf=double((elementoniceshelf & ~elementonicesheet));
-elementonicesheet=double(~elementoniceshelf);
+elementonfloatingice=double((elementonfloatingice & ~elementongroundedice));
+elementongroundedice=double(~elementonfloatingice);
 
-%the order here is important. we choose nodeonicesheet as default on the grounding line.
-nodeoniceshelf=zeros(md.numberofnodes,1);
-nodeonicesheet=zeros(md.numberofnodes,1);
-nodeonicesheet(md.elements(find(elementonicesheet),:))=1;
-nodeoniceshelf(find(~nodeonicesheet))=1;
+%the order here is important. we choose vertexongroundedice as default on the grounding line.
+vertexonfloatingice=zeros(md.numberofnodes,1);
+vertexongroundedice=zeros(md.numberofnodes,1);
+vertexongroundedice(md.elements(find(elementongroundedice),:))=1;
+vertexonfloatingice(find(~vertexongroundedice))=1;
 %}}}
 
 %Return: 
-md.elementoniceshelf=elementoniceshelf;
-md.nodeoniceshelf=nodeoniceshelf;
-
-md.elementonicesheet=elementonicesheet;
-md.nodeonicesheet=nodeonicesheet;
-
-md.nodeonwater=zeros(md.numberofnodes,1);
-md.elementonwater=zeros(md.numberofelements,1);
+md.mask.elementonfloatingice=elementonfloatingice;
+md.mask.vertexonfloatingice=vertexonfloatingice;
+md.mask.elementongroundedice=elementongroundedice;
+md.mask.vertexongroundedice=vertexongroundedice;
+md.mask.vertexonwater=zeros(md.numberofnodes,1);
+md.mask.elementonwater=zeros(md.numberofelements,1);

issm/trunk/src/m/model/mask2.m ¶

@@ -1 @@
-function md=geography2(md,landname,iceshelfname,icesheetname)
+function md=setmask2(md,landname,floatingicename,groundedicename)
 %GEOGRAPHY2 - establish land, ice sheet and ice shelf areas in a domains.
 %
 %   Usage:
-%      md=geography2(md,landname,iceshelfname,icesheetname)
+%      md=setmask2(md,landname,floatingicename,groundedicename)
 %
 %   Examples:
-%      md=geography2(md,'LandName.exp','Iceshelves.exp','Islands.exp');
+%      md=setmask2(md,'LandName.exp','Iceshelves.exp','Islands.exp');
 
 %Get assigned fields
@@ -15 +15 @@
 %recover elements and nodes on land.
 if ischar(landname),
-        [nodeonland,elementonland]=ContourToMesh(elements,x,y,landname,'element and node',2);
+        [vertexonland,elementonland]=ContourToMesh(elements,x,y,landname,'element and node',2);
 elseif isfloat(landname),
         if size(landname,1)~=md.numberofelements,
@@ -21 +21 @@
         end
         elementonland=landname;
-        nodeonland=zeros(md.numberofnodes,1);
-        nodeonland(md.elements(find(elementonland),:))=1;
+        vertexonland=zeros(md.numberofnodes,1);
+        vertexonland(md.elements(find(elementonland),:))=1;
 else
         error('Invalid area option option');
@@ -37 +37 @@
 %any element with 3 nodes on land should be on land:
 elementsonwater=find(~elementonland);
-wrongelements=elementsonwater(find(( nodeonland(md.elements(elementsonwater,1)) + nodeonland(md.elements(elementsonwater,2)) + nodeonland(md.elements(elementsonwater,3)) ...
+wrongelements=elementsonwater(find(( vertexonland(md.elements(elementsonwater,1)) + vertexonland(md.elements(elementsonwater,2)) + vertexonland(md.elements(elementsonwater,3)) ...
                   )==3));
 elementonland(wrongelements)=1;
@@ -70 +70 @@
 
 %recover arrays of ice shelf nodes and elements, and ice sheet nodes and elements.
-elementoniceshelf=FlagElements(md,iceshelfname);
-elementonicesheet=FlagElements(md,icesheetname);
+elementonfloatingice=FlagElements(md,floatingicename);
+elementongroundedice=FlagElements(md,groundedicename);
 
-%Because icesheet nodes and elements can be included into an iceshelf, we need to update. Remember, all the previous 
+%Because groundedice nodes and elements can be included into an floatingice, we need to update. Remember, all the previous 
 %arrays come from domain outlines that can intersect one another: 
-nodeoniceshelf=zeros(md.numberofnodes,1);
-nodeonicesheet=zeros(md.numberofnodes,1);
-elementoniceshelf=double((elementoniceshelf & ~elementonicesheet));
-elementonicesheet=double(~elementoniceshelf);
-nodeoniceshelf(md.elements(find(elementoniceshelf),:))=1;
-nodeonicesheet(md.elements(find(elementonicesheet),:))=1;
+vertexonfloatingice=zeros(md.numberofnodes,1);
+vertexongroundedice=zeros(md.numberofnodes,1);
+elementonfloatingice=double((elementonfloatingice & ~elementongroundedice));
+elementongroundedice=double(~elementonfloatingice);
+vertexonfloatingice(md.elements(find(elementonfloatingice),:))=1;
+vertexongroundedice(md.elements(find(elementongroundedice),:))=1;
 
-%now correct, so that none of the iceshelf and icesheet elements and nodes are in the water.
+%now correct, so that none of the floatingice and groundedice elements and nodes are in the water.
 pos=find(~elementonland);
-elementoniceshelf(pos)=0; 
-elementonicesheet(pos)=0;
+elementonfloatingice(pos)=0; 
+elementongroundedice(pos)=0;
 
-pos=find(~nodeonland);
-nodeoniceshelf(pos)=0; 
-nodeonicesheet(pos)=0;
+pos=find(~vertexonland);
+vertexonfloatingice(pos)=0; 
+vertexongroundedice(pos)=0;
 
-%create nodeonwater and elementonwater: 
-nodeonwater=double(~nodeonland);
+%create vertexonwater and elementonwater: 
+vertexonwater=double(~vertexonland);
 elementonwater=double(~elementonland);
 
 %correct for islands:
-nodeoniceshelf=double(nodeoniceshelf & ~nodeonicesheet);
-elementoniceshelf=double(elementoniceshelf & ~elementonicesheet);
+vertexonfloatingice=double(vertexonfloatingice & ~vertexongroundedice);
+elementonfloatingice=double(elementonfloatingice & ~elementongroundedice);
 
-%now, icesheets are everything except iceshelves and water
-nodeonicesheet=double(~nodeoniceshelf & ~nodeonwater);
-elementonicesheet=double(~elementoniceshelf & ~elementonwater);
+%now, groundedices are everything except iceshelves and water
+vertexongroundedice=double(~vertexonfloatingice & ~vertexonwater);
+elementongroundedice=double(~elementonfloatingice & ~elementonwater);
 
 %Deal with segments on neumann:
@@ -124 +124 @@
 %some final checks: 
 %check that no node thinks it's on an ice shelf or ice sheet, and lies actually in the middle of the water.
-nodesgrounded=find(~nodeonwater);
+nodesgrounded=find(~vertexonwater);
 lengthconnectivity=size(md.nodeconnectivity,2);
 groundedcounters=md.nodeconnectivity(nodesgrounded,lengthconnectivity);
@@ -134 +134 @@
 errornodes=nodesgrounded(errorflags);
 
-nodeonwater(errornodes)=1;
-nodeonicesheet(errornodes)=0;
-nodeoniceshelf(errornodes)=0;
+vertexonwater(errornodes)=1;
+vertexongroundedice(errornodes)=0;
+vertexonfloatingice(errornodes)=0;
 
 %Return: 
-md.nodeoniceshelf=nodeoniceshelf;
-md.elementoniceshelf=elementoniceshelf;
-
-md.nodeonwater=nodeonwater;
-md.elementonwater=elementonwater;
-
-md.nodeonicesheet=nodeonicesheet;
-md.elementonicesheet=elementonicesheet;
+md.mask.vertexonfloatingice=vertexonfloatingice;
+md.mask.elementonfloatingice=elementonfloatingice;
+md.mask.vertexonwater=vertexonwater;
+md.mask.elementonwater=elementonwater;
+md.mask.vertexongroundedice=vertexongroundedice;
+md.mask.elementongroundedice=elementongroundedice;
 
 md.segmentmarkers(:)=1;