Changeset 9464

Timestamp:

08/26/11 13:52:42 (14 years ago)

Author:

Mathieu Morlighem

Message:

removed all enums in pressureload

Location:

issm/trunk/src/m

Files:

• classes/model.m (modified) (2 diffs)
• model/display/displaybc.m (modified) (1 diff)
• model/ismodelselfconsistent.m (modified) (1 diff)
• model/plot/plot_pressureload.m (modified) (4 diffs)
• utils/BC/SetIceShelfBC.m (modified) (1 diff)
• utils/BC/SetMarineIceSheetBC.m (modified) (1 diff)

issm/trunk/src/m/classes/model.m

@@ -449 +449 @@
 
                          %Field class change
-                         if (size(structmd.pressureload,2)==3 | size(structmd.pressureload,2)==5),
-                                 md.pressureload=[structmd.pressureload...
-                                         WaterEnum*structmd.elementoniceshelf(structmd.pressureload(:,end))+AirEnum*structmd.elementonicesheet(structmd.pressureload(:,end))];
-                         end
+
                          if (isfield(structmd,'type') & ischar(structmd.type)), 
                                  if strcmpi(structmd.type,'2d'), md.dim=2; end
@@ -475 +472 @@
                                  pos=find(structmd.spcvelocity(:,2)); md.spcvy(pos)=structmd.spcvelocity(pos,5); 
                                  pos=find(structmd.spcvelocity(:,3)); md.spcvz(pos)=structmd.spcvelocity(pos,6); 
+                         end
+                         if ismember(structmd.pressureload(end,end),[AirEnum() WaterEnum() IceEnum()]),
+                                 pos=find(md.pressureload(:,end)==AirEnum);   md.pressureload(pos,end)=0;
+                                 pos=find(md.pressureload(:,end)==WaterEnum); md.pressureload(pos,end)=1;
+                                 pos=find(md.pressureload(:,end)==IceEnum);   md.pressureload(pos,end)=2;
                          end
 

issm/trunk/src/m/model/display/displaybc.m

@@ -22 +22 @@
 fielddisplay(md,'spcvy','y-axis velocity constraint (NaN means no constraint)');
 fielddisplay(md,'spcvz','z-axis velocity constraint (NaN means no constraint)');
-fielddisplay(md,'pressureload','segments on ice front list');
+fielddisplay(md,'pressureload','segments on ice front list (0:Air 1:Water 2:Ice)');
 
 disp(sprintf('\n      prognostic:'));

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -79 +79 @@
         message('dim should be either 2 3');
 end
-checkvalues(md,{'pressureload(:,end)'},[WaterEnum() AirEnum() IceEnum()]);
+checkvalues(md,{'pressureload(:,end)'},[0 1 2]);
 %}}}
 %NO NAN {{{1

issm/trunk/src/m/model/plot/plot_pressureload.m

@@ -22 +22 @@
 
         %highlight elements on neumann
-        pos=find(pressureload(:,end)==WaterEnum());
+        pos=find(pressureload(:,end)==1);
         pos=pressureload(pos,end-1);
         A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); 
         h2=patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','blue','EdgeColor','black');
-        pos=find(pressureload(:,end)==AirEnum());
+        pos=find(pressureload(:,end)==0);
         pos=pressureload(pos,end-1);
         A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); 
         h3=patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','green','EdgeColor','black');
 
-        pos=find(pressureload(:,end)==IceEnum());
+        pos=find(pressureload(:,end)==2);
         pos=pressureload(pos,end-1);
         A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); 
@@ -58 +58 @@
 
         %highlight elements on neumann
-        pos=find(pressureload(:,end)==WaterEnum());
+        pos=find(pressureload(:,end)==1);
         pos=pressureload(pos,end-1);
         A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); D=elements(pos,4); E=elements(pos,5); F=elements(pos,6);
@@ -66 +66 @@
         patch( 'Faces', [B E F C],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','blue','EdgeColor','black');
         patch( 'Faces', [C A D F],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','blue','EdgeColor','black');
-        pos=find(pressureload(:,end)==AirEnum());
+        pos=find(pressureload(:,end)==0);
         pos=pressureload(pos,end-1);
         A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); D=elements(pos,4); E=elements(pos,5); F=elements(pos,6);
@@ -74 +74 @@
         patch( 'Faces', [B E F C],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','green','EdgeColor','black');
         patch( 'Faces', [C A D F],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','green','EdgeColor','black');
-        pos=find(pressureload(:,end)==IceEnum());
+        pos=find(pressureload(:,end)==2);
         pos=pressureload(pos,end-1);
         A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); D=elements(pos,4); E=elements(pos,5); F=elements(pos,6);

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

@@ -59 +59 @@
 
 %Add water or air enum depending on the element
-pressureload=[pressureload WaterEnum*md.elementoniceshelf(pressureload(:,end))];
+pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))];
 
 %plug onto model

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

@@ -69 +69 @@
 
 %Add water or air enum depending on the element
-pressureload=[pressureload WaterEnum*md.elementoniceshelf(pressureload(:,end))+AirEnum*md.elementonicesheet(pressureload(:,end))];
+pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))+ 0*md.elementonicesheet(pressureload(:,end))];
 
 %plug onto model