Changeset 15564 for issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

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/EnumDefinitions.h (modified) (8 diffs)

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

@@ -57 +57 @@
         DiagnosticSpcvyEnum,
         DiagnosticSpcvzEnum,
-        DiagnosticStokesreconditioningEnum,
+        DiagnosticFSreconditioningEnum,
         DiagnosticVertexPairingEnum,
         DiagnosticViscosityOvershootEnum,
@@ -63 +63 @@
         LoadingforceYEnum,
         LoadingforceZEnum,
-        FlowequationBordermacayealEnum,
-        FlowequationBorderpattynEnum,
-        FlowequationBorderstokesEnum,
+        FlowequationBorderSSAEnum,
+        FlowequationBorderHOEnum,
+        FlowequationBorderFSEnum,
         FlowequationElementEquationEnum,
-        FlowequationIshutterEnum,
-        FlowequationIsmacayealEnum,
-        FlowequationIsl1l2Enum,
-        FlowequationIspattynEnum,
-        FlowequationIsstokesEnum,
-        FlowequationFeStokesEnum,
-        FlowequationFeSsaEnum,
+        FlowequationIsSIAEnum,
+        FlowequationIsSSAEnum,
+        FlowequationIsL1L2Enum,
+        FlowequationIsHOEnum,
+        FlowequationIsFSEnum,
+        FlowequationFeFSEnum,
+        FlowequationFeSSAEnum,
         FlowequationVertexEquationEnum,
         FrictionCoefficientEnum,
@@ -282 +282 @@
         BedSlopeYAnalysisEnum,
         DiagnosticHorizAnalysisEnum,
-        DiagnosticHutterAnalysisEnum,
+        DiagnosticSIAAnalysisEnum,
         DiagnosticSolutionEnum,
         DiagnosticVertAnalysisEnum,
@@ -310 +310 @@
         ApproximationEnum,
         NoneApproximationEnum,
-        HutterApproximationEnum,
+        SIAApproximationEnum,
         MacAyealApproximationEnum,
-        MacAyealPattynApproximationEnum,
-        MacAyealStokesApproximationEnum,
+        MacAyealHOApproximationEnum,
+        MacAyealFSApproximationEnum,
         L1L2ApproximationEnum,
-        PattynApproximationEnum,
-        PattynStokesApproximationEnum,
-        StokesApproximationEnum,
+        HOApproximationEnum,
+        HOFSApproximationEnum,
+        FSApproximationEnum,
         /*}}}*/
         /*Datasets {{{*/
@@ -366 +366 @@
         ParamEnum,
         L1L2IceFrontEnum,
-        PattynIceFrontEnum,
+        HOIceFrontEnum,
         PengridEnum,
         PenpairEnum,
@@ -382 +382 @@
         SpcStaticEnum,
         SpcTransientEnum,
-        StokesIceFrontEnum,
+        FSIceFrontEnum,
         StringArrayParamEnum,
         StringParamEnum,
@@ -461 +461 @@
         VzEnum,
         VzMacAyealEnum,
-        VzPattynEnum,
+        VzHOEnum,
         VzPicardEnum,
-        VzStokesEnum,
+        VzFSEnum,
         VxMeshEnum,
         VyMeshEnum,
@@ -553 +553 @@
         /*}}}*/
         /*Solver{{{*/
-        StokesSolverEnum,
+        FSSolverEnum,
         /*}}}*/
         /*Parameters{{{*/