Changeset 14161

Timestamp:

12/13/12 15:19:14 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: duplicate OutputFileNameEnum.m OutputfilenameEnum.m

Location:

issm/trunk-jpl/src/c

Files:

• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)

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

@@ -428 +428 @@
         DragCoefficientAbsGradientEnum,
         TransientInputEnum,
-        OutputfilenameEnum,
         WaterfractionEnum,
         WatercolumnEnum,

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -419 +419 @@
                 case DragCoefficientAbsGradientEnum : return "DragCoefficientAbsGradient";
                 case TransientInputEnum : return "TransientInput";
-                case OutputfilenameEnum : return "Outputfilename";
                 case WaterfractionEnum : return "Waterfraction";
                 case WatercolumnEnum : return "Watercolumn";

issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -56 +56 @@
 
                 /*We don't have a file pointer. Retrieve the output file name and open it for writing:*/
-                parameters->FindParam(&outputfilename,OutputfilenameEnum);
+                parameters->FindParam(&outputfilename,OutputFileNameEnum);
 
                 /*What strategy? : */

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -429 +429 @@
               else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
               else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
-              else if (strcmp(name,"Outputfilename")==0) return OutputfilenameEnum;
               else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum;
               else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
@@ -507 +506 @@
               else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum;
               else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
+              else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
-              else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
+              if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum;
               else if (strcmp(name,"Regular")==0) return RegularEnum;
               else if (strcmp(name,"Scaled")==0) return ScaledEnum;