Changeset 22584


Ignore:
Timestamp:
03/20/18 16:26:30 (7 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added some Enums to test new interface for inputs

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

Legend:

Unmodified
Added
Removed

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

    r22576 r22584  
    3737        TimesteppingTimeStepMaxEnum,
    3838        /*}}}*/
     39        InputsSTARTEnum,
    3940        /*Model fields {{{*/
    4041        AutodiffIsautodiffEnum,
    … …  
    944945        /*}}}*/
    945946        ParametersENDEnum,
     947        /*Approximations {{{*/
     948        ApproximationEnum,
     949        NoneApproximationEnum,
     950        SIAApproximationEnum,
     951        SSAApproximationEnum,
     952        SSAHOApproximationEnum,
     953        SSAFSApproximationEnum,
     954        L1L2ApproximationEnum,
     955        HOApproximationEnum,
     956        HOFSApproximationEnum,
     957        FSApproximationEnum,
     958        FSvelocityEnum,
     959        FSpressureEnum,
     960        /*}}}*/
     961        InputsENDEnum,
    946962        /*Coordinate Systems{{{*/
    947963        XYEnum,
    … …  
    10711087        ExtrapolationAnalysisEnum,
    10721088        /*}}}*/
    1073         /*Approximations {{{*/
    1074         ApproximationEnum,
    1075         NoneApproximationEnum,
    1076         SIAApproximationEnum,
    1077         SSAApproximationEnum,
    1078         SSAHOApproximationEnum,
    1079         SSAFSApproximationEnum,
    1080         L1L2ApproximationEnum,
    1081         HOApproximationEnum,
    1082         HOFSApproximationEnum,
    1083         FSApproximationEnum,
    1084         FSvelocityEnum,
    1085         FSpressureEnum,
    1086         /*}}}*/
    10871089        /*Gauss{{{*/
    10881090        GaussSegEnum,

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

    r22576 r22584  
    4444                case TimesteppingTimeStepMinEnum : return "TimesteppingTimeStepMin";
    4545                case TimesteppingTimeStepMaxEnum : return "TimesteppingTimeStepMax";
     46                case InputsSTARTEnum : return "InputsSTART";
    4647                case AutodiffIsautodiffEnum : return "AutodiffIsautodiff";
    4748                case AutodiffNumDependentsEnum : return "AutodiffNumDependents";
    … …  
    916917                case ThicknessErrorEstimatorEnum : return "ThicknessErrorEstimator";
    917918                case ParametersENDEnum : return "ParametersEND";
     919                case ApproximationEnum : return "Approximation";
     920                case NoneApproximationEnum : return "NoneApproximation";
     921                case SIAApproximationEnum : return "SIAApproximation";
     922                case SSAApproximationEnum : return "SSAApproximation";
     923                case SSAHOApproximationEnum : return "SSAHOApproximation";
     924                case SSAFSApproximationEnum : return "SSAFSApproximation";
     925                case L1L2ApproximationEnum : return "L1L2Approximation";
     926                case HOApproximationEnum : return "HOApproximation";
     927                case HOFSApproximationEnum : return "HOFSApproximation";
     928                case FSApproximationEnum : return "FSApproximation";
     929                case FSvelocityEnum : return "FSvelocity";
     930                case FSpressureEnum : return "FSpressure";
     931                case InputsENDEnum : return "InputsEND";
    918932                case XYEnum : return "XY";
    919933                case XYZEnum : return "XYZ";
    … …  
    10351049                case LevelsetAnalysisEnum : return "LevelsetAnalysis";
    10361050                case ExtrapolationAnalysisEnum : return "ExtrapolationAnalysis";
    1037                 case ApproximationEnum : return "Approximation";
    1038                 case NoneApproximationEnum : return "NoneApproximation";
    1039                 case SIAApproximationEnum : return "SIAApproximation";
    1040                 case SSAApproximationEnum : return "SSAApproximation";
    1041                 case SSAHOApproximationEnum : return "SSAHOApproximation";
    1042                 case SSAFSApproximationEnum : return "SSAFSApproximation";
    1043                 case L1L2ApproximationEnum : return "L1L2Approximation";
    1044                 case HOApproximationEnum : return "HOApproximation";
    1045                 case HOFSApproximationEnum : return "HOFSApproximation";
    1046                 case FSApproximationEnum : return "FSApproximation";
    1047                 case FSvelocityEnum : return "FSvelocity";
    1048                 case FSpressureEnum : return "FSpressure";
    10491051                case GaussSegEnum : return "GaussSeg";
    10501052                case GaussTriaEnum : return "GaussTria";

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

    r22576 r22584  
    4444              else if (strcmp(name,"TimesteppingTimeStepMin")==0) return TimesteppingTimeStepMinEnum;
    4545              else if (strcmp(name,"TimesteppingTimeStepMax")==0) return TimesteppingTimeStepMaxEnum;
     46              else if (strcmp(name,"InputsSTART")==0) return InputsSTARTEnum;
    4647              else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum;
    4748              else if (strcmp(name,"AutodiffNumDependents")==0) return AutodiffNumDependentsEnum;
    … …  
    136137              else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
    137138              else if (strcmp(name,"FrictionM")==0) return FrictionMEnum;
    138               else if (strcmp(name,"FrictionC")==0) return FrictionCEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"FrictionLaw")==0) return FrictionLawEnum;
     142              if (strcmp(name,"FrictionC")==0) return FrictionCEnum;
     143              else if (strcmp(name,"FrictionLaw")==0) return FrictionLawEnum;
    143144              else if (strcmp(name,"FrictionGamma")==0) return FrictionGammaEnum;
    144145              else if (strcmp(name,"FrictionF")==0) return FrictionFEnum;
    … …  
    259260              else if (strcmp(name,"MaterialsRheologyEbar")==0) return MaterialsRheologyEbarEnum;
    260261              else if (strcmp(name,"MaterialsRheologyEc")==0) return MaterialsRheologyEcEnum;
    261               else if (strcmp(name,"MaterialsRheologyEcbar")==0) return MaterialsRheologyEcbarEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum;
     265              if (strcmp(name,"MaterialsRheologyEcbar")==0) return MaterialsRheologyEcbarEnum;
     266              else if (strcmp(name,"MaterialsRheologyEs")==0) return MaterialsRheologyEsEnum;
    266267              else if (strcmp(name,"MaterialsRheologyEsbar")==0) return MaterialsRheologyEsbarEnum;
    267268              else if (strcmp(name,"DamageD")==0) return DamageDEnum;
    … …  
    382383              else if (strcmp(name,"Surface")==0) return SurfaceEnum;
    383384              else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum;
    384               else if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"ThermalReltol")==0) return ThermalReltolEnum;
     388              if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum;
     389              else if (strcmp(name,"ThermalReltol")==0) return ThermalReltolEnum;
    389390              else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum;
    390391              else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;
    … …  
    505506              else if (strcmp(name,"SmbIsmungsm")==0) return SmbIsmungsmEnum;
    506507              else if (strcmp(name,"SmbIsd18opd")==0) return SmbIsd18opdEnum;
    507               else if (strcmp(name,"SmbIstemperaturescaled")==0) return SmbIstemperaturescaledEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SmbPrecipitationsPresentday")==0) return SmbPrecipitationsPresentdayEnum;
     511              if (strcmp(name,"SmbIstemperaturescaled")==0) return SmbIstemperaturescaledEnum;
     512              else if (strcmp(name,"SmbPrecipitationsPresentday")==0) return SmbPrecipitationsPresentdayEnum;
    512513              else if (strcmp(name,"SmbPrecipitationsLgm")==0) return SmbPrecipitationsLgmEnum;
    513514              else if (strcmp(name,"SmbTemperaturesPresentday")==0) return SmbTemperaturesPresentdayEnum;
    … …  
    628629              else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
    629630              else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum;
    630               else if (strcmp(name,"LambdaS")==0) return LambdaSEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
     634              if (strcmp(name,"LambdaS")==0) return LambdaSEnum;
     635              else if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
    635636              else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
    636637              else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum;
    … …  
    751752              else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
    752753              else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
    753               else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
     757              if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
     758              else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
    758759              else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;
    759760              else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
    … …  
    874875              else if (strcmp(name,"LoveNfreq")==0) return LoveNfreqEnum;
    875876              else if (strcmp(name,"LoveFrequencies")==0) return LoveFrequenciesEnum;
    876               else if (strcmp(name,"LoveShNmax")==0) return LoveShNmaxEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"LoveShNmin")==0) return LoveShNminEnum;
     880              if (strcmp(name,"LoveShNmax")==0) return LoveShNmaxEnum;
     881              else if (strcmp(name,"LoveShNmin")==0) return LoveShNminEnum;
    881882              else if (strcmp(name,"LoveG0")==0) return LoveG0Enum;
    882883              else if (strcmp(name,"LoveR0")==0) return LoveR0Enum;
    … …  
    937938              else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
    938939              else if (strcmp(name,"ParametersEND")==0) return ParametersENDEnum;
     940              else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
     941              else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
     942              else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
     943              else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
     944              else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
     945              else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
     946              else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
     947              else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
     948              else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
     949              else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum;
     950              else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
     951              else if (strcmp(name,"FSpressure")==0) return FSpressureEnum;
     952              else if (strcmp(name,"InputsEND")==0) return InputsENDEnum;
    939953              else if (strcmp(name,"XY")==0) return XYEnum;
    940954              else if (strcmp(name,"XYZ")==0) return XYZEnum;
    … …  
    984998              else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
    985999              else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
    986               else if (strcmp(name,"Segment")==0) return SegmentEnum;
     1000         else stage=9;
     1001   }
     1002   if(stage==9){
     1003              if (strcmp(name,"Segment")==0) return SegmentEnum;
    9871004              else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
    9881005              else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
    … …  
    9981015              else if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
    9991016              else if (strcmp(name,"Penta")==0) return PentaEnum;
    1000          else stage=9;
    1001    }
    1002    if(stage==9){
    1003               if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
     1017              else if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
    10041018              else if (strcmp(name,"Vertex")==0) return VertexEnum;
    10051019              else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum;
    … …  
    10591073              else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
    10601074              else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
    1061               else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
    1062               else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
    1063               else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
    1064               else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
    1065               else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
    1066               else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
    1067               else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
    1068               else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
    1069               else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
    1070               else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum;
    1071               else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
    1072               else if (strcmp(name,"FSpressure")==0) return FSpressureEnum;
    10731075              else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
    10741076              else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
    … …  
    11191121              else if (strcmp(name,"P1xP4")==0) return P1xP4Enum;
    11201122              else if (strcmp(name,"P2xP4")==0) return P2xP4Enum;
    1121               else if (strcmp(name,"P1P1")==0) return P1P1Enum;
    1122               else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"MINI")==0) return MINIEnum;
     1126              if (strcmp(name,"P1P1")==0) return P1P1Enum;
     1127              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
     1128              else if (strcmp(name,"MINI")==0) return MINIEnum;
    11271129              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
    11281130              else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
Note: See TracChangeset for help on using the changeset viewer.