Changeset 8934


Ignore:
Timestamp:
07/12/11 17:29:30 (14 years ago)
Author:
Mathieu Morlighem
Message:

ReAdded old enums

Location:
issm/trunk/src
Files:
26 added
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r8926 r8934  
    189189        ControlTypeEnum,
    190190        ConvergedEnum,
     191        DhDtEnum,  //TO BE DELETED
    191192        DragCoefficientEnum,
    192193        DragPEnum,
    … …  
    200201        ElementOnSurfaceEnum,
    201202        ElementOnWaterEnum,
     203        EpsVelEnum,  //TO BE DELETED
    202204        FillEnum,
    203205        FractionIncrementEnum,
    204206        FrictionEnum,
     207        GeothermalFluxEnum, //TO BE DELETED
    205208        HydrostaticAdjustmentEnum,
    206209        InternalEnum,
    … …  
    216219        SurfaceAverageVelMisfitEnum,
    217220        MaxPenetrationEnum,
     221        MeanVelEnum, //TO BE DELETED
    218222        MeltingOffsetEnum,
    219223        GroundingLineMeltingRateEnum,
    … …  
    238242        ShelfDampeningEnum,
    239243        StabilizeConstraintsEnum,
     244        StokesReconditioningEnum,  //TO BE DELETED
    240245        SurfaceAccumulationRateEnum,
    241246        SurfaceAblationRateEnum,
    … …  
    299304        TimeEnum,
    300305        OutputFrequencyEnum,
     306        WaterColumnEnum, //TO BE DELETED
    301307        WaterColumnOldEnum,
    302308        WaterColumnPicardEnum,
    … …  
    333339        RhoWaterEnum,
    334340        GravityEnum,
     341        ThermalConductivityEnum, //TO BE DELETED
    335342        BasalMeltingRateCorrectionEnum,
    336343        BasalMeltingRateCorrectionApplyEnum,
    … …  
    364371        EpsRelEnum,
    365372        EpsResEnum,
     373        HeatCapacityEnum,   //TO BE DELETED
     374        IsHutterEnum, //TO BE DELETED
     375        IsMacAyealPattynEnum, //TO BE DELETED
     376        IsStokesEnum, //TO BE DELETED
     377        KffEnum, //TO BE DELETED
     378        LatentHeatEnum, //TO BE DELETED
    366379        LowmemEnum,
     380        MaxIterEnum, //TO BE DELETED
    367381        MaxNonlinearIterationsEnum,
     382        MeltingPointEnum, //TO BE DELETED
    368383        MinMechanicalConstraintsEnum,
    369384        MinThermalConstraintsEnum,
     385        NStepsEnum, //TO BE DELETED
    370386        NdtEnum,
    371387        NumOutputEnum,
    … …  
    374390        NumberOfNodesEnum,
    375391        NumberOfVerticesEnum,
     392        OptScalEnum, //TO BE DELETED
    376393        OutputFilePointerEnum,
     394        OutputFileNameEnum, //TO BE DELETED
     395        ParameterOutputEnum, //TO BE DELETED
    377396        PenaltyMeltingEnum,
    378397        QmuAnalysisEnum,
    … …  
    393412        PetscRcEnum,
    394413        SparsityEnum,
     414        TolXEnum, //TO BE DELETED
    395415        VariableDescriptorsEnum,
    396416        VerboseEnum,
     417        WaitOnLockEnum, //TO BE DELETED
    397418        PetscOptionsStringsEnum,
    398419        PetscOptionsAnalysesEnum,
    … …  
    421442        ArrheniusEnum,
    422443        /*}}}*/
    423         /*Temporary{{{1*/
     444        VxMeshEnum,
     445        VyMeshEnum,
     446        VzMeshEnum,
     447        IsDiagnosticEnum, //TO BE DELETED
     448        IsPrognosticEnum, //TO BE DELETED
     449        IsThermalEnum, //TO BE DELETED
     450        EnthalpySolutionEnum,
     451        EnthalpyAnalysisEnum,
     452        EnthalpyEnum,
     453        EnthalpyPicardEnum,
     454        WaterFractionEnum, //TO BE DELETED
     455        ReferenceTemperatureEnum, //TO BE DELETED
     456        ThicknessAbsGradientEnum,
     457        VelAbsGradientEnum,
     458        DatasetInputEnum,
     459        NumResponsesEnum,
     460        StepResponsesEnum,
     461        IntMatParamEnum,
     462        RheologyBbarAbsGradientEnum,
     463        DragCoefficientAbsGradientEnum,
     464        TransientInputEnum,
     465        /*Temporary*/
    424466        NumberOfElements2DEnum,
    425467        NumControlTypeEnum,
    … …  
    499541        NumresponsedescriptorsEnum,
    500542        NpartEnum,
    501         QmuMassFluxNumProfilesEnum,
    502         /*}}}*/
    503         VxMeshEnum,
    504         VyMeshEnum,
    505         VzMeshEnum,
    506         EnthalpySolutionEnum,
    507         EnthalpyAnalysisEnum,
    508         EnthalpyEnum,
    509         EnthalpyPicardEnum,
    510         ThicknessAbsGradientEnum,
    511         VelAbsGradientEnum,
    512         DatasetInputEnum,
    513         NumResponsesEnum,
    514         StepResponsesEnum,
    515         IntMatParamEnum,
    516         RheologyBbarAbsGradientEnum,
    517         DragCoefficientAbsGradientEnum,
    518         TransientInputEnum
     543        QmuMassFluxNumProfilesEnum
    519544};
    520545

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

    r8926 r8934  
    157157                case ControlTypeEnum : return "ControlType";
    158158                case ConvergedEnum : return "Converged";
     159                case DhDtEnum : return "DhDt";
    159160                case DragCoefficientEnum : return "DragCoefficient";
    160161                case DragPEnum : return "DragP";
    … …  
    168169                case ElementOnSurfaceEnum : return "ElementOnSurface";
    169170                case ElementOnWaterEnum : return "ElementOnWater";
     171                case EpsVelEnum : return "EpsVel";
    170172                case FillEnum : return "Fill";
    171173                case FractionIncrementEnum : return "FractionIncrement";
    172174                case FrictionEnum : return "Friction";
     175                case GeothermalFluxEnum : return "GeothermalFlux";
    173176                case HydrostaticAdjustmentEnum : return "HydrostaticAdjustment";
    174177                case InternalEnum : return "Internal";
    … …  
    184187                case SurfaceAverageVelMisfitEnum : return "SurfaceAverageVelMisfit";
    185188                case MaxPenetrationEnum : return "MaxPenetration";
     189                case MeanVelEnum : return "MeanVel";
    186190                case MeltingOffsetEnum : return "MeltingOffset";
    187191                case GroundingLineMeltingRateEnum : return "GroundingLineMeltingRate";
    … …  
    206210                case ShelfDampeningEnum : return "ShelfDampening";
    207211                case StabilizeConstraintsEnum : return "StabilizeConstraints";
     212                case StokesReconditioningEnum : return "StokesReconditioning";
    208213                case SurfaceAccumulationRateEnum : return "SurfaceAccumulationRate";
    209214                case SurfaceAblationRateEnum : return "SurfaceAblationRate";
    … …  
    263268                case TimeEnum : return "Time";
    264269                case OutputFrequencyEnum : return "OutputFrequency";
     270                case WaterColumnEnum : return "WaterColumn";
    265271                case WaterColumnOldEnum : return "WaterColumnOld";
    266272                case WaterColumnPicardEnum : return "WaterColumnPicard";
    … …  
    287293                case RhoWaterEnum : return "RhoWater";
    288294                case GravityEnum : return "Gravity";
     295                case ThermalConductivityEnum : return "ThermalConductivity";
    289296                case BasalMeltingRateCorrectionEnum : return "BasalMeltingRateCorrection";
    290297                case BasalMeltingRateCorrectionApplyEnum : return "BasalMeltingRateCorrectionApply";
    … …  
    314321                case EpsRelEnum : return "EpsRel";
    315322                case EpsResEnum : return "EpsRes";
     323                case HeatCapacityEnum : return "HeatCapacity";
     324                case IsHutterEnum : return "IsHutter";
     325                case IsMacAyealPattynEnum : return "IsMacAyealPattyn";
     326                case IsStokesEnum : return "IsStokes";
     327                case KffEnum : return "Kff";
     328                case LatentHeatEnum : return "LatentHeat";
    316329                case LowmemEnum : return "Lowmem";
     330                case MaxIterEnum : return "MaxIter";
    317331                case MaxNonlinearIterationsEnum : return "MaxNonlinearIterations";
     332                case MeltingPointEnum : return "MeltingPoint";
    318333                case MinMechanicalConstraintsEnum : return "MinMechanicalConstraints";
    319334                case MinThermalConstraintsEnum : return "MinThermalConstraints";
     335                case NStepsEnum : return "NSteps";
    320336                case NdtEnum : return "Ndt";
    321337                case NumOutputEnum : return "NumOutput";
    … …  
    324340                case NumberOfNodesEnum : return "NumberOfNodes";
    325341                case NumberOfVerticesEnum : return "NumberOfVertices";
     342                case OptScalEnum : return "OptScal";
    326343                case OutputFilePointerEnum : return "OutputFilePointer";
     344                case OutputFileNameEnum : return "OutputFileName";
     345                case ParameterOutputEnum : return "ParameterOutput";
    327346                case PenaltyMeltingEnum : return "PenaltyMelting";
    328347                case QmuAnalysisEnum : return "QmuAnalysis";
    … …  
    343362                case PetscRcEnum : return "PetscRc";
    344363                case SparsityEnum : return "Sparsity";
     364                case TolXEnum : return "TolX";
    345365                case VariableDescriptorsEnum : return "VariableDescriptors";
    346366                case VerboseEnum : return "Verbose";
     367                case WaitOnLockEnum : return "WaitOnLock";
    347368                case PetscOptionsStringsEnum : return "PetscOptionsStrings";
    348369                case PetscOptionsAnalysesEnum : return "PetscOptionsAnalyses";
    … …  
    364385                case PatersonEnum : return "Paterson";
    365386                case ArrheniusEnum : return "Arrhenius";
     387                case VxMeshEnum : return "VxMesh";
     388                case VyMeshEnum : return "VyMesh";
     389                case VzMeshEnum : return "VzMesh";
     390                case IsDiagnosticEnum : return "IsDiagnostic";
     391                case IsPrognosticEnum : return "IsPrognostic";
     392                case IsThermalEnum : return "IsThermal";
     393                case EnthalpySolutionEnum : return "EnthalpySolution";
     394                case EnthalpyAnalysisEnum : return "EnthalpyAnalysis";
     395                case EnthalpyEnum : return "Enthalpy";
     396                case EnthalpyPicardEnum : return "EnthalpyPicard";
     397                case WaterFractionEnum : return "WaterFraction";
     398                case ReferenceTemperatureEnum : return "ReferenceTemperature";
     399                case ThicknessAbsGradientEnum : return "ThicknessAbsGradient";
     400                case VelAbsGradientEnum : return "VelAbsGradient";
     401                case DatasetInputEnum : return "DatasetInput";
     402                case NumResponsesEnum : return "NumResponses";
     403                case StepResponsesEnum : return "StepResponses";
     404                case IntMatParamEnum : return "IntMatParam";
     405                case RheologyBbarAbsGradientEnum : return "RheologyBbarAbsGradient";
     406                case DragCoefficientAbsGradientEnum : return "DragCoefficientAbsGradient";
     407                case TransientInputEnum : return "TransientInput";
    366408                case NumberOfElements2DEnum : return "NumberOfElements2D";
    367409                case NumControlTypeEnum : return "NumControlType";
    … …  
    441483                case NpartEnum : return "Npart";
    442484                case QmuMassFluxNumProfilesEnum : return "QmuMassFluxNumProfiles";
    443                 case VxMeshEnum : return "VxMesh";
    444                 case VyMeshEnum : return "VyMesh";
    445                 case VzMeshEnum : return "VzMesh";
    446                 case EnthalpySolutionEnum : return "EnthalpySolution";
    447                 case EnthalpyAnalysisEnum : return "EnthalpyAnalysis";
    448                 case EnthalpyEnum : return "Enthalpy";
    449                 case EnthalpyPicardEnum : return "EnthalpyPicard";
    450                 case ThicknessAbsGradientEnum : return "ThicknessAbsGradient";
    451                 case VelAbsGradientEnum : return "VelAbsGradient";
    452                 case DatasetInputEnum : return "DatasetInput";
    453                 case NumResponsesEnum : return "NumResponses";
    454                 case StepResponsesEnum : return "StepResponses";
    455                 case IntMatParamEnum : return "IntMatParam";
    456                 case RheologyBbarAbsGradientEnum : return "RheologyBbarAbsGradient";
    457                 case DragCoefficientAbsGradientEnum : return "DragCoefficientAbsGradient";
    458                 case TransientInputEnum : return "TransientInput";
    459485                default : return "unknown";
    460486

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

    r8926 r8934  
    155155        else if (strcmp(name,"ControlType")==0) return ControlTypeEnum;
    156156        else if (strcmp(name,"Converged")==0) return ConvergedEnum;
     157        else if (strcmp(name,"DhDt")==0) return DhDtEnum;
    157158        else if (strcmp(name,"DragCoefficient")==0) return DragCoefficientEnum;
    158159        else if (strcmp(name,"DragP")==0) return DragPEnum;
    … …  
    166167        else if (strcmp(name,"ElementOnSurface")==0) return ElementOnSurfaceEnum;
    167168        else if (strcmp(name,"ElementOnWater")==0) return ElementOnWaterEnum;
     169        else if (strcmp(name,"EpsVel")==0) return EpsVelEnum;
    168170        else if (strcmp(name,"Fill")==0) return FillEnum;
    169171        else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
    170172        else if (strcmp(name,"Friction")==0) return FrictionEnum;
     173        else if (strcmp(name,"GeothermalFlux")==0) return GeothermalFluxEnum;
    171174        else if (strcmp(name,"HydrostaticAdjustment")==0) return HydrostaticAdjustmentEnum;
    172175        else if (strcmp(name,"Internal")==0) return InternalEnum;
    … …  
    182185        else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
    183186        else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;
     187        else if (strcmp(name,"MeanVel")==0) return MeanVelEnum;
    184188        else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
    185189        else if (strcmp(name,"GroundingLineMeltingRate")==0) return GroundingLineMeltingRateEnum;
    … …  
    204208        else if (strcmp(name,"ShelfDampening")==0) return ShelfDampeningEnum;
    205209        else if (strcmp(name,"StabilizeConstraints")==0) return StabilizeConstraintsEnum;
     210        else if (strcmp(name,"StokesReconditioning")==0) return StokesReconditioningEnum;
    206211        else if (strcmp(name,"SurfaceAccumulationRate")==0) return SurfaceAccumulationRateEnum;
    207212        else if (strcmp(name,"SurfaceAblationRate")==0) return SurfaceAblationRateEnum;
    … …  
    261266        else if (strcmp(name,"Time")==0) return TimeEnum;
    262267        else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum;
     268        else if (strcmp(name,"WaterColumn")==0) return WaterColumnEnum;
    263269        else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
    264270        else if (strcmp(name,"WaterColumnPicard")==0) return WaterColumnPicardEnum;
    … …  
    285291        else if (strcmp(name,"RhoWater")==0) return RhoWaterEnum;
    286292        else if (strcmp(name,"Gravity")==0) return GravityEnum;
     293        else if (strcmp(name,"ThermalConductivity")==0) return ThermalConductivityEnum;
    287294        else if (strcmp(name,"BasalMeltingRateCorrection")==0) return BasalMeltingRateCorrectionEnum;
    288295        else if (strcmp(name,"BasalMeltingRateCorrectionApply")==0) return BasalMeltingRateCorrectionApplyEnum;
    … …  
    312319        else if (strcmp(name,"EpsRel")==0) return EpsRelEnum;
    313320        else if (strcmp(name,"EpsRes")==0) return EpsResEnum;
     321        else if (strcmp(name,"HeatCapacity")==0) return HeatCapacityEnum;
     322        else if (strcmp(name,"IsHutter")==0) return IsHutterEnum;
     323        else if (strcmp(name,"IsMacAyealPattyn")==0) return IsMacAyealPattynEnum;
     324        else if (strcmp(name,"IsStokes")==0) return IsStokesEnum;
     325        else if (strcmp(name,"Kff")==0) return KffEnum;
     326        else if (strcmp(name,"LatentHeat")==0) return LatentHeatEnum;
    314327        else if (strcmp(name,"Lowmem")==0) return LowmemEnum;
     328        else if (strcmp(name,"MaxIter")==0) return MaxIterEnum;
    315329        else if (strcmp(name,"MaxNonlinearIterations")==0) return MaxNonlinearIterationsEnum;
     330        else if (strcmp(name,"MeltingPoint")==0) return MeltingPointEnum;
    316331        else if (strcmp(name,"MinMechanicalConstraints")==0) return MinMechanicalConstraintsEnum;
    317332        else if (strcmp(name,"MinThermalConstraints")==0) return MinThermalConstraintsEnum;
     333        else if (strcmp(name,"NSteps")==0) return NStepsEnum;
    318334        else if (strcmp(name,"Ndt")==0) return NdtEnum;
    319335        else if (strcmp(name,"NumOutput")==0) return NumOutputEnum;
    … …  
    322338        else if (strcmp(name,"NumberOfNodes")==0) return NumberOfNodesEnum;
    323339        else if (strcmp(name,"NumberOfVertices")==0) return NumberOfVerticesEnum;
     340        else if (strcmp(name,"OptScal")==0) return OptScalEnum;
    324341        else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
     342        else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
     343        else if (strcmp(name,"ParameterOutput")==0) return ParameterOutputEnum;
    325344        else if (strcmp(name,"PenaltyMelting")==0) return PenaltyMeltingEnum;
    326345        else if (strcmp(name,"QmuAnalysis")==0) return QmuAnalysisEnum;
    … …  
    341360        else if (strcmp(name,"PetscRc")==0) return PetscRcEnum;
    342361        else if (strcmp(name,"Sparsity")==0) return SparsityEnum;
     362        else if (strcmp(name,"TolX")==0) return TolXEnum;
    343363        else if (strcmp(name,"VariableDescriptors")==0) return VariableDescriptorsEnum;
    344364        else if (strcmp(name,"Verbose")==0) return VerboseEnum;
     365        else if (strcmp(name,"WaitOnLock")==0) return WaitOnLockEnum;
    345366        else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum;
    346367        else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum;
    … …  
    362383        else if (strcmp(name,"Paterson")==0) return PatersonEnum;
    363384        else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
     385        else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
     386        else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
     387        else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
     388        else if (strcmp(name,"IsDiagnostic")==0) return IsDiagnosticEnum;
     389        else if (strcmp(name,"IsPrognostic")==0) return IsPrognosticEnum;
     390        else if (strcmp(name,"IsThermal")==0) return IsThermalEnum;
     391        else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum;
     392        else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
     393        else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
     394        else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
     395        else if (strcmp(name,"WaterFraction")==0) return WaterFractionEnum;
     396        else if (strcmp(name,"ReferenceTemperature")==0) return ReferenceTemperatureEnum;
     397        else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
     398        else if (strcmp(name,"VelAbsGradient")==0) return VelAbsGradientEnum;
     399        else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
     400        else if (strcmp(name,"NumResponses")==0) return NumResponsesEnum;
     401        else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
     402        else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
     403        else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
     404        else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
     405        else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
    364406        else if (strcmp(name,"NumberOfElements2D")==0) return NumberOfElements2DEnum;
    365407        else if (strcmp(name,"NumControlType")==0) return NumControlTypeEnum;
    … …  
    439481        else if (strcmp(name,"Npart")==0) return NpartEnum;
    440482        else if (strcmp(name,"QmuMassFluxNumProfiles")==0) return QmuMassFluxNumProfilesEnum;
    441         else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
    442         else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
    443         else if (strcmp(name,"VzMesh")==0) return VzMeshEnum;
    444         else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum;
    445         else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
    446         else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum;
    447         else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum;
    448         else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum;
    449         else if (strcmp(name,"VelAbsGradient")==0) return VelAbsGradientEnum;
    450         else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
    451         else if (strcmp(name,"NumResponses")==0) return NumResponsesEnum;
    452         else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
    453         else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
    454         else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
    455         else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
    456         else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
    457483        else _error_("Enum %s not found",name);
    458484
Note: See TracChangeset for help on using the changeset viewer.