Changeset 17914


Ignore:
Timestamp:
05/01/14 18:00:42 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added some enums for tao and m1qn3

Location:
issm/trunk-jpl
Files:
8 added
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim

    r17851 r17914  
    412412syn keyword cType BoolInput
    413413syn keyword cType BoolParam
    414 syn keyword cType classes
    415414syn keyword cType Constraint
    416415syn keyword cType Constraints
    … …  
    418417syn keyword cType Contours
    419418syn keyword cType ControlInput
     419syn keyword cType DataSetParam
    420420syn keyword cType DatasetInput
    421 syn keyword cType DataSetParam
    422421syn keyword cType Definition
    423422syn keyword cType DependentObject
    … …  
    432431syn keyword cType ElementHook
    433432syn keyword cType ElementMatrix
     433syn keyword cType ElementVector
    434434syn keyword cType Elements
    435 syn keyword cType ElementVector
    436435syn keyword cType ExponentialVariogram
    437436syn keyword cType ExternalResult
    … …  
    440439syn keyword cType Friction
    441440syn keyword cType Gauss
    442 syn keyword cType GaussianVariogram
    443 syn keyword cType gaussobjects
    444441syn keyword cType GaussPenta
    445442syn keyword cType GaussSeg
    446443syn keyword cType GaussTetra
    447444syn keyword cType GaussTria
     445syn keyword cType GaussianVariogram
    448446syn keyword cType GenericExternalResult
    449447syn keyword cType GenericOption
    … …  
    459457syn keyword cType IntVecParam
    460458syn keyword cType IoModel
    461 syn keyword cType krigingobjects
    462459syn keyword cType Load
    463460syn keyword cType Loads
    … …  
    467464syn keyword cType Matice
    468465syn keyword cType Matpar
    469 syn keyword cType matrixobjects
    470466syn keyword cType MatrixParam
    471467syn keyword cType Misfit
    … …  
    476472syn keyword cType Observations
    477473syn keyword cType Option
     474syn keyword cType OptionUtilities
    478475syn keyword cType Options
    479 syn keyword cType OptionUtilities
    480476syn keyword cType Param
    481477syn keyword cType Parameters
    … …  
    489485syn keyword cType Quadtree
    490486syn keyword cType Results
     487syn keyword cType RiftStruct
    491488syn keyword cType Riftfront
    492 syn keyword cType RiftStruct
    493489syn keyword cType Seg
    494490syn keyword cType SegInput
     491syn keyword cType SegRef
    495492syn keyword cType Segment
    496 syn keyword cType SegRef
    497493syn keyword cType SpcDynamic
    498494syn keyword cType SpcStatic
    … …  
    514510syn keyword cType Vertex
    515511syn keyword cType Vertices
     512syn keyword cType classes
     513syn keyword cType gaussobjects
     514syn keyword cType krigingobjects
     515syn keyword cType matrixobjects
    516516syn keyword cType AdjointBalancethicknessAnalysis
    517517syn keyword cType AdjointHorizAnalysis
    … …  
    627627syn keyword cConstant HydrologyModelEnum
    628628syn keyword cConstant HydrologyshreveEnum
    629 syn keyword cConstant HydrologyshreveCREnum
    630 syn keyword cConstant HydrologyshreveKnEnum
    631 syn keyword cConstant HydrologyshreveNEnum
    632 syn keyword cConstant HydrologyshrevePEnum
    633 syn keyword cConstant HydrologyshreveQEnum
    634629syn keyword cConstant HydrologyshreveSpcwatercolumnEnum
    635630syn keyword cConstant HydrologyshreveStabilizationEnum
    … …  
    680675syn keyword cConstant InversionGradientScalingEnum
    681676syn keyword cConstant InversionIscontrolEnum
    682 syn keyword cConstant InversionTaoEnum
     677syn keyword cConstant InversionTypeEnum
    683678syn keyword cConstant InversionIncompleteAdjointEnum
    684679syn keyword cConstant InversionMaxParametersEnum
    685680syn keyword cConstant InversionMaxiterPerStepEnum
     681syn keyword cConstant InversionMaxiterEnum
     682syn keyword cConstant InversionMaxstepsEnum
     683syn keyword cConstant InversionFatolEnum
     684syn keyword cConstant InversionFgtolEnum
     685syn keyword cConstant InversionGatolEnum
     686syn keyword cConstant InversionGgtolEnum
     687syn keyword cConstant InversionGttolEnum
     688syn keyword cConstant InversionAlgorithmEnum
    686689syn keyword cConstant InversionMinParametersEnum
    687690syn keyword cConstant InversionNstepsEnum
     691syn keyword cConstant InversionDxminEnum
     692syn keyword cConstant InversionEpsrelEnum
    688693syn keyword cConstant InversionNumControlParametersEnum
    689694syn keyword cConstant InversionNumCostFunctionsEnum
    … …  
    739744syn keyword cConstant MaterialsMantleDensityEnum
    740745syn keyword cConstant MeshAverageVertexConnectivityEnum
    741 syn keyword cConstant MeshElementonbaseEnum
    742 syn keyword cConstant MeshElementonsurfaceEnum
    743746syn keyword cConstant MeshElements2dEnum
    744747syn keyword cConstant MeshElementsEnum

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

    r17910 r17914  
    139139        InversionMaxParametersEnum,
    140140        InversionMaxiterPerStepEnum,
     141        InversionMaxiterEnum,
     142        InversionMaxstepsEnum,
     143        InversionFatolEnum,
     144        InversionFgtolEnum,
     145        InversionGatolEnum,
     146        InversionGgtolEnum,
     147        InversionGttolEnum,
     148        InversionAlgorithmEnum,
    141149        InversionMinParametersEnum,
    142150        InversionNstepsEnum,

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

    r17910 r17914  
    147147                case InversionMaxParametersEnum : return "InversionMaxParameters";
    148148                case InversionMaxiterPerStepEnum : return "InversionMaxiterPerStep";
     149                case InversionMaxiterEnum : return "InversionMaxiter";
     150                case InversionMaxstepsEnum : return "InversionMaxsteps";
     151                case InversionFatolEnum : return "InversionFatol";
     152                case InversionFgtolEnum : return "InversionFgtol";
     153                case InversionGatolEnum : return "InversionGatol";
     154                case InversionGgtolEnum : return "InversionGgtol";
     155                case InversionGttolEnum : return "InversionGttol";
     156                case InversionAlgorithmEnum : return "InversionAlgorithm";
    149157                case InversionMinParametersEnum : return "InversionMinParameters";
    150158                case InversionNstepsEnum : return "InversionNsteps";

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

    r17910 r17914  
    150150              else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
    151151              else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
     152              else if (strcmp(name,"InversionMaxiter")==0) return InversionMaxiterEnum;
     153              else if (strcmp(name,"InversionMaxsteps")==0) return InversionMaxstepsEnum;
     154              else if (strcmp(name,"InversionFatol")==0) return InversionFatolEnum;
     155              else if (strcmp(name,"InversionFgtol")==0) return InversionFgtolEnum;
     156              else if (strcmp(name,"InversionGatol")==0) return InversionGatolEnum;
     157              else if (strcmp(name,"InversionGgtol")==0) return InversionGgtolEnum;
     158              else if (strcmp(name,"InversionGttol")==0) return InversionGttolEnum;
     159              else if (strcmp(name,"InversionAlgorithm")==0) return InversionAlgorithmEnum;
    152160              else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
    153161              else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
    … …  
    252260              else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
    253261              else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum;
    254               else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
     262         else stage=3;
     263   }
     264   if(stage==3){
     265              if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
    255266              else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
    256267              else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
    … …  
    260271              else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;
    261272              else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
    262          else stage=3;
    263    }
    264    if(stage==3){
    265               if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
     273              else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
    266274              else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
    267275              else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
    … …  
    375383              else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
    376384              else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
    377               else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
     385         else stage=4;
     386   }
     387   if(stage==4){
     388              if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
    378389              else if (strcmp(name,"MeshdeformationSolution")==0) return MeshdeformationSolutionEnum;
    379390              else if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
    … …  
    383394              else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
    384395              else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
    385          else stage=4;
    386    }
    387    if(stage==4){
    388               if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
     396              else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
    389397              else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
    390398              else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
    … …  
    498506              else if (strcmp(name,"QmuVyMesh")==0) return QmuVyMeshEnum;
    499507              else if (strcmp(name,"QmuVzMesh")==0) return QmuVzMeshEnum;
    500               else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
     508         else stage=5;
     509   }
     510   if(stage==5){
     511              if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
    501512              else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
    502513              else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
    … …  
    506517              else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
    507518              else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
    508          else stage=5;
    509    }
    510    if(stage==5){
    511               if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
     519              else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
    512520              else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
    513521              else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
    … …  
    621629              else if (strcmp(name,"MinVy")==0) return MinVyEnum;
    622630              else if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
    623               else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum;
     631         else stage=6;
     632   }
     633   if(stage==6){
     634              if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum;
    624635              else if (strcmp(name,"MinVz")==0) return MinVzEnum;
    625636              else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
    … …  
    629640              else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
    630641              else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
    631          else stage=6;
    632    }
    633    if(stage==6){
    634               if (strcmp(name,"Incremental")==0) return IncrementalEnum;
     642              else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
    635643              else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
    636644              else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;

  • issm/trunk-jpl/src/m/enum/EnumDefinitions.py

    r17910 r17914  
    139139def InversionMaxParametersEnum(): return StringToEnum("InversionMaxParameters")[0]
    140140def InversionMaxiterPerStepEnum(): return StringToEnum("InversionMaxiterPerStep")[0]
     141def InversionMaxiterEnum(): return StringToEnum("InversionMaxiter")[0]
     142def InversionMaxstepsEnum(): return StringToEnum("InversionMaxsteps")[0]
     143def InversionFatolEnum(): return StringToEnum("InversionFatol")[0]
     144def InversionFgtolEnum(): return StringToEnum("InversionFgtol")[0]
     145def InversionGatolEnum(): return StringToEnum("InversionGatol")[0]
     146def InversionGgtolEnum(): return StringToEnum("InversionGgtol")[0]
     147def InversionGttolEnum(): return StringToEnum("InversionGttol")[0]
     148def InversionAlgorithmEnum(): return StringToEnum("InversionAlgorithm")[0]
    141149def InversionMinParametersEnum(): return StringToEnum("InversionMinParameters")[0]
    142150def InversionNstepsEnum(): return StringToEnum("InversionNsteps")[0]
Note: See TracChangeset for help on using the changeset viewer.