Changeset 15564 for issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

Timestamp:

07/23/13 14:23:07 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: hutter-> SIA macayeal->SSA pattyn->HO stokes->FS

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (8 diffs)

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

@@ -65 +65 @@
               else if (strcmp(name,"DiagnosticSpcvy")==0) return DiagnosticSpcvyEnum;
               else if (strcmp(name,"DiagnosticSpcvz")==0) return DiagnosticSpcvzEnum;
-              else if (strcmp(name,"DiagnosticStokesreconditioning")==0) return DiagnosticStokesreconditioningEnum;
+              else if (strcmp(name,"DiagnosticFSreconditioning")==0) return DiagnosticFSreconditioningEnum;
               else if (strcmp(name,"DiagnosticVertexPairing")==0) return DiagnosticVertexPairingEnum;
               else if (strcmp(name,"DiagnosticViscosityOvershoot")==0) return DiagnosticViscosityOvershootEnum;
@@ -71 +71 @@
               else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
               else if (strcmp(name,"LoadingforceZ")==0) return LoadingforceZEnum;
-              else if (strcmp(name,"FlowequationBordermacayeal")==0) return FlowequationBordermacayealEnum;
-              else if (strcmp(name,"FlowequationBorderpattyn")==0) return FlowequationBorderpattynEnum;
-              else if (strcmp(name,"FlowequationBorderstokes")==0) return FlowequationBorderstokesEnum;
+              else if (strcmp(name,"FlowequationBorderSSA")==0) return FlowequationBorderSSAEnum;
+              else if (strcmp(name,"FlowequationBorderHO")==0) return FlowequationBorderHOEnum;
+              else if (strcmp(name,"FlowequationBorderFS")==0) return FlowequationBorderFSEnum;
               else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum;
-              else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum;
-              else if (strcmp(name,"FlowequationIsmacayeal")==0) return FlowequationIsmacayealEnum;
-              else if (strcmp(name,"FlowequationIsl1l2")==0) return FlowequationIsl1l2Enum;
-              else if (strcmp(name,"FlowequationIspattyn")==0) return FlowequationIspattynEnum;
-              else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum;
-              else if (strcmp(name,"FlowequationFeStokes")==0) return FlowequationFeStokesEnum;
-              else if (strcmp(name,"FlowequationFeSsa")==0) return FlowequationFeSsaEnum;
+              else if (strcmp(name,"FlowequationIsSIA")==0) return FlowequationIsSIAEnum;
+              else if (strcmp(name,"FlowequationIsSSA")==0) return FlowequationIsSSAEnum;
+              else if (strcmp(name,"FlowequationIsL1L2")==0) return FlowequationIsL1L2Enum;
+              else if (strcmp(name,"FlowequationIsHO")==0) return FlowequationIsHOEnum;
+              else if (strcmp(name,"FlowequationIsFS")==0) return FlowequationIsFSEnum;
+              else if (strcmp(name,"FlowequationFeFS")==0) return FlowequationFeFSEnum;
+              else if (strcmp(name,"FlowequationFeSSA")==0) return FlowequationFeSSAEnum;
               else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum;
               else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum;
@@ -294 +294 @@
               else if (strcmp(name,"BedSlopeYAnalysis")==0) return BedSlopeYAnalysisEnum;
               else if (strcmp(name,"DiagnosticHorizAnalysis")==0) return DiagnosticHorizAnalysisEnum;
-              else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum;
+              else if (strcmp(name,"DiagnosticSIAAnalysis")==0) return DiagnosticSIAAnalysisEnum;
               else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum;
               else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum;
@@ -320 +320 @@
               else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
               else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
-              else if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum;
+              else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
               else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum;
-              else if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum;
-              else if (strcmp(name,"MacAyealStokesApproximation")==0) return MacAyealStokesApproximationEnum;
+              else if (strcmp(name,"MacAyealHOApproximation")==0) return MacAyealHOApproximationEnum;
+              else if (strcmp(name,"MacAyealFSApproximation")==0) return MacAyealFSApproximationEnum;
               else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
-              else if (strcmp(name,"PattynApproximation")==0) return PattynApproximationEnum;
-              else if (strcmp(name,"PattynStokesApproximation")==0) return PattynStokesApproximationEnum;
-              else if (strcmp(name,"StokesApproximation")==0) return StokesApproximationEnum;
+              else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
+              else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
+              else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum;
               else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
               else if (strcmp(name,"Loads")==0) return LoadsEnum;
@@ -372 +372 @@
               else if (strcmp(name,"Param")==0) return ParamEnum;
               else if (strcmp(name,"L1L2IceFront")==0) return L1L2IceFrontEnum;
-              else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
+              else if (strcmp(name,"HOIceFront")==0) return HOIceFrontEnum;
               else if (strcmp(name,"Pengrid")==0) return PengridEnum;
               else if (strcmp(name,"Penpair")==0) return PenpairEnum;
@@ -391 +391 @@
               else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
               else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
-              else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum;
+              else if (strcmp(name,"FSIceFront")==0) return FSIceFrontEnum;
               else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
               else if (strcmp(name,"StringParam")==0) return StringParamEnum;
@@ -464 +464 @@
               else if (strcmp(name,"Vz")==0) return VzEnum;
               else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
-              else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
+              else if (strcmp(name,"VzHO")==0) return VzHOEnum;
               else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
-              else if (strcmp(name,"VzStokes")==0) return VzStokesEnum;
+              else if (strcmp(name,"VzFS")==0) return VzFSEnum;
               else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
               else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
@@ -547 +547 @@
               else if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum;
               else if (strcmp(name,"GLlevelset")==0) return GLlevelsetEnum;
-              else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum;
+              else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
               else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
               else if (strcmp(name,"Colinear")==0) return ColinearEnum;