Index: /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh
===================================================================
--- /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh	(revision 11406)
+++ /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh	(revision 11407)
@@ -9,4 +9,7 @@
 rm $ISSM_TIER/src/c/modules/EnumToStringx/EnumToStringx.cpp
 rm $ISSM_TIER/src/c/modules/StringToEnumx/StringToEnumx.cpp
+
+#Get number of enums
+NUMENUMS=$(wc -l temp | awk '{printf("%s",$1);}');
 
 #Take care of EnumToModelField.m first (easy)
@@ -100,33 +103,28 @@
 
 #core
-#number of enums: 
-numenums=`wc -l temp | awk '{printf("%s\n",$1);}'`
 i1=1;
 i2=120;
 for (( i=1 ; i<=100 ; i++ )); do
 	echo "   if(stage==$i){" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp
-	awk -vi1=$i1 -vi2=$i2 '{if(NR>=i1 && NR<=i2) print $0 }' temp > "temp_batch$i"
-
-	cat "temp_batch$i" |  awk '{print "\t" ((NR==1)?"      if":"      else if") " (strcmp(name,\"" substr($2,1,length($2)-4) "\")==0) return " $2 ";"}' >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp
+	awk -v i1=$i1 -v i2=$i2 '{if(NR>=i1 && NR<=i2) print $0 }' temp |
+	awk '{print "\t" ((NR==1)?"      if":"      else if") " (strcmp(name,\"" substr($2,1,length($2)-4) "\")==0) return " $2 ";"}' >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp
 	echo "         else stage=$(($i+1));" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp
 	echo "   }" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp
 	
-	
-	if [ $i2 -ge $numenums ]; then break; fi
-	i1=$(($i1+120));
-	i2=$(($i2+120)); 
+	if [ $i2 -ge $NUMENUMS ]; then break; fi
+	let i1=$i1+120
+	let i2=$i2+120
 done
 
+#footer
 cat <<END >> $ISSM_TIER/src/c/modules/StringToEnumx/StringToEnumx.cpp
-   else _error_("Enum %s not found",name);
+	/*If we reach this point, the string provided has not been found*/
+   _error_("Enum %s not found",name);
 }
 END
 #}}}
 
-#get number of lines in temp
-NUMBEROFLINES=$(wc -l temp | awk '{printf("%s",$1);}');
-
 # go through the lines of temp
-for (( i=1 ; i<=$NUMBEROFLINES ; i++ )); do
+for (( i=1 ; i<=$NUMENUMS ; i++ )); do
 
 	#Get name and enum of the line i
@@ -141,13 +139,13 @@
 	then
 		printf "\r                                                                      "
-		printf "\r  $i/$NUMBEROFLINES Adding "$NAME"..."
+		printf "\r  $i/$NUMENUMS Adding "$NAME"..."
 	else
 		if [ $i -lt 100 ]
 		then
 			printf "\r                                                                      "
-			printf "\r $i/$NUMBEROFLINES Adding "$NAME"..."
+			printf "\r $i/$NUMENUMS Adding "$NAME"..."
 		else
 			printf "\r                                                                      "
-			printf "\r$i/$NUMBEROFLINES Adding "$NAME"..."
+			printf "\r$i/$NUMENUMS Adding "$NAME"..."
 		fi
 	fi
@@ -171,7 +169,6 @@
 done
 
-
 #clean up{{{
-rm temp temp_batch*
+rm temp
 #}}}
 #print info {{{
Index: /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp	(revision 11406)
+++ /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp	(revision 11407)
@@ -456,4 +456,5 @@
          else stage=5;
    }
-   else _error_("Enum %s not found",name);
+	/*If we reach this point, the string provided has not been found*/
+   _error_("Enum %s not found",name);
 }