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

Timestamp:

07/31/13 15:18:17 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: FS can now use different types of interpolation for velocity and pressure

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (4 diffs)

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

@@ -329 +329 @@
               else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
               else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum;
+              else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
+              else if (strcmp(name,"FSpressure")==0) return FSpressureEnum;
               else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
               else if (strcmp(name,"Loads")==0) return LoadsEnum;
@@ -381 +383 @@
               else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
               else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
-              else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
-              else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
+              if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
+              else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
+              else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
               else if (strcmp(name,"Segment")==0) return SegmentEnum;
               else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
@@ -504 +506 @@
               else if (strcmp(name,"P2")==0) return P2Enum;
               else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
-              else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
-              else if (strcmp(name,"MINI")==0) return MINIEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
+              if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
+              else if (strcmp(name,"P1P1")==0) return P1P1Enum;
+              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
+              else if (strcmp(name,"MINI")==0) return MINIEnum;
+              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
               else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
               else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
@@ -582 +586 @@
               else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
               else if (strcmp(name,"XY")==0) return XYEnum;
-              else if (strcmp(name,"XYZP")==0) return XYZPEnum;
+              else if (strcmp(name,"XYZ")==0) return XYZEnum;
               else if (strcmp(name,"Dense")==0) return DenseEnum;
               else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;