Changeset 17038

Timestamp:

12/21/13 12:14:55 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: Added new Stokes element: OneLayerP4zEnum

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/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/OneLayerP4zEnum.m (added)

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

@@ -536 +536 @@
         MINIcondensedEnum,
         TaylorHoodEnum,
+        OneLayerP4zEnum,
         /*}}}*/
         /*Results{{{*/

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

@@ -528 +528 @@
                 case MINIcondensedEnum : return "MINIcondensed";
                 case TaylorHoodEnum : return "TaylorHood";
+                case OneLayerP4zEnum : return "OneLayerP4z";
                 case SaveResultsEnum : return "SaveResults";
                 case BoolExternalResultEnum : return "BoolExternalResult";

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

@@ -540 +540 @@
               else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
               else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
+              else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
               else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
               else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
@@ -628 +629 @@
               else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
               else if (strcmp(name,"Seq")==0) return SeqEnum;
-              else if (strcmp(name,"Mpi")==0) return MpiEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Mumps")==0) return MumpsEnum;
+              if (strcmp(name,"Mpi")==0) return MpiEnum;
+              else if (strcmp(name,"Mumps")==0) return MumpsEnum;
               else if (strcmp(name,"Gsl")==0) return GslEnum;
               else if (strcmp(name,"Option")==0) return OptionEnum;

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

@@ -520 +520 @@
 def MINIcondensedEnum(): return StringToEnum("MINIcondensed")[0]
 def TaylorHoodEnum(): return StringToEnum("TaylorHood")[0]
+def OneLayerP4zEnum(): return StringToEnum("OneLayerP4z")[0]
 def SaveResultsEnum(): return StringToEnum("SaveResults")[0]
 def BoolExternalResultEnum(): return StringToEnum("BoolExternalResult")[0]