Ignore:
Timestamp:
03/18/14 22:44:50 (11 years ago)
Author:
Mathieu Morlighem
Message:

NEW: working on Tetra elements

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r17459 r17472  
    226226              else if (strcmp(name,"Mesh2Dvertical")==0) return Mesh2DverticalEnum;
    227227              else if (strcmp(name,"Mesh3D")==0) return Mesh3DEnum;
     228              else if (strcmp(name,"Mesh3Dtetras")==0) return Mesh3DtetrasEnum;
    228229              else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
    229230              else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
    … …  
    259260              else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
    260261              else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
    261               else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
     265              if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
     266              else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
    266267              else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
    267268              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
    … …  
    382383              else if (strcmp(name,"Materials")==0) return MaterialsEnum;
    383384              else if (strcmp(name,"Nodes")==0) return NodesEnum;
    384               else if (strcmp(name,"Contours")==0) return ContoursEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"Parameters")==0) return ParametersEnum;
     388              if (strcmp(name,"Contours")==0) return ContoursEnum;
     389              else if (strcmp(name,"Parameters")==0) return ParametersEnum;
    389390              else if (strcmp(name,"Vertices")==0) return VerticesEnum;
    390391              else if (strcmp(name,"Results")==0) return ResultsEnum;
    … …  
    505506              else if (strcmp(name,"Vz")==0) return VzEnum;
    506507              else if (strcmp(name,"VzSSA")==0) return VzSSAEnum;
    507               else if (strcmp(name,"VzHO")==0) return VzHOEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
     511              if (strcmp(name,"VzHO")==0) return VzHOEnum;
     512              else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
    512513              else if (strcmp(name,"VzFS")==0) return VzFSEnum;
    513514              else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
    … …  
    628629              else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
    629630              else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
    630               else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
     634              if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
     635              else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
    635636              else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
    636637              else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
Note: See TracChangeset for help on using the changeset viewer.