Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp
===================================================================
--- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp	(revision 1623)
+++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp	(revision 1624)
@@ -16,26 +16,34 @@
 int ResultsEnum(void){                  return          107; }
 
-/*Analysis types: */
+/*ANALYSIS TYPES: */
 int AnalysisEnum(void){                 return          200; }
-int DiagnosticAnalysisEnum(void){       return          201; }
-int ControlAnalysisEnum(void){          return          202; }
-int ThermalAnalysisEnum(void){          return          203; }
-int PrognosticAnalysisEnum(void){       return          204; }
-int MeltingAnalysisEnum(void){          return          205; }
-int SlopeComputeAnalysisEnum(void){     return          206; }
-int StokesAnalysisEnum(void){           return          207; }
-int HutterAnalysisEnum(void){           return          208; }
-int SurfaceXAnalysisEnum(void){         return          209; }
-int SurfaceYAnalysisEnum(void){         return          210; }
-int BedXAnalysisEnum(void){             return          211; }
-int BedYAnalysisEnum(void){             return          212; }
-int HorizAnalysisEnum(void){            return          213; }
+//diagnostic
+int DiagnosticAnalysisEnum(void){       return          210; }
+int HorizAnalysisEnum(void){            return          211; }
+int StokesAnalysisEnum(void){           return          212; }
+int HutterAnalysisEnum(void){           return          213; }
 int VertAnalysisEnum(void){             return          214; }
-int NoneAnalysisEnum(void){             return          215; }
-int SteadyAnalysisEnum(void){           return          216; }
-int TransientAnalysisEnum(void){        return          217; }
-int AdjointAnalysisEnum(void){          return          218; }
-int InverseAnalysisEnum(void){          return          219; }
-int GradientAnalysisEnum(void){         return          220; }
+//control
+int ControlAnalysisEnum(void){          return          220; }
+int AdjointAnalysisEnum(void){          return          221; }
+int InverseAnalysisEnum(void){          return          222; }
+int GradientAnalysisEnum(void){         return          223; }
+//thermal
+int ThermalAnalysisEnum(void){          return          230; }
+int SteadyAnalysisEnum(void){           return          231; }
+int TransientAnalysisEnum(void){        return          232; }
+//slope
+int SlopeComputeAnalysisEnum(void){     return          240; }
+int SurfaceXAnalysisEnum(void){         return          241; }
+int SurfaceYAnalysisEnum(void){         return          242; }
+int BedXAnalysisEnum(void){             return          243; }
+int BedYAnalysisEnum(void){             return          244; }
+//prognostic
+int PrognosticAnalysisEnum(void){       return          250; }
+//melting
+int MeltingAnalysisEnum(void){          return          260; }
+//none
+int NoneAnalysisEnum(void){             return          270; }
+
 
 /*Formulations: */
@@ -47,5 +55,5 @@
 int StokesEnum(void){                   return          305; }
 
-/*Objects: */
+/*OBJECTS: */
 int ObjectEnum(void){                   return          400; }
 /*Elements: */
@@ -77,6 +85,4 @@
 int SpcEnum(void){                      return          490; }
 
-
-
 /*functions on enums: */
 int EnumIsElement(int en){