Changeset 21793


Ignore:
Timestamp:
07/13/17 16:51:46 (8 years ago)
Author:
seroussi
Message:

NEW: missing enum

Location:
issm/trunk-jpl/src/c/shared/Enum
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r21787 r21793  
    721721        SubelementMigrationEnum,
    722722        SubelementMigration2Enum,
     723        SubelementMigration3Enum,
    723724        ContactEnum,
    724725        GroundingOnlyEnum,
  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r21787 r21793  
    711711                case SubelementMigrationEnum : return "SubelementMigration";
    712712                case SubelementMigration2Enum : return "SubelementMigration2";
     713                case SubelementMigration3Enum : return "SubelementMigration3";
    713714                case ContactEnum : return "Contact";
    714715                case GroundingOnlyEnum : return "GroundingOnly";
  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r21787 r21793  
    726726              else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum;
    727727              else if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum;
     728              else if (strcmp(name,"SubelementMigration3")==0) return SubelementMigration3Enum;
    728729              else if (strcmp(name,"Contact")==0) return ContactEnum;
    729730              else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
     
    751752              else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
    752753              else if (strcmp(name,"InputFileName")==0) return InputFileNameEnum;
    753               else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"RestartFileName")==0) return RestartFileNameEnum;
     757              if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
     758              else if (strcmp(name,"RestartFileName")==0) return RestartFileNameEnum;
    758759              else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
    759760              else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
     
    874875              else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
    875876              else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum;
    876               else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
     880              if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
     881              else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
    881882              else if (strcmp(name,"Segment")==0) return SegmentEnum;
    882883              else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
     
    997998              else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
    998999              else if (strcmp(name,"P2")==0) return P2Enum;
    999               else if (strcmp(name,"P2bubble")==0) return P2bubbleEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"P2bubblecondensed")==0) return P2bubblecondensedEnum;
     1003              if (strcmp(name,"P2bubble")==0) return P2bubbleEnum;
     1004              else if (strcmp(name,"P2bubblecondensed")==0) return P2bubblecondensedEnum;
    10041005              else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
    10051006              else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
Note: See TracChangeset for help on using the changeset viewer.