Changeset 13430


Ignore:
Timestamp:
09/24/12 22:25:24 (12 years ago)
Author:
Eric.Larour
Message:

NEW: new enums for dependent and independent objects

Location:
issm/trunk-jpl/src/c/modules
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

    r13349 r13430  
    1818
    1919                case AutodiffIsautodiffEnum : return "AutodiffIsautodiff";
    20                 case AutodiffDependentsEnum : return "AutodiffDependents";
    2120                case AutodiffNumDependentsEnum : return "AutodiffNumDependents";
    22                 case AutodiffIndependentsEnum : return "AutodiffIndependents";
     21                case AutodiffNumDependentObjectsEnum : return "AutodiffNumDependentObjects";
     22                case AutodiffDependentObjectNamesEnum : return "AutodiffDependentObjectNames";
     23                case AutodiffDependentObjectTypesEnum : return "AutodiffDependentObjectTypes";
     24                case AutodiffDependentObjectsEnum : return "AutodiffDependentObjects";
    2325                case AutodiffNumIndependentsEnum : return "AutodiffNumIndependents";
     26                case AutodiffNumIndependentObjectsEnum : return "AutodiffNumIndependentObjects";
     27                case AutodiffIndependentObjectNamesEnum : return "AutodiffIndependentObjectNames";
     28                case AutodiffIndependentObjectTypesEnum : return "AutodiffIndependentObjectTypes";
     29                case AutodiffIndependentObjectsEnum : return "AutodiffIndependentObjects";
    2430                case AutodiffJacobianEnum : return "AutodiffJacobian";
    2531                case AutodiffXpEnum : return "AutodiffXp";
    26                 case AutodiffFosForwardOutputEnum : return "AutodiffFosForwardOutput";
     32                case AutodiffDriverEnum : return "AutodiffDriver";
     33                case AutodiffFosForwardIndexEnum : return "AutodiffFosForwardIndex";
    2734                case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";
    2835                case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";
    … …  
    3643                case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature";
    3744                case ConstantsYtsEnum : return "ConstantsYts";
     45                case DependentObjectEnum : return "DependentObject";
    3846                case DiagnosticAbstolEnum : return "DiagnosticAbstol";
    3947                case DiagnosticIcefrontEnum : return "DiagnosticIcefront";
    … …  
    7583                case HydrologySpcwatercolumnEnum : return "HydrologySpcwatercolumn";
    7684                case HydrologyStabilizationEnum : return "HydrologyStabilization";
     85                case IndependentObjectEnum : return "IndependentObject";
    7786                case InversionControlParametersEnum : return "InversionControlParameters";
    7887                case InversionCostFunctionEnum : return "InversionCostFunction";
    … …  
    270279                case DofIndexingEnum : return "DofIndexing";
    271280                case DoubleInputEnum : return "DoubleInput";
     281                case DataSetParamEnum : return "DataSetParam";
    272282                case DoubleMatArrayParamEnum : return "DoubleMatArrayParam";
    273283                case DoubleMatParamEnum : return "DoubleMatParam";

  • issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

    r13349 r13430  
    1919   if(stage==1){
    2020              if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum;
    21               else if (strcmp(name,"AutodiffDependents")==0) return AutodiffDependentsEnum;
    2221              else if (strcmp(name,"AutodiffNumDependents")==0) return AutodiffNumDependentsEnum;
    23               else if (strcmp(name,"AutodiffIndependents")==0) return AutodiffIndependentsEnum;
     22              else if (strcmp(name,"AutodiffNumDependentObjects")==0) return AutodiffNumDependentObjectsEnum;
     23              else if (strcmp(name,"AutodiffDependentObjectNames")==0) return AutodiffDependentObjectNamesEnum;
     24              else if (strcmp(name,"AutodiffDependentObjectTypes")==0) return AutodiffDependentObjectTypesEnum;
     25              else if (strcmp(name,"AutodiffDependentObjects")==0) return AutodiffDependentObjectsEnum;
    2426              else if (strcmp(name,"AutodiffNumIndependents")==0) return AutodiffNumIndependentsEnum;
     27              else if (strcmp(name,"AutodiffNumIndependentObjects")==0) return AutodiffNumIndependentObjectsEnum;
     28              else if (strcmp(name,"AutodiffIndependentObjectNames")==0) return AutodiffIndependentObjectNamesEnum;
     29              else if (strcmp(name,"AutodiffIndependentObjectTypes")==0) return AutodiffIndependentObjectTypesEnum;
     30              else if (strcmp(name,"AutodiffIndependentObjects")==0) return AutodiffIndependentObjectsEnum;
    2531              else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
    2632              else if (strcmp(name,"AutodiffXp")==0) return AutodiffXpEnum;
    27               else if (strcmp(name,"AutodiffFosForwardOutput")==0) return AutodiffFosForwardOutputEnum;
     33              else if (strcmp(name,"AutodiffDriver")==0) return AutodiffDriverEnum;
     34              else if (strcmp(name,"AutodiffFosForwardIndex")==0) return AutodiffFosForwardIndexEnum;
    2835              else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
    2936              else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
    … …  
    3744              else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum;
    3845              else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum;
     46              else if (strcmp(name,"DependentObject")==0) return DependentObjectEnum;
    3947              else if (strcmp(name,"DiagnosticAbstol")==0) return DiagnosticAbstolEnum;
    4048              else if (strcmp(name,"DiagnosticIcefront")==0) return DiagnosticIcefrontEnum;
    … …  
    7684              else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum;
    7785              else if (strcmp(name,"HydrologyStabilization")==0) return HydrologyStabilizationEnum;
     86              else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
    7887              else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
    7988              else if (strcmp(name,"InversionCostFunction")==0) return InversionCostFunctionEnum;
    … …  
    129138              else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum;
    130139              else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
    131               else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum;
     140         else stage=2;
     141   }
     142   if(stage==2){
     143              if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum;
    132144              else if (strcmp(name,"MeshNumberofedges")==0) return MeshNumberofedgesEnum;
    133145              else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum;
    … …  
    138150              else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum;
    139151              else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum;
    140          else stage=2;
    141    }
    142    if(stage==2){
    143               if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
     152              else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
    144153              else if (strcmp(name,"MeshX")==0) return MeshXEnum;
    145154              else if (strcmp(name,"MeshY")==0) return MeshYEnum;
    … …  
    252261              else if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum;
    253262              else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum;
    254               else if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum;
     263         else stage=3;
     264   }
     265   if(stage==3){
     266              if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum;
    255267              else if (strcmp(name,"MacAyealStokesApproximation")==0) return MacAyealStokesApproximationEnum;
    256268              else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
    … …  
    261273              else if (strcmp(name,"Loads")==0) return LoadsEnum;
    262274              else if (strcmp(name,"Materials")==0) return MaterialsEnum;
    263          else stage=3;
    264    }
    265    if(stage==3){
    266               if (strcmp(name,"Nodes")==0) return NodesEnum;
     275              else if (strcmp(name,"Nodes")==0) return NodesEnum;
    267276              else if (strcmp(name,"Parameters")==0) return ParametersEnum;
    268277              else if (strcmp(name,"Vertices")==0) return VerticesEnum;
    … …  
    277286              else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum;
    278287              else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum;
     288              else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum;
    279289              else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
    280290              else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
    … …  
    374384              else if (strcmp(name,"TemperatureBasal")==0) return TemperatureBasalEnum;
    375385              else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
    376               else if (strcmp(name,"Type")==0) return TypeEnum;
     386         else stage=4;
     387   }
     388   if(stage==4){
     389              if (strcmp(name,"Type")==0) return TypeEnum;
    377390              else if (strcmp(name,"Vel")==0) return VelEnum;
    378391              else if (strcmp(name,"Velocity")==0) return VelocityEnum;
    … …  
    384397              else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
    385398              else if (strcmp(name,"Vz")==0) return VzEnum;
    386          else stage=4;
    387    }
    388    if(stage==4){
    389               if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
     399              else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
    390400              else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
    391401              else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
    … …  
    497507              else if (strcmp(name,"OptionChar")==0) return OptionCharEnum;
    498508              else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
    499               else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum;
     509         else stage=5;
     510   }
     511   if(stage==5){
     512              if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum;
    500513              else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum;
    501514              else if (strcmp(name,"Paterson")==0) return PatersonEnum;
    502515              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
    503          else stage=5;
     516         else stage=6;
    504517   }
    505518        /*If we reach this point, the string provided has not been found*/
Note: See TracChangeset for help on using the changeset viewer.