Ignore:
Timestamp:
01/20/15 13:21:25 (10 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added some enums

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r18999 r19019  
    228228              else if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum;
    229229              else if (strcmp(name,"CalvingPi")==0) return CalvingPiEnum;
     230              else if (strcmp(name,"CalvingDev")==0) return CalvingDevEnum;
    230231              else if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum;
    231232              else if (strcmp(name,"CalvingRequestedOutputs")==0) return CalvingRequestedOutputsEnum;
    … …  
    240241              else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
    241242              else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
     243              else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum;
    242244              else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    243245              else if (strcmp(name,"MaterialsRhoSeawater")==0) return MaterialsRhoSeawaterEnum;
    … …  
    258260              else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum;
    259261              else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
    260               else if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum;
    261               else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum;
     265              if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum;
     266              else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
     267              else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum;
    266268              else if (strcmp(name,"MeshVertexonbase")==0) return MeshVertexonbaseEnum;
    267269              else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
    … …  
    381383              else if (strcmp(name,"SurfaceforcingsAccumulation")==0) return SurfaceforcingsAccumulationEnum;
    382384              else if (strcmp(name,"SurfaceforcingsEvaporation")==0) return SurfaceforcingsEvaporationEnum;
    383               else if (strcmp(name,"SurfaceforcingsRunoff")==0) return SurfaceforcingsRunoffEnum;
    384               else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SurfaceforcingsMelt")==0) return SurfaceforcingsMeltEnum;
     388              if (strcmp(name,"SurfaceforcingsRunoff")==0) return SurfaceforcingsRunoffEnum;
     389              else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
     390              else if (strcmp(name,"SurfaceforcingsMelt")==0) return SurfaceforcingsMeltEnum;
    389391              else if (strcmp(name,"SurfaceforcingsRefreeze")==0) return SurfaceforcingsRefreezeEnum;
    390392              else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum;
    … …  
    504506              else if (strcmp(name,"Penpair")==0) return PenpairEnum;
    505507              else if (strcmp(name,"Profiler")==0) return ProfilerEnum;
    506               else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
    507               else if (strcmp(name,"Masscon")==0) return MassconEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"MassconName")==0) return MassconNameEnum;
     511              if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
     512              else if (strcmp(name,"Masscon")==0) return MassconEnum;
     513              else if (strcmp(name,"MassconName")==0) return MassconNameEnum;
    512514              else if (strcmp(name,"MassconDefinitionenum")==0) return MassconDefinitionenumEnum;
    513515              else if (strcmp(name,"MassconLevelset")==0) return MassconLevelsetEnum;
    … …  
    627629              else if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum;
    628630              else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum;
    629               else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum;
    630               else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
     634              if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum;
     635              else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum;
     636              else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
    635637              else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
    636638              else if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
    … …  
    750752              else if (strcmp(name,"Outputdefinition70")==0) return Outputdefinition70Enum;
    751753              else if (strcmp(name,"Outputdefinition71")==0) return Outputdefinition71Enum;
    752               else if (strcmp(name,"Outputdefinition72")==0) return Outputdefinition72Enum;
    753               else if (strcmp(name,"Outputdefinition73")==0) return Outputdefinition73Enum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"Outputdefinition74")==0) return Outputdefinition74Enum;
     757              if (strcmp(name,"Outputdefinition72")==0) return Outputdefinition72Enum;
     758              else if (strcmp(name,"Outputdefinition73")==0) return Outputdefinition73Enum;
     759              else if (strcmp(name,"Outputdefinition74")==0) return Outputdefinition74Enum;
    758760              else if (strcmp(name,"Outputdefinition75")==0) return Outputdefinition75Enum;
    759761              else if (strcmp(name,"Outputdefinition76")==0) return Outputdefinition76Enum;
    … …  
    873875              else if (strcmp(name,"Dense")==0) return DenseEnum;
    874876              else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
    875               else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
    876               else if (strcmp(name,"Seq")==0) return SeqEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Mpi")==0) return MpiEnum;
     880              if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
     881              else if (strcmp(name,"Seq")==0) return SeqEnum;
     882              else if (strcmp(name,"Mpi")==0) return MpiEnum;
    881883              else if (strcmp(name,"Mumps")==0) return MumpsEnum;
    882884              else if (strcmp(name,"Gsl")==0) return GslEnum;
Note: See TracChangeset for help on using the changeset viewer.