Changeset 1298

Timestamp:

07/13/09 08:56:58 (16 years ago)

Author:

Mathieu Morlighem

Message:

some fixing (new enum names)

Location:

issm/trunk/src/m

Files:

• classes/public/extrude.m (modified) (1 diff)
• classes/public/ismodelselfconsistent.m (modified) (3 diffs)
• classes/public/mechanicalproperties.m (modified) (1 diff)
• classes/public/plot/plot_elementstype.m (modified) (2 diffs)
• classes/public/setelementstype.m (modified) (5 diffs)
• shared/diagnosticenum.m (deleted)

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

@@ -140 +140 @@
         %dead grids
         md.deadgrids=ones(md.numberofgrids,1);
-        md.deadgrids(md.elements(md.elements_type(:,1)~=macayealenum,:))=0;%non macayeal grids are not dead
+        md.deadgrids(md.elements(md.elements_type(:,1)~=MacAyealEnum,:))=0;%non macayeal grids are not dead
         md.deadgrids(find(md.gridonbed))=0;%grids from elements on bed are not dead
 end

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

@@ -41 +41 @@
         bool=0;return;
 end
-if any(ones(md.numberofelements,1)-((md.elements_type(:,1)==hutterenum) + (md.elements_type(:,1)==macayealenum)  + (md.elements_type(:,1)==pattynenum)))
+if any(ones(md.numberofelements,1)-((md.elements_type(:,1)==HutterEnum) + (md.elements_type(:,1)==MacAyealEnum)  + (md.elements_type(:,1)==PattynEnum)))
         disp(['Types of elements have not been set properly, run setelementstype first'])
         bool=0;return;
 end
-if any(ones(md.numberofelements,1)-((md.elements_type(:,2)==stokesenum) + (md.elements_type(:,2)==noneenum)))
+if any(ones(md.numberofelements,1)-((md.elements_type(:,2)==StokesEnum) + (md.elements_type(:,2)==NoneEnum)))
         disp(['Types of elements have not been set properly, run setelementstype first'])
         bool=0;return;
 end
 if strcmpi(md.type,'2d'),
-        if (ismember(pattynenum,md.elements_type(:,1)) |  ismember(stokesenum,md.elements_type(:,2))),
+        if (ismember(PattynEnum,md.elements_type(:,1)) |  ismember(StokesEnum,md.elements_type(:,2))),
                 disp(['For a 2d model, only MacAyeal''s and Hutter''s elements are allowed']);
                 bool=0;return;
@@ -186 +186 @@
 
         %HUTTER ON ICESHELF WARNING
-        if any(md.elements_type(:,1)==hutterenum & md.elementoniceshelf),
+        if any(md.elements_type(:,1)==HutterEnum & md.elementoniceshelf),
                 disp(sprintf('\n !!! Warning: Hutter''s model is not consistent on ice shelves !!!\n'));
         end
@@ -314 +314 @@
 
         %HUTTER
-        if any(md.elements_type(:,1)==hutterenum); 
+        if any(md.elements_type(:,1)==HutterEnum); 
                 disp(['The model has Hutter''s elements. Impossible to compute parameters']);
                 bool=0;return;

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

@@ -20 +20 @@
         error('only 2d model supported yet');
 end
-if any(md.elements_type(:,1)~=macayealenum),
+if any(md.elements_type(:,1)~=MacAyealEnum),
         disp('Warning: the model has some non macayeal elements. These will be treated like MacAyeal''s elements');
 end

issm/trunk/src/m/classes/public/plot/plot_elementstype.m

@@ -25 +25 @@
 if is2d
         %Hutter elements
-        posH=find(data(:,1)==hutterenum);
+        posH=find(data(:,1)==HutterEnum);
         A=elements(posH,1); B=elements(posH,2); C=elements(posH,3); 
-        p1=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',hutterenum,'FaceColor','flat','EdgeColor',edgecolor);
+        p1=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',HutterEnum,'FaceColor','flat','EdgeColor',edgecolor);
         %MacAyeal element
-        posH=find(data(:,1)==macayealenum);
+        posH=find(data(:,1)==MacAyealEnum);
         A=elements(posH,1); B=elements(posH,2); C=elements(posH,3); 
-        p2=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',macayealenum,'FaceColor','flat','EdgeColor',edgecolor);
+        p2=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',MacAyealEnum,'FaceColor','flat','EdgeColor',edgecolor);
         %Pattyn element
-        posH=find(data(:,1)==pattynenum);
+        posH=find(data(:,1)==PattynEnum);
         A=elements(posH,1); B=elements(posH,2); C=elements(posH,3); 
-        p3=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',pattynenum,'FaceColor','flat','EdgeColor',edgecolor);
+        p3=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',PattynEnum,'FaceColor','flat','EdgeColor',edgecolor);
         %Stokes elements
         alpha=0.35;
-        posS=find(data(:,2)==stokesenum);
+        posS=find(data(:,2)==StokesEnum);
         if ~isempty(posS)
                 A=elements(posS,1); B=elements(posS,2); C=elements(posS,3);
-        %       p4=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',stokesenum,'FaceColor','flat','EdgeColor',edgecolor,'EdgeAlpha',alpha,'FaceAlpha',alpha);
+        %       p4=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',StokesEnum,'FaceColor','flat','EdgeColor',edgecolor,'EdgeAlpha',alpha,'FaceAlpha',alpha);
         %       legend([p1 p2 p3 p4],'Hutter''s elements','MacAyeal''s elements','Pattyn''s elements','Stokes''s elements');
         else
@@ -48 +48 @@
 else
         %Hutter elements
-        posH=find(data(:,1)==hutterenum);
+        posH=find(data(:,1)==HutterEnum);
         A=elements(posH,1); B=elements(posH,2); C=elements(posH,3); D=elements(posH,4); E=elements(posH,5); F=elements(posH,6);
-        p1=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', hutterenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', hutterenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', hutterenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', hutterenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', hutterenum,'FaceColor','flat','EdgeColor',edgecolor);
+        p1=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', HutterEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', HutterEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', HutterEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', HutterEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', HutterEnum,'FaceColor','flat','EdgeColor',edgecolor);
         %MacAyeal elements
-        posM=find(data(:,1)==macayealenum);
+        posM=find(data(:,1)==MacAyealEnum);
         A=elements(posM,1); B=elements(posM,2); C=elements(posM,3); D=elements(posM,4); E=elements(posM,5); F=elements(posM,6);
-        p2=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', macayealenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', macayealenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', macayealenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', macayealenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', macayealenum,'FaceColor','flat','EdgeColor',edgecolor);
+        p2=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', MacAyealEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', MacAyealEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', MacAyealEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', MacAyealEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', MacAyealEnum,'FaceColor','flat','EdgeColor',edgecolor);
         %Pattyn elements
-        posP=find(data(:,1)==pattynenum);
+        posP=find(data(:,1)==PattynEnum);
         A=elements(posP,1); B=elements(posP,2); C=elements(posP,3); D=elements(posP,4); E=elements(posP,5); F=elements(posP,6);
-        p3=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', pattynenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', pattynenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', pattynenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', pattynenum,'FaceColor','flat','EdgeColor',edgecolor);
-        patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', pattynenum,'FaceColor','flat','EdgeColor',edgecolor);
+        p3=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', PattynEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', PattynEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', PattynEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', PattynEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', PattynEnum,'FaceColor','flat','EdgeColor',edgecolor);
         %Stokes elements
         alpha=0.35;
-        posS=find(data(:,2)==stokesenum);
+        posS=find(data(:,2)==StokesEnum);
         if ~isempty(posS)
                 A=elements(posS,1); B=elements(posS,2); C=elements(posS,3); D=elements(posS,4); E=elements(posS,5); F=elements(posS,6);

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

@@ -77 +77 @@
 gridonhutter(md.elements(find(hutterflag),:))=1;
 md.gridonhutter=gridonhutter;
-md.elements_type(find(hutterflag),1)=hutterenum();
+md.elements_type(find(hutterflag),1)=HutterEnum();
 
 %2: MacAyeal elements
@@ -83 +83 @@
 gridonmacayeal(md.elements(find(macayealflag),:))=1;
 md.gridonmacayeal=gridonmacayeal;
-md.elements_type(find(macayealflag),1)=macayealenum();
+md.elements_type(find(macayealflag),1)=MacAyealEnum();
 
 %3: Pattyn elements
@@ -89 +89 @@
 gridonpattyn(md.elements(find(pattynflag),:))=1;
 md.gridonpattyn=gridonpattyn;
-md.elements_type(find(pattynflag),1)=pattynenum();
+md.elements_type(find(pattynflag),1)=PattynEnum();
 
 %4: Stokes elements
 md.gridonstokes=gridonstokes;
-md.elements_type(find(stokesflag),2)=stokesenum();
+md.elements_type(find(stokesflag),2)=StokesEnum();
 
 %5: None elements (non Stokes)
-md.elements_type(find(~stokesflag),2)=noneenum();
+md.elements_type(find(~stokesflag),2)=NoneEnum();
 
 %Create the border grids between Pattyn and MacAyeal and extrude them
@@ -121 +121 @@
 
 %figure out the border stokes grids
-stokes_elements=find(md.elements_type(:,2)==stokesenum()); %find the elements on the stokes domain
+stokes_elements=find(md.elements_type(:,2)==StokesEnum()); %find the elements on the stokes domain
 borderflags=zeros(md.numberofgrids,1); 
 borderflags(md.elements(stokes_elements,:))=1; %find all the grids of the elements on stokes domain, ie stokes grids and borderstokes
@@ -132 +132 @@
 
 %figure out solution types
-md.ishutter=double(any(md.elements_type(:,1)==hutterenum()));
-md.ismacayealpattyn=double(any(md.elements_type(:,1)==macayealenum() | md.elements_type(:,1)==pattynenum() ));
+md.ishutter=double(any(md.elements_type(:,1)==HutterEnum()));
+md.ismacayealpattyn=double(any(md.elements_type(:,1)==MacAyealEnum() | md.elements_type(:,1)==PattynEnum() ));
 md.isstokes=double(any(md.elements_type(:,2)));