Changeset 5071

Timestamp:

08/09/10 11:36:47 (15 years ago)

Author:

seroussi

Message:

added vertices_type

Location:

issm/trunk/src/m/classes

Files:

• @model/model.m (modified) (1 diff)
• public/extrude.m (modified) (2 diffs)
• public/ismodelselfconsistent.m (modified) (1 diff)
• public/setelementstype.m (modified) (1 diff)

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

@@ -45 +45 @@
         md.elements2d=NaN;
         md.elements_type2d=NaN;
+        md.vertices_type2d=NaN;
         md.x2d=NaN;
         md.y2d=NaN;

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

@@ -119 +119 @@
 md.elements2d=md.elements;
 md.elements_type2d=md.elements_type;
+md.vertices_type2d=md.vertices_type;
 md.numberofelements2d=md.numberofelements;
 md.numberofgrids2d=md.numberofgrids;
@@ -187 +188 @@
         md.deadgrids(md.elements(md.elements_type(:,1)~=MacAyealFormulationEnum,:))=0;%non macayeal grids are not dead
         md.deadgrids(find(md.gridonbed))=0;%grids from elements on bed are not dead
+end
+
+%verticestype
+if ~isnan(md.vertices_type)
+        oldvertices_type=md.vertices_type2d;
+        md.vertices_type=zeros(number_grids3d,2);
+        md.vertices_type(:,1)=project3d(md,oldvertices_type(:,1),'node');
+        md.vertices_type(:,2)=project3d(md,oldvertices_type(:,2),'node');
 end
 

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

@@ -59 +59 @@
 %Check the values of elements_type(1)
 checkvalues(md,{'elements_type(:,1)'},[MacAyealFormulationEnum() HutterFormulationEnum() PattynFormulationEnum()]);
+%Check the values of elements_type(2)
+checkvalues(md,{'elements_type(:,2)'},[StokesFormulationEnum() NoneFormulationEnum()]);
+if (md.dim==2),
+        checkvalues(md,{'elements_type(:,1)'},[MacAyealFormulationEnum() HutterFormulationEnum()]);
+end
+if (md.ismacayealpattyn==0 && md.ishutter==0 && md.isstokes==0),
+        error(['model not consistent: no elements type set for this model. at least one of ismacayealpattyn, ishutter and isstokes need to be =1']);
+end
+%}}}
+%VERTICESTYPE{{{1
+%Check the size of verticess_type
+fields={'vertices_type'};
+checksize(md,fields,[md.numberofgrids 2]);
+%Check the values of elements_type(1)
+checkvalues(md,{'elements_type(:,1)'},[MacAyealFormulationEnum() HutterFormulationEnum() PattynFormulationEnum() MacAyealPattynFormulationEnum()]);
 %Check the values of elements_type(2)
 checkvalues(md,{'elements_type(:,2)'},[StokesFormulationEnum() NoneFormulationEnum()]);

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

@@ -98 +98 @@
 md.elements_type(find(~stokesflag),2)=NoneFormulationEnum();
 
+%Create vertices_type
+md.vertices_type=zeros(md.numberofgrids,2);
+pos=find(gridonhutter);
+md.vertices_type(pos,1)=HutterFormulationEnum();
+pos=find(gridonmacayeal);
+md.vertices_type(pos,1)=MacAyealFormulationEnum();
+pos=find(gridonpattyn);
+md.vertices_type(pos,1)=PattynFormulationEnum();
+pos=find(gridonhutter);
+md.vertices_type(pos,1)=HutterFormulationEnum();
+pos=find(gridonpattyn & gridonmacayeal);
+md.vertices_type(pos,1)=MacAyealPattynFormulationEnum();
+pos=find(gridonstokes);
+md.vertices_type(pos,2)=StokesFormulationEnum();
+pos=find(~gridonstokes);
+md.vertices_type(pos,2)=NoneFormulationEnum();
+
 %Create the border grids between Pattyn and MacAyeal and extrude them
 numgrids2d=md.numberofgrids2d;