Changeset 3764

Timestamp:

05/17/10 08:48:55 (15 years ago)

Author:

Mathieu Morlighem

Message:

fuxed bug: last enum was never taken into account

Location:

issm/trunk/src/c/EnumDefinitions

Files:

• EnumAsString.cpp (modified) (3 diffs)
• StringAsEnum.cpp (modified) (3 diffs)
• SynchronizeMatlabEnum.sh (modified) (1 diff)
• SynchronizeStrings.sh (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp

@@ -40 +40 @@
                 case TransientAnalysisEnum : return "TransientAnalysis";
                 case SteadyAnalysisEnum : return "SteadyAnalysis";
+                case SurfaceAnalysisEnum : return "SurfaceAnalysis";
                 case SlopecomputeAnalysisEnum : return "SlopecomputeAnalysis";
                 case BedXAnalysisEnum : return "BedXAnalysis";
                 case BedYAnalysisEnum : return "BedYAnalysis";
+                case BedAnalysisEnum : return "BedAnalysis";
                 case SurfaceXAnalysisEnum : return "SurfaceXAnalysis";
                 case SurfaceYAnalysisEnum : return "SurfaceYAnalysis";
@@ -173 +175 @@
                 case SurfaceSlopeyEnum : return "SurfaceSlopey";
                 case TemperatureEnum : return "Temperature";
+                case TemperatureAverageEnum : return "TemperatureAverage";
                 case ThicknessEnum : return "Thickness";
                 case TypeEnum : return "Type";
@@ -241 +244 @@
                 case VerboseEnum : return "Verbose";
                 case WaitOnLockEnum : return "WaitOnLock";
+                case YtsEnum : return "Yts";
                 default : ISSMERROR("Enum %i not found",en);
 

issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp

@@ -38 +38 @@
         else if (strcmp(name,"TransientAnalysis")==0) return TransientAnalysisEnum;
         else if (strcmp(name,"SteadyAnalysis")==0) return SteadyAnalysisEnum;
+        else if (strcmp(name,"SurfaceAnalysis")==0) return SurfaceAnalysisEnum;
         else if (strcmp(name,"SlopecomputeAnalysis")==0) return SlopecomputeAnalysisEnum;
         else if (strcmp(name,"BedXAnalysis")==0) return BedXAnalysisEnum;
         else if (strcmp(name,"BedYAnalysis")==0) return BedYAnalysisEnum;
+        else if (strcmp(name,"BedAnalysis")==0) return BedAnalysisEnum;
         else if (strcmp(name,"SurfaceXAnalysis")==0) return SurfaceXAnalysisEnum;
         else if (strcmp(name,"SurfaceYAnalysis")==0) return SurfaceYAnalysisEnum;
@@ -171 +173 @@
         else if (strcmp(name,"SurfaceSlopey")==0) return SurfaceSlopeyEnum;
         else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
+        else if (strcmp(name,"TemperatureAverage")==0) return TemperatureAverageEnum;
         else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
         else if (strcmp(name,"Type")==0) return TypeEnum;
@@ -239 +242 @@
         else if (strcmp(name,"Verbose")==0) return VerboseEnum;
         else if (strcmp(name,"WaitOnLock")==0) return WaitOnLockEnum;
+        else if (strcmp(name,"Yts")==0) return YtsEnum;
         else ISSMERROR("Enum %i not found",name);
 

issm/trunk/src/c/EnumDefinitions/SynchronizeMatlabEnum.sh

@@ -8 +8 @@
 
 echo "Synchronizing Matlab's Enums..."
-#Get all lines of EnumDefinitions2.h which hold Enum, | remove all comas | add line number in the first column > put everything in file temp
-cat EnumDefinitions.h | grep "Enum," |sed -e "s/,//g" | awk '{ printf "%s %s\n", NR, $0 }' > temp
+#Get all lines of EnumDefinitions2.h which hold Enum | remove all comas | add line number in the first column > put everything in file temp
+cat EnumDefinitions.h | grep "[Aa-Zz]Enum" | grep -v StringAsEnum | sed -e "s/,//g" | awk '{ printf "%s %s\n", NR, $0 }' > temp
 
 #Build header of AnalysisTypeFromEnum.m{{{

issm/trunk/src/c/EnumDefinitions/SynchronizeStrings.sh

@@ -6 +6 @@
 
 echo "Synchronizing EnumAsString..."
-#Get all lines of EnumDefinitions2.h which hold Enum, | remove all comas | add line number in the first column > put everything in file temp
-cat EnumDefinitions.h | grep "Enum," |sed -e "s/,//g" | awk '{ printf "%s %s\n", NR, $0 }' > temp
+#Get all lines of EnumDefinitions2.h which hold Enum | remove all comas | add line number in the first column > put everything in file temp
+cat EnumDefinitions.h | grep "[Aa-Zz]Enum" | grep -v StringAsEnum | sed -e "s/,//g" | awk '{ printf "%s %s\n", NR, $0 }' > temp
 
 #Build header of EnumAsString.cpp {{{1