Changeset 5919

Timestamp:

09/21/10 10:41:39 (15 years ago)

Author:

seroussi

Message:

type of elements for PattynStokes

Location:

issm/trunk/src/m/model

Files:

• ismodelselfconsistent.m (modified) (1 diff)
• setelementstype.m (modified) (2 diffs)

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

@@ -71 +71 @@
 checksize(md,fields,[md.numberofgrids 1]);
 %Check the values of vertices_type
-checkvalues(md,{'vertices_type'},[MacAyealApproximationEnum() HutterApproximationEnum() PattynApproximationEnum() MacAyealPattynApproximationEnum() StokesApproximationEnum() NoneApproximationEnum()]);
+checkvalues(md,{'vertices_type'},[MacAyealApproximationEnum() HutterApproximationEnum() PattynApproximationEnum() MacAyealPattynApproximationEnum() StokesApproximationEnum() PattynStokesApproximationEnum() NoneApproximationEnum()]);
 if (md.dim==2),
         checkvalues(md,{'vertices_type'},[MacAyealApproximationEnum() HutterApproximationEnum()]);

issm/trunk/src/m/model/setelementstype.m

@@ -195 +195 @@
 pos=find(gridonmacayealpattyn);
 md.vertices_type(pos)=MacAyealPattynApproximationEnum();
-pos=find(gridonpattynstokes);
-md.vertices_type(pos)=PattynStokesApproximationEnum();
 pos=find(gridonstokes);
 md.vertices_type(pos)=StokesApproximationEnum();
@@ -203 +201 @@
         md.vertices_type(pos)=NoneApproximationEnum();
 end
+pos=find(gridonpattynstokes);
+md.vertices_type(pos)=PattynStokesApproximationEnum();
 
 %figure out solution types