Changeset 22601


Ignore:
Timestamp:
03/21/18 21:39:48 (7 years ago)
Author:
Mathieu Morlighem
Message:

CHG: adding more Enums to Parameters list

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

Legend:

Unmodified
Added
Removed

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

    r22600 r22601  
    110110        EsaUElasticEnum,
    111111        ExtrapolationVariableEnum,
     112        FemModelCommEnum,
    112113        FlowequationFeFSEnum,
    113114        FlowequationIsFSEnum,
    … …  
    700701        ExtrudeFromBaseAnalysisEnum,
    701702        ExtrudeFromTopAnalysisEnum,
    702         FemModelCommEnum,
    703703        FemModelEnum,
    704704        FileParamEnum,

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

    r22600 r22601  
    118118                case EsaUElasticEnum : return "EsaUElastic";
    119119                case ExtrapolationVariableEnum : return "ExtrapolationVariable";
     120                case FemModelCommEnum : return "FemModelComm";
    120121                case FlowequationFeFSEnum : return "FlowequationFeFS";
    121122                case FlowequationIsFSEnum : return "FlowequationIsFS";
    … …  
    704705                case ExtrudeFromBaseAnalysisEnum : return "ExtrudeFromBaseAnalysis";
    705706                case ExtrudeFromTopAnalysisEnum : return "ExtrudeFromTopAnalysis";
    706                 case FemModelCommEnum : return "FemModelComm";
    707707                case FemModelEnum : return "FemModel";
    708708                case FileParamEnum : return "FileParam";

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

    r22600 r22601  
    118118              else if (strcmp(name,"EsaUElastic")==0) return EsaUElasticEnum;
    119119              else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
     120              else if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
    120121              else if (strcmp(name,"FlowequationFeFS")==0) return FlowequationFeFSEnum;
    121122              else if (strcmp(name,"FlowequationIsFS")==0) return FlowequationIsFSEnum;
    … …  
    136137              else if (strcmp(name,"HydrologydcMaxIter")==0) return HydrologydcMaxIterEnum;
    137138              else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
    138               else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum;
     142              if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
     143              else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum;
    143144              else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
    144145              else if (strcmp(name,"HydrologydcSedimentlimitFlag")==0) return HydrologydcSedimentlimitFlagEnum;
    … …  
    259260              else if (strcmp(name,"SmbAIdx")==0) return SmbAIdxEnum;
    260261              else if (strcmp(name,"SmbASnow")==0) return SmbASnowEnum;
    261               else if (strcmp(name,"SmbCldFrac")==0) return SmbCldFracEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum;
     265              if (strcmp(name,"SmbCldFrac")==0) return SmbCldFracEnum;
     266              else if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum;
    266267              else if (strcmp(name,"SmbDelta18oSurface")==0) return SmbDelta18oSurfaceEnum;
    267268              else if (strcmp(name,"SmbDenIdx")==0) return SmbDenIdxEnum;
    … …  
    382383              else if (strcmp(name,"CalvingratexAverage")==0) return CalvingratexAverageEnum;
    383384              else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
    384               else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
     388              if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
     389              else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
    389390              else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum;
    390391              else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum;
    … …  
    505506              else if (strcmp(name,"SmbC")==0) return SmbCEnum;
    506507              else if (strcmp(name,"SmbD")==0) return SmbDEnum;
    507               else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
     511              if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
     512              else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
    512513              else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
    513514              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
    … …  
    628629              else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
    629630              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
    630               else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
     634              if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
     635              else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
    635636              else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
    636637              else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
    … …  
    719720              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
    720721              else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
    721               else if (strcmp(name,"FemModelComm")==0) return FemModelCommEnum;
    722722              else if (strcmp(name,"FemModel")==0) return FemModelEnum;
    723723              else if (strcmp(name,"FileParam")==0) return FileParamEnum;
Note: See TracChangeset for help on using the changeset viewer.