Changeset 17522

Timestamp:

03/24/14 10:20:11 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added new enum for Nathan's LA theta algo

Location:

issm/trunk-jpl/src

Files:

• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (2 diffs)
• m/classes/flowequation.m (modified) (2 diffs)
• m/classes/flowequation.py (modified) (2 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/XTaylorHoodEnum.m (added)

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h ¶

@@ -560 +560 @@
         MINIcondensedEnum,
         TaylorHoodEnum,
+        XTaylorHoodEnum,
         OneLayerP4zEnum,
         /*}}}*/

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp ¶

@@ -547 +547 @@
                 case MINIcondensedEnum : return "MINIcondensed";
                 case TaylorHoodEnum : return "TaylorHood";
+                case XTaylorHoodEnum : return "XTaylorHood";
                 case OneLayerP4zEnum : return "OneLayerP4z";
                 case SaveResultsEnum : return "SaveResults";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp ¶

@@ -559 +559 @@
               else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
               else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
+              else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
               else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
               else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
@@ -628 +629 @@
               else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
               else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
-              else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
+              if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
+              else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
               else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
               else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;

issm/trunk-jpl/src/m/classes/flowequation.m ¶

@@ -87 +87 @@
                                 md = checkfield(md,'fieldname','flowequation.fe_SSA','values',{'P1','P1bubble','P1bubblecondensed','P2'});
                                 md = checkfield(md,'fieldname','flowequation.fe_HO' ,'values',{'P1','P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2','P1xP3','P2xP4'});
-                                md = checkfield(md,'fieldname','flowequation.fe_FS' ,'values',{'P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood','OneLayerP4z'});
+                                md = checkfield(md,'fieldname','flowequation.fe_FS' ,'values',{'P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood','XTaylorHood','OneLayerP4z'});
                                 md = checkfield(md,'fieldname','flowequation.borderSSA','size',[md.mesh.numberofvertices 1],'values',[0 1]);
                                 md = checkfield(md,'fieldname','flowequation.borderHO','size',[md.mesh.numberofvertices 1],'values',[0 1]);
@@ -126 +126 @@
                         fielddisplay(obj,'fe_SSA','Finite Element for SSA  ''P1'', ''P1bubble'' ''P1bubblecondensed'' ''P2''');
                         fielddisplay(obj,'fe_HO', 'Finite Element for HO   ''P1'' ''P1bubble'' ''P1bubblecondensed'' ''P1xP2'' ''P2xP1'' ''P2''');
-                        fielddisplay(obj,'fe_FS', 'Finite Element for FS   ''P1P1'' (debugging only) ''P1P1GLS'' ''MINIcondensed'' ''MINI'' ''TaylorHood''');
+                        fielddisplay(obj,'fe_FS', 'Finite Element for FS   ''P1P1'' (debugging only) ''P1P1GLS'' ''MINIcondensed'' ''MINI'' ''TaylorHood'' ''XTaylorHood''');
                         fielddisplay(obj,'vertex_equation','flow equation for each vertex');
                         fielddisplay(obj,'element_equation','flow equation for each element');

issm/trunk-jpl/src/m/classes/flowequation.py ¶

@@ -45 +45 @@
                 string="%s\n%s"%(string,fielddisplay(self,'fe_SSA',"Finite Element for SSA: 'P1', 'P1bubble' 'P1bubblecondensed' 'P2'"))
                 string="%s\n%s"%(string,fielddisplay(self,'fe_HO' ,"Finite Element for HO:  'P1' 'P1bubble' 'P1bubblecondensed' 'P1xP2' 'P2xP1' 'P2'"))
-                string="%s\n%s"%(string,fielddisplay(self,'fe_FS' ,"Finite Element for FS:  'P1P1' (debugging only) 'P1P1GLS' 'MINIcondensed' 'MINI' 'TaylorHood'"))
+                string="%s\n%s"%(string,fielddisplay(self,'fe_FS' ,"Finite Element for FS:  'P1P1' (debugging only) 'P1P1GLS' 'MINIcondensed' 'MINI' 'TaylorHood' 'XTaylorHood'"))
                 string="%s\n%s"%(string,fielddisplay(self,'vertex_equation',"flow equation for each vertex"))
                 string="%s\n%s"%(string,fielddisplay(self,'element_equation',"flow equation for each element"))
@@ -76 +76 @@
                         md = checkfield(md,'fieldname','flowequation.fe_SSA','values',['P1','P1bubble','P1bubblecondensed','P2'])
                         md = checkfield(md,'fieldname','flowequation.fe_HO' ,'values',['P1','P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2','P1xP3','P2xP4'])
-                        md = checkfield(md,'fieldname','flowequation.fe_FS' ,'values',['P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood','OneLayerP4z','P1xP3','P2xP4'])
+                        md = checkfield(md,'fieldname','flowequation.fe_FS' ,'values',['P1P1','P1P1GLS','MINIcondensed','MINI','TaylorHood','XTaylorHood','OneLayerP4z'])
                         md = checkfield(md,'fieldname','flowequation.borderSSA','size',[md.mesh.numberofvertices],'values',[0,1])
                         md = checkfield(md,'fieldname','flowequation.borderHO','size',[md.mesh.numberofvertices],'values',[0,1])

issm/trunk-jpl/src/m/enum/EnumDefinitions.py ¶

@@ -539 +539 @@
 def MINIcondensedEnum(): return StringToEnum("MINIcondensed")[0]
 def TaylorHoodEnum(): return StringToEnum("TaylorHood")[0]
+def XTaylorHoodEnum(): return StringToEnum("XTaylorHood")[0]
 def OneLayerP4zEnum(): return StringToEnum("OneLayerP4z")[0]
 def SaveResultsEnum(): return StringToEnum("SaveResults")[0]