Changeset 14990

Timestamp:

05/09/13 11:09:47 (12 years ago)

Author:

adhikari

Message:

CHG: added VertexPIdEnum and VertexSIdEnum

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

• EnumDefinitions.h (modified) (1 diff)
• EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx.cpp (modified) (2 diffs)

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

@@ -378 +378 @@
         TriaP1InputEnum,
         VertexEnum,
+        VertexPIdEnum,
+        VertexSIdEnum,
         /*}}}*/
         /*Fill {{{*/

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

@@ -378 +378 @@
                 case TriaP1InputEnum : return "TriaP1Input";
                 case VertexEnum : return "Vertex";
+                case VertexPIdEnum : return "VertexPId";
+                case VertexSIdEnum : return "VertexSId";
                 case AirEnum : return "Air";
                 case IceEnum : return "Ice";

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

@@ -387 +387 @@
    if(stage==4){
               if (strcmp(name,"Vertex")==0) return VertexEnum;
+              else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum;
+              else if (strcmp(name,"VertexSId")==0) return VertexSIdEnum;
               else if (strcmp(name,"Air")==0) return AirEnum;
               else if (strcmp(name,"Ice")==0) return IceEnum;
@@ -504 +506 @@
               else if (strcmp(name,"Time")==0) return TimeEnum;
               else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum;
-              else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
-              else if (strcmp(name,"MinVel")==0) return MinVelEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
+              if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
+              else if (strcmp(name,"MinVel")==0) return MinVelEnum;
+              else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
               else if (strcmp(name,"MinVx")==0) return MinVxEnum;
               else if (strcmp(name,"MaxVx")==0) return MaxVxEnum;