Changeset 24111

Timestamp:

07/29/19 07:49:22 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

File:

• issm/trunk-jpl/src/m/parameterization/killberg.m (modified) (2 diffs)

issm/trunk-jpl/src/m/parameterization/killberg.m

@@ -17 +17 @@
 element_flag = zeros(md.mesh.numberofelements,1);
 
-%Step 1, go through all elements and put 1 in local_mask if the element is grounded
 disp('Looking for isolated patches of floating ice (icebergs)');
-isice      = min(md.mask.ice_levelset(md.mesh.elements),[],2)<0;
+
+%do not go through elements that don't have ice, mark flag as 1 (done)
+isice = min(md.mask.ice_levelset(md.mesh.elements),[],2)<0;
+element_flag(find(~isice)) = 1;
+
+%do not go through elements that are grounded, mark flag as 1 (done)
+%and initialize mask as 1 for all vertices of these elements
 isgrounded = max(md.mask.groundedice_levelset(md.mesh.elements),[],2)>0;
 pos = find(isgrounded);
@@ -31 +36 @@
         more = false;
 
-        pos = find(~element_flag & isice);
-        if numel(pos)==0
-                break;
-        end
-
-        for i=pos'
+        for i=find(~element_flag)'
                 indices = md.mesh.elements(i,:);
                 MAX=max(mask(indices));