Changeset 22600


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

CHG: moving an enum to the parameter set

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

Legend:

Unmodified
Added
Removed

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

    r22599 r22600  
    8585        CalvingMinthicknessEnum,
    8686        ConfigurationTypeEnum,
     87        ConstantsReferencetemperatureEnum,
    8788        ConstantsYtsEnum,
    8889        DamageC1Enum,
    … …  
    641642        ColinearEnum,
    642643        ConstantsGEnum,
    643         ConstantsReferencetemperatureEnum,
    644644        ConstraintsEnum,
    645645        ContactEnum,

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

    r22599 r22600  
    9393                case CalvingMinthicknessEnum : return "CalvingMinthickness";
    9494                case ConfigurationTypeEnum : return "ConfigurationType";
     95                case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature";
    9596                case ConstantsYtsEnum : return "ConstantsYts";
    9697                case DamageC1Enum : return "DamageC1";
    … …  
    645646                case ColinearEnum : return "Colinear";
    646647                case ConstantsGEnum : return "ConstantsG";
    647                 case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature";
    648648                case ConstraintsEnum : return "Constraints";
    649649                case ContactEnum : return "Contact";

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

    r22599 r22600  
    9393              else if (strcmp(name,"CalvingMinthickness")==0) return CalvingMinthicknessEnum;
    9494              else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum;
     95              else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum;
    9596              else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum;
    9697              else if (strcmp(name,"DamageC1")==0) return DamageC1Enum;
    … …  
    136137              else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
    137138              else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
    138               else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
     142              if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum;
     143              else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
    143144              else if (strcmp(name,"HydrologydcSedimentlimitFlag")==0) return HydrologydcSedimentlimitFlagEnum;
    144145              else if (strcmp(name,"HydrologydcTransferFlag")==0) return HydrologydcTransferFlagEnum;
    … …  
    259260              else if (strcmp(name,"SmbASnow")==0) return SmbASnowEnum;
    260261              else if (strcmp(name,"SmbCldFrac")==0) return SmbCldFracEnum;
    261               else if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"SmbDelta18oSurface")==0) return SmbDelta18oSurfaceEnum;
     265              if (strcmp(name,"SmbDelta18o")==0) return SmbDelta18oEnum;
     266              else if (strcmp(name,"SmbDelta18oSurface")==0) return SmbDelta18oSurfaceEnum;
    266267              else if (strcmp(name,"SmbDenIdx")==0) return SmbDenIdxEnum;
    267268              else if (strcmp(name,"SmbDt")==0) return SmbDtEnum;
    … …  
    382383              else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
    383384              else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
    384               else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum;
     388              if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
     389              else if (strcmp(name,"CalvingStressThresholdFloatingice")==0) return CalvingStressThresholdFloatingiceEnum;
    389390              else if (strcmp(name,"CalvingStressThresholdGroundedice")==0) return CalvingStressThresholdGroundediceEnum;
    390391              else if (strcmp(name,"Converged")==0) return ConvergedEnum;
    … …  
    505506              else if (strcmp(name,"SmbD")==0) return SmbDEnum;
    506507              else if (strcmp(name,"SmbDini")==0) return SmbDiniEnum;
    507               else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
     511              if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
     512              else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
    512513              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
    513514              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
    … …  
    628629              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
    629630              else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
    630               else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
     634              if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
     635              else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
    635636              else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
    636637              else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
    … …  
    660661              else if (strcmp(name,"Colinear")==0) return ColinearEnum;
    661662              else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum;
    662               else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum;
    663663              else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
    664664              else if (strcmp(name,"Contact")==0) return ContactEnum;
Note: See TracChangeset for help on using the changeset viewer.