Changeset 3111

Timestamp:

02/24/10 09:46:29 (15 years ago)

Author:

seroussi

Message:

small modifications of geography2 when land in specified with a list of elements

File:

• issm/trunk/src/m/classes/public/geography2.m (modified) (1 diff)

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

@@ -33 +33 @@
 elementonland(wrongelements)=1;
 
-%any element with its barycentre on land should be on land:
+%any element with its barycentre on land should be on land: (only if landname is an expfile)
+if ischar(landname),
 weights={[1;1;1],[2;1;1],[1;2;1],[1;1;2]};
-for i=1:length(weights),
-        xelem=x(md.elements)*weights{i}/sum(weights{i});
-        yelem=y(md.elements)*weights{i}/sum(weights{i});
+        for i=1:length(weights),
+                xelem=x(md.elements)*weights{i}/sum(weights{i});
+                yelem=y(md.elements)*weights{i}/sum(weights{i});
+        end
+        baryonland=ContourToNodes(xelem,yelem,expread(landname,1),1);
+        pos=find(~baryonland); elementonland(pos)=0;
+        pos=find(baryonland); elementonland(pos)=1;
 end
-baryonland=ContourToNodes(xelem,yelem,expread(landname,1),1);
-pos=find(~baryonland); elementonland(pos)=0;
-pos=find(baryonland); elementonland(pos)=1;
 
 %figure out which elements on land are actually in the middle of the ocean!