Changeset 23104


Ignore:
Timestamp:
08/17/18 10:18:18 (7 years ago)
Author:
hakesson
Message:

CHG: added new Enum

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

Legend:

Unmodified
Added
Removed

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

    r23062 r23104  
    457457                case FrictionQEnum : return "FrictionQ";
    458458                case FrictionWaterLayerEnum : return "FrictionWaterLayer";
     459                case FrictionWatercolumnMaxEnum : return "FrictionWatercolumnMax";
    459460                case FrictionTillFrictionAngleEnum : return "FrictionTillFrictionAngle";
    460461                case FrictionSedimentCompressibilityCoefficientEnum : return "FrictionSedimentCompressibilityCoefficient";

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

    r23062 r23104  
    466466              else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
    467467              else if (strcmp(name,"FrictionWaterLayer")==0) return FrictionWaterLayerEnum;
     468              else if (strcmp(name,"FrictionWatercolumnMax")==0) return FrictionWatercolumnMaxEnum;
    468469              else if (strcmp(name,"FrictionTillFrictionAngle")==0) return FrictionTillFrictionAngleEnum;
    469470              else if (strcmp(name,"FrictionSedimentCompressibilityCoefficient")==0) return FrictionSedimentCompressibilityCoefficientEnum;
    … …  
    505506              else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
    506507              else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
    507               else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
     511              if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
     512              else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
    512513              else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
    513514              else if (strcmp(name,"LoadingforceZ")==0) return LoadingforceZEnum;
    … …  
    628629              else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum;
    629630              else if (strcmp(name,"StrainRatexz")==0) return StrainRatexzEnum;
    630               else if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
     634              if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum;
     635              else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
    635636              else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
    636637              else if (strcmp(name,"StressMaxPrincipal")==0) return StressMaxPrincipalEnum;
    … …  
    751752              else if (strcmp(name,"Domain3Dsurface")==0) return Domain3DsurfaceEnum;
    752753              else if (strcmp(name,"DoubleArrayInput")==0) return DoubleArrayInputEnum;
    753               else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
     757              if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
     758              else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
    758759              else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
    759760              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
    … …  
    874875              else if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum;
    875876              else if (strcmp(name,"LoveKernelsReal")==0) return LoveKernelsRealEnum;
    876               else if (strcmp(name,"LoveKi")==0) return LoveKiEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"LoveKr")==0) return LoveKrEnum;
     880              if (strcmp(name,"LoveKi")==0) return LoveKiEnum;
     881              else if (strcmp(name,"LoveKr")==0) return LoveKrEnum;
    881882              else if (strcmp(name,"LoveLi")==0) return LoveLiEnum;
    882883              else if (strcmp(name,"LoveLr")==0) return LoveLrEnum;
    … …  
    997998              else if (strcmp(name,"Outputdefinition47")==0) return Outputdefinition47Enum;
    998999              else if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum;
    999               else if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"Outputdefinition4")==0) return Outputdefinition4Enum;
     1003              if (strcmp(name,"Outputdefinition49")==0) return Outputdefinition49Enum;
     1004              else if (strcmp(name,"Outputdefinition4")==0) return Outputdefinition4Enum;
    10041005              else if (strcmp(name,"Outputdefinition50")==0) return Outputdefinition50Enum;
    10051006              else if (strcmp(name,"Outputdefinition51")==0) return Outputdefinition51Enum;
    … …  
    11201121              else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
    11211122              else if (strcmp(name,"SmbMAdd")==0) return SmbMAddEnum;
    1122               else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"SMBpdd")==0) return SMBpddEnum;
     1126              if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
     1127              else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum;
    11271128              else if (strcmp(name,"SmbRlaps")==0) return SmbRlapsEnum;
    11281129              else if (strcmp(name,"SmbRlapslgm")==0) return SmbRlapslgmEnum;
Note: See TracChangeset for help on using the changeset viewer.