CHG: adding Enum

Author: MathieuMorlighem

src/c/shared/Enum/Enum.vim

@@ -3369,6 +3369,7 @@ syn keyword cConstant AmrBamgEnum
 syn keyword cConstant AmrNeopzEnum
 syn keyword cConstant ArrheniusEnum
 syn keyword cConstant AutodiffJacobianEnum
+syn keyword cConstant AverageButtressingEnum
 syn keyword cConstant Balancethickness2AnalysisEnum
 syn keyword cConstant Balancethickness2SolutionEnum
 syn keyword cConstant BalancethicknessAnalysisEnum
@@ -3795,15 +3796,16 @@ syn keyword cType Cfsurfacelogvel
 syn keyword cType Cfsurfacesquare
 syn keyword cType Cfsurfacesquaretransient
 syn keyword cType Channel
+syn keyword cType classes
 syn keyword cType Constraint
 syn keyword cType Constraints
 syn keyword cType Contour
 syn keyword cType Contours
 syn keyword cType ControlInput
 syn keyword cType ControlParam
 syn keyword cType Covertree
-syn keyword cType DataSetParam
 syn keyword cType DatasetInput
+syn keyword cType DataSetParam
 syn keyword cType Definition
 syn keyword cType DependentObject
 syn keyword cType DoubleInput
@@ -3816,19 +3818,20 @@ syn keyword cType Element
 syn keyword cType ElementHook
 syn keyword cType ElementInput
 syn keyword cType ElementMatrix
-syn keyword cType ElementVector
 syn keyword cType Elements
+syn keyword cType ElementVector
 syn keyword cType ExponentialVariogram
 syn keyword cType ExternalResult
 syn keyword cType FemModel
 syn keyword cType FileParam
 syn keyword cType Friction
 syn keyword cType Gauss
+syn keyword cType GaussianVariogram
+syn keyword cType gaussobjects
 syn keyword cType GaussPenta
 syn keyword cType GaussSeg
 syn keyword cType GaussTetra
 syn keyword cType GaussTria
-syn keyword cType GaussianVariogram
 syn keyword cType GenericExternalResult
 syn keyword cType GenericOption
 syn keyword cType GenericParam
@@ -3845,6 +3848,7 @@ syn keyword cType IntVecParam
 syn keyword cType IoModel
 syn keyword cType IssmDirectApplicInterface
 syn keyword cType IssmParallelDirectApplicInterface
+syn keyword cType krigingobjects
 syn keyword cType Load
 syn keyword cType Loads
 syn keyword cType Masscon
@@ -3855,6 +3859,7 @@ syn keyword cType Materials
 syn keyword cType Matestar
 syn keyword cType Matice
 syn keyword cType Matlitho
+syn keyword cType matrixobjects
 syn keyword cType MatrixParam
 syn keyword cType Misfit
 syn keyword cType Moulin
@@ -3881,13 +3886,13 @@ syn keyword cType Quadtree
 syn keyword cType Radar
 syn keyword cType Regionaloutput
 syn keyword cType Results
-syn keyword cType RiftStruct
 syn keyword cType Riftfront
+syn keyword cType RiftStruct
 syn keyword cType SealevelGeometry
 syn keyword cType Seg
 syn keyword cType SegInput
-syn keyword cType SegRef
 syn keyword cType Segment
+syn keyword cType SegRef
 syn keyword cType SpcDynamic
 syn keyword cType SpcStatic
 syn keyword cType SpcTransient
@@ -3908,10 +3913,6 @@ syn keyword cType Variogram
 syn keyword cType VectorParam
 syn keyword cType Vertex
 syn keyword cType Vertices
-syn keyword cType classes
-syn keyword cType gaussobjects
-syn keyword cType krigingobjects
-syn keyword cType matrixobjects
 syn keyword cType AdjointBalancethickness2Analysis
 syn keyword cType AdjointBalancethicknessAnalysis
 syn keyword cType AdjointHorizAnalysis

src/c/shared/Enum/EnumDefinitions.h

@@ -3368,6 +3368,7 @@ enum definitions{
 	AmrNeopzEnum,
 	ArrheniusEnum,
 	AutodiffJacobianEnum,
+	AverageButtressingEnum,
 	Balancethickness2AnalysisEnum,
 	Balancethickness2SolutionEnum,
 	BalancethicknessAnalysisEnum,

src/c/shared/Enum/EnumToStringx.cpp

@@ -3371,6 +3371,7 @@ const char* EnumToStringx(int en){
 		case AmrNeopzEnum : return "AmrNeopz";
 		case ArrheniusEnum : return "Arrhenius";
 		case AutodiffJacobianEnum : return "AutodiffJacobian";
+		case AverageButtressingEnum : return "AverageButtressing";
 		case Balancethickness2AnalysisEnum : return "Balancethickness2Analysis";
 		case Balancethickness2SolutionEnum : return "Balancethickness2Solution";
 		case BalancethicknessAnalysisEnum : return "BalancethicknessAnalysis";

src/c/shared/Enum/Enumjl.vim

@@ -3362,6 +3362,7 @@ syn keyword juliaConstC AmrBamgEnum
 syn keyword juliaConstC AmrNeopzEnum
 syn keyword juliaConstC ArrheniusEnum
 syn keyword juliaConstC AutodiffJacobianEnum
+syn keyword juliaConstC AverageButtressingEnum
 syn keyword juliaConstC Balancethickness2AnalysisEnum
 syn keyword juliaConstC Balancethickness2SolutionEnum
 syn keyword juliaConstC BalancethicknessAnalysisEnum

src/c/shared/Enum/StringToEnumx.cpp

@@ -3452,15 +3452,16 @@ int  StringToEnumx(const char* name,bool notfounderror){
 	      else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum;
 	      else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
 	      else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
+	      else if (strcmp(name,"AverageButtressing")==0) return AverageButtressingEnum;
 	      else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
 	      else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
 	      else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
 	      else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum;
-	      else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
          else stage=29;
    }
    if(stage==29){
-	      if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
+	      if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
+	      else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
 	      else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
 	      else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
 	      else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum;
@@ -3579,11 +3580,11 @@ int  StringToEnumx(const char* name,bool notfounderror){
 	      else if (strcmp(name,"GroundedArea")==0) return GroundedAreaEnum;
 	      else if (strcmp(name,"GroundedAreaScaled")==0) return GroundedAreaScaledEnum;
 	      else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
-	      else if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum;
          else stage=30;
    }
    if(stage==30){
-	      if (strcmp(name,"Gset")==0) return GsetEnum;
+	      if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum;
+	      else if (strcmp(name,"Gset")==0) return GsetEnum;
 	      else if (strcmp(name,"Gsl")==0) return GslEnum;
 	      else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
 	      else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
@@ -3702,11 +3703,11 @@ int  StringToEnumx(const char* name,bool notfounderror){
 	      else if (strcmp(name,"Mumps")==0) return MumpsEnum;
 	      else if (strcmp(name,"NoFrictionOnPartiallyFloating")==0) return NoFrictionOnPartiallyFloatingEnum;
 	      else if (strcmp(name,"NoMeltOnPartiallyFloating")==0) return NoMeltOnPartiallyFloatingEnum;
-	      else if (strcmp(name,"Nodal")==0) return NodalEnum;
          else stage=31;
    }
    if(stage==31){
-	      if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
+	      if (strcmp(name,"Nodal")==0) return NodalEnum;
+	      else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
 	      else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
 	      else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
 	      else if (strcmp(name,"None")==0) return NoneEnum;
@@ -3825,11 +3826,11 @@ int  StringToEnumx(const char* name,bool notfounderror){
 	      else if (strcmp(name,"TotalCalvingMeltingFluxLevelset")==0) return TotalCalvingMeltingFluxLevelsetEnum;
 	      else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
 	      else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
-	      else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
          else stage=32;
    }
    if(stage==32){
-	      if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;
+	      if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
+	      else if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;
 	      else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
 	      else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum;
 	      else if (strcmp(name,"TotalSmbRefreeze")==0) return TotalSmbRefreezeEnum;

src/c/shared/Enum/issmenums.jl

@@ -3358,6 +3358,7 @@
 	AmrNeopzEnum
 	ArrheniusEnum
 	AutodiffJacobianEnum
+	AverageButtressingEnum
 	Balancethickness2AnalysisEnum
 	Balancethickness2SolutionEnum
 	BalancethicknessAnalysisEnum
@@ -7124,6 +7125,7 @@ function EnumToString(enum::IssmEnum)
 	if(enum==AmrNeopzEnum) return "AmrNeopz" end
 	if(enum==ArrheniusEnum) return "Arrhenius" end
 	if(enum==AutodiffJacobianEnum) return "AutodiffJacobian" end
+	if(enum==AverageButtressingEnum) return "AverageButtressing" end
 	if(enum==Balancethickness2AnalysisEnum) return "Balancethickness2Analysis" end
 	if(enum==Balancethickness2SolutionEnum) return "Balancethickness2Solution" end
 	if(enum==BalancethicknessAnalysisEnum) return "BalancethicknessAnalysis" end
@@ -10890,6 +10892,7 @@ function StringToEnum(name::String)
 	if(name=="AmrNeopz") return AmrNeopzEnum  end
 	if(name=="Arrhenius") return ArrheniusEnum  end
 	if(name=="AutodiffJacobian") return AutodiffJacobianEnum  end
+	if(name=="AverageButtressing") return AverageButtressingEnum  end
 	if(name=="Balancethickness2Analysis") return Balancethickness2AnalysisEnum  end
 	if(name=="Balancethickness2Solution") return Balancethickness2SolutionEnum  end
 	if(name=="BalancethicknessAnalysis") return BalancethicknessAnalysisEnum  end