Changeset 21601


Ignore:
Timestamp:
03/10/17 12:53:22 (8 years ago)
Author:
Eric.Larour
Message:

CHG: reverting back. Adding two new enums.

Location:
issm/branches/trunk-larour-GRL2017/src/c/shared/Enum
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/EnumDefinitions.h

    r21469 r21601  
    687687        VxObsEnum,
    688688        VyObsEnum,
     689        WeightsVxObsEnum,
     690        WeightsVyObsEnum,
    689691        /*}}}*/
    690692        /*Relaxation{{{*/

  • issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/EnumToStringx.cpp

    r21469 r21601  
    681681                case VxObsEnum : return "VxObs";
    682682                case VyObsEnum : return "VyObs";
     683                case WeightsVxObsEnum : return "WeightsVxObs";
     684                case WeightsVyObsEnum : return "WeightsVyObs";
    683685                case AbsoluteEnum : return "Absolute";
    684686                case IncrementalEnum : return "Incremental";

  • issm/branches/trunk-larour-GRL2017/src/c/shared/Enum/StringToEnumx.cpp

    r21469 r21601  
    696696              else if (strcmp(name,"VxObs")==0) return VxObsEnum;
    697697              else if (strcmp(name,"VyObs")==0) return VyObsEnum;
     698              else if (strcmp(name,"WeightsVxObs")==0) return WeightsVxObsEnum;
     699              else if (strcmp(name,"WeightsVyObs")==0) return WeightsVyObsEnum;
    698700              else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
    699701              else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
    … …  
    750752              else if (strcmp(name,"Mpi")==0) return MpiEnum;
    751753              else if (strcmp(name,"Mumps")==0) return MumpsEnum;
    752               else if (strcmp(name,"Gsl")==0) return GslEnum;
    753               else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"BuddJacka")==0) return BuddJackaEnum;
     757              if (strcmp(name,"Gsl")==0) return GslEnum;
     758              else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
     759              else if (strcmp(name,"BuddJacka")==0) return BuddJackaEnum;
    758760              else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
    759761              else if (strcmp(name,"Paterson")==0) return PatersonEnum;
    … …  
    873875              else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
    874876              else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
    875               else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
    876               else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
     880              if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
     881              else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
     882              else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
    881883              else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
    882884              else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
    … …  
    996998              else if (strcmp(name,"Nodes")==0) return NodesEnum;
    997999              else if (strcmp(name,"Contours")==0) return ContoursEnum;
    998               else if (strcmp(name,"Parameters")==0) return ParametersEnum;
    999               else if (strcmp(name,"Vertices")==0) return VerticesEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"Results")==0) return ResultsEnum;
     1003              if (strcmp(name,"Parameters")==0) return ParametersEnum;
     1004              else if (strcmp(name,"Vertices")==0) return VerticesEnum;
     1005              else if (strcmp(name,"Results")==0) return ResultsEnum;
    10041006              else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
    10051007         else stage=10;
Note: See TracChangeset for help on using the changeset viewer.