Changeset 16851


Ignore:
Timestamp:
11/21/13 11:26:05 (11 years ago)
Author:
bdef
Message:

CHG: Adding an element active mask for the EPL

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

Legend:

Unmodified
Added
Removed

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

    r16848 r16851  
    110110        HydrologydcWaterCompressibilityEnum,
    111111        HydrologydcSpceplHeadEnum,
    112         HydrologydcMaskEplactiveEnum,
     112        HydrologydcMaskEplactiveNodeEnum,
     113        HydrologydcMaskEplactiveEltEnum,
    113114        HydrologydcEplCompressibilityEnum,
    114115        HydrologydcEplPorosityEnum,

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

    r16848 r16851  
    118118                case HydrologydcWaterCompressibilityEnum : return "HydrologydcWaterCompressibility";
    119119                case HydrologydcSpceplHeadEnum : return "HydrologydcSpceplHead";
    120                 case HydrologydcMaskEplactiveEnum : return "HydrologydcMaskEplactive";
     120                case HydrologydcMaskEplactiveNodeEnum : return "HydrologydcMaskEplactiveNode";
     121                case HydrologydcMaskEplactiveEltEnum : return "HydrologydcMaskEplactiveElt";
    121122                case HydrologydcEplCompressibilityEnum : return "HydrologydcEplCompressibility";
    122123                case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity";

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

    r16848 r16851  
    118118              else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum;
    119119              else if (strcmp(name,"HydrologydcSpceplHead")==0) return HydrologydcSpceplHeadEnum;
    120               else if (strcmp(name,"HydrologydcMaskEplactive")==0) return HydrologydcMaskEplactiveEnum;
     120              else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
     121              else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
    121122              else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum;
    122123              else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum;
    … …  
    136137              else if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum;
    137138              else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum;
    138               else if (strcmp(name,"WaterTransfer")==0) return WaterTransferEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
     142              if (strcmp(name,"WaterTransfer")==0) return WaterTransferEnum;
     143              else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
    143144              else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
    144145              else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum;
    … …  
    259260              else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
    260261              else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
    261               else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
     265              if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
     266              else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
    266267              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
    267268              else if (strcmp(name,"Surface")==0) return SurfaceEnum;
    … …  
    382383              else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum;
    383384              else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum;
    384               else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
     388              if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum;
     389              else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum;
    389390              else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum;
    390391              else if (strcmp(name,"Element")==0) return ElementEnum;
    … …  
    505506              else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
    506507              else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
    507               else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
     511              if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
     512              else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
    512513              else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
    513514              else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
    … …  
    628629              else if (strcmp(name,"Mumps")==0) return MumpsEnum;
    629630              else if (strcmp(name,"Gsl")==0) return GslEnum;
    630               else if (strcmp(name,"Option")==0) return OptionEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
     634              if (strcmp(name,"Option")==0) return OptionEnum;
     635              else if (strcmp(name,"GenericOption")==0) return GenericOptionEnum;
    635636              else if (strcmp(name,"OptionCell")==0) return OptionCellEnum;
    636637              else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum;
Note: See TracChangeset for help on using the changeset viewer.