Changeset 7328

Timestamp:

02/04/11 08:45:43 (14 years ago)

Author:

seroussi

Message:

WARNING!
We simplified geography. The previous version was changing the position of the grounding line by one element.
New philosophy:

flag elementonicesheet
all vertices that belong to an element on ice sheet are on sheet ONLY
others are on ice shelf.
-> vertices ar the grounding line are ice sheet

File:

• issm/trunk/src/m/model/geography.m (modified) (2 diffs)

issm/trunk/src/m/model/geography.m

@@ -33 +33 @@
 
 %Assign elementoniceshelf, elementonicesheet, gridonicesheet and gridoniceshelf. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{1
-
 elementoniceshelf=FlagElements(md,iceshelfname);
 elementonicesheet=FlagElements(md,icesheetname);
@@ -39 +38 @@
 %Because icesheet grids and elements can be included into an iceshelf, we need to update. Remember, all the previous 
 %arrays come from domain outlines that can intersect one another: 
-gridoniceshelf=zeros(md.numberofgrids,1);
-gridonicesheet=zeros(md.numberofgrids,1);
 elementoniceshelf=double((elementoniceshelf & ~elementonicesheet));
 elementonicesheet=double(~elementoniceshelf);
 
-%the order here is important. we choose gridoniceshelf as default on the grounding line.
+%the order here is important. we choose gridonicesheet as default on the grounding line.
+gridoniceshelf=zeros(md.numberofgrids,1);
+gridonicesheet=zeros(md.numberofgrids,1);
 gridonicesheet(md.elements(find(elementonicesheet),:))=1;
-gridoniceshelf(md.elements(find(elementoniceshelf),:))=1;
-
-%gridoniceshelf exclusively not on ice sheet: 
-gridonicesheet(md.elements(find(elementoniceshelf),:))=0;
-
-%finally, an ice sheet that has one node on an ice shelf, becomes an iceshelf: 
-elementoniceshelf=double(sum(gridoniceshelf(elements),2)>0);
-pos=find(elementoniceshelf); elementonicesheet(pos)=0;
-
+gridoniceshelf(find(~gridonicesheet))=1;
 %}}}