Index: /issm/trunk/src/m/enum/EnumToString.m
===================================================================
--- /issm/trunk/src/m/enum/EnumToString.m	(revision 8073)
+++ /issm/trunk/src/m/enum/EnumToString.m	(revision 8074)
@@ -197,6 +197,6 @@
 case PflagEnum(), string='Pflag'; return
 case PressureEnum(), string='Pressure'; return
+case PressurePicardEnum(), string='PressurePicard'; return
 case VelocityEnum(), string='Velocity'; return
-case PressureOldEnum(), string='PressureOld'; return
 case QmuPressureEnum(), string='QmuPressure'; return
 case ResetPenaltiesEnum(), string='ResetPenalties'; return
@@ -213,5 +213,5 @@
 case SurfaceSlopeYEnum(), string='SurfaceSlopeY'; return
 case TemperatureEnum(), string='Temperature'; return
-case TemporaryTemperatureEnum(), string='TemporaryTemperature'; return
+case TemperaturePicardEnum(), string='TemperaturePicard'; return
 case TemperatureOldEnum(), string='TemperatureOld'; return
 case ThicknessEnum(), string='Thickness'; return
@@ -225,15 +225,15 @@
 case VxEnum(), string='Vx'; return
 case VxObsEnum(), string='VxObs'; return
-case VxOldEnum(), string='VxOld'; return
+case VxPicardEnum(), string='VxPicard'; return
 case QmuVxEnum(), string='QmuVx'; return
 case VyAverageEnum(), string='VyAverage'; return
 case VyEnum(), string='Vy'; return
 case VyObsEnum(), string='VyObs'; return
-case VyOldEnum(), string='VyOld'; return
+case VyPicardEnum(), string='VyPicard'; return
 case QmuVyEnum(), string='QmuVy'; return
 case VzAverageEnum(), string='VzAverage'; return
 case VzEnum(), string='Vz'; return
 case VzObsEnum(), string='VzObs'; return
-case VzOldEnum(), string='VzOld'; return
+case VzPicardEnum(), string='VzPicard'; return
 case VzMacAyealEnum(), string='VzMacAyeal'; return
 case VzPattynEnum(), string='VzPattyn'; return
@@ -263,6 +263,6 @@
 case OutputFrequencyEnum(), string='OutputFrequency'; return
 case WaterColumnEnum(), string='WaterColumn'; return
-case OldWaterColumnEnum(), string='OldWaterColumn'; return
-case PicardWaterColumnEnum(), string='PicardWaterColumn'; return
+case WaterColumnOldEnum(), string='WaterColumnOld'; return
+case WaterColumnPicardEnum(), string='WaterColumnPicard'; return
 case IoGatherEnum(), string='IoGather'; return
 case MinVelEnum(), string='MinVel'; return
Index: sm/trunk/src/m/enum/OldWaterColumnEnum.m
===================================================================
--- /issm/trunk/src/m/enum/OldWaterColumnEnum.m	(revision 8073)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=OldWaterColumnEnum()
-%OLDWATERCOLUMNENUM - Enum of OldWaterColumn
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=OldWaterColumnEnum()
-
-macro=252;
Index: sm/trunk/src/m/enum/PicardWaterColumnEnum.m
===================================================================
--- /issm/trunk/src/m/enum/PicardWaterColumnEnum.m	(revision 8073)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=PicardWaterColumnEnum()
-%PICARDWATERCOLUMNENUM - Enum of PicardWaterColumn
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=PicardWaterColumnEnum()
-
-macro=253;
Index: sm/trunk/src/m/enum/PressureOldEnum.m
===================================================================
--- /issm/trunk/src/m/enum/PressureOldEnum.m	(revision 8073)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=PressureOldEnum()
-%PRESSUREOLDENUM - Enum of PressureOld
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=PressureOldEnum()
-
-macro=187;
Index: /issm/trunk/src/m/enum/PressurePicardEnum.m
===================================================================
--- /issm/trunk/src/m/enum/PressurePicardEnum.m	(revision 8074)
+++ /issm/trunk/src/m/enum/PressurePicardEnum.m	(revision 8074)
@@ -0,0 +1,11 @@
+function macro=PressurePicardEnum()
+%PRESSUREPICARDENUM - Enum of PressurePicard
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=PressurePicardEnum()
+
+macro=186;
Index: /issm/trunk/src/m/enum/StringToEnum.m
===================================================================
--- /issm/trunk/src/m/enum/StringToEnum.m	(revision 8073)
+++ /issm/trunk/src/m/enum/StringToEnum.m	(revision 8074)
@@ -195,6 +195,6 @@
 			elseif (strcmpi(name,'Pflag')), enum=PflagEnum(); return
 			elseif (strcmpi(name,'Pressure')), enum=PressureEnum(); return
+			elseif (strcmpi(name,'PressurePicard')), enum=PressurePicardEnum(); return
 			elseif (strcmpi(name,'Velocity')), enum=VelocityEnum(); return
-			elseif (strcmpi(name,'PressureOld')), enum=PressureOldEnum(); return
 			elseif (strcmpi(name,'QmuPressure')), enum=QmuPressureEnum(); return
 			elseif (strcmpi(name,'ResetPenalties')), enum=ResetPenaltiesEnum(); return
@@ -211,5 +211,5 @@
 			elseif (strcmpi(name,'SurfaceSlopeY')), enum=SurfaceSlopeYEnum(); return
 			elseif (strcmpi(name,'Temperature')), enum=TemperatureEnum(); return
-			elseif (strcmpi(name,'TemporaryTemperature')), enum=TemporaryTemperatureEnum(); return
+			elseif (strcmpi(name,'TemperaturePicard')), enum=TemperaturePicardEnum(); return
 			elseif (strcmpi(name,'TemperatureOld')), enum=TemperatureOldEnum(); return
 			elseif (strcmpi(name,'Thickness')), enum=ThicknessEnum(); return
@@ -223,15 +223,15 @@
 			elseif (strcmpi(name,'Vx')), enum=VxEnum(); return
 			elseif (strcmpi(name,'VxObs')), enum=VxObsEnum(); return
-			elseif (strcmpi(name,'VxOld')), enum=VxOldEnum(); return
+			elseif (strcmpi(name,'VxPicard')), enum=VxPicardEnum(); return
 			elseif (strcmpi(name,'QmuVx')), enum=QmuVxEnum(); return
 			elseif (strcmpi(name,'VyAverage')), enum=VyAverageEnum(); return
 			elseif (strcmpi(name,'Vy')), enum=VyEnum(); return
 			elseif (strcmpi(name,'VyObs')), enum=VyObsEnum(); return
-			elseif (strcmpi(name,'VyOld')), enum=VyOldEnum(); return
+			elseif (strcmpi(name,'VyPicard')), enum=VyPicardEnum(); return
 			elseif (strcmpi(name,'QmuVy')), enum=QmuVyEnum(); return
 			elseif (strcmpi(name,'VzAverage')), enum=VzAverageEnum(); return
 			elseif (strcmpi(name,'Vz')), enum=VzEnum(); return
 			elseif (strcmpi(name,'VzObs')), enum=VzObsEnum(); return
-			elseif (strcmpi(name,'VzOld')), enum=VzOldEnum(); return
+			elseif (strcmpi(name,'VzPicard')), enum=VzPicardEnum(); return
 			elseif (strcmpi(name,'VzMacAyeal')), enum=VzMacAyealEnum(); return
 			elseif (strcmpi(name,'VzPattyn')), enum=VzPattynEnum(); return
@@ -261,6 +261,6 @@
 			elseif (strcmpi(name,'OutputFrequency')), enum=OutputFrequencyEnum(); return
 			elseif (strcmpi(name,'WaterColumn')), enum=WaterColumnEnum(); return
-			elseif (strcmpi(name,'OldWaterColumn')), enum=OldWaterColumnEnum(); return
-			elseif (strcmpi(name,'PicardWaterColumn')), enum=PicardWaterColumnEnum(); return
+			elseif (strcmpi(name,'WaterColumnOld')), enum=WaterColumnOldEnum(); return
+			elseif (strcmpi(name,'WaterColumnPicard')), enum=WaterColumnPicardEnum(); return
 			elseif (strcmpi(name,'IoGather')), enum=IoGatherEnum(); return
 			elseif (strcmpi(name,'MinVel')), enum=MinVelEnum(); return
Index: /issm/trunk/src/m/enum/TemperaturePicardEnum.m
===================================================================
--- /issm/trunk/src/m/enum/TemperaturePicardEnum.m	(revision 8074)
+++ /issm/trunk/src/m/enum/TemperaturePicardEnum.m	(revision 8074)
@@ -0,0 +1,11 @@
+function macro=TemperaturePicardEnum()
+%TEMPERATUREPICARDENUM - Enum of TemperaturePicard
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=TemperaturePicardEnum()
+
+macro=202;
Index: sm/trunk/src/m/enum/TemporaryTemperatureEnum.m
===================================================================
--- /issm/trunk/src/m/enum/TemporaryTemperatureEnum.m	(revision 8073)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=TemporaryTemperatureEnum()
-%TEMPORARYTEMPERATUREENUM - Enum of TemporaryTemperature
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=TemporaryTemperatureEnum()
-
-macro=202;
Index: /issm/trunk/src/m/enum/VelocityEnum.m
===================================================================
--- /issm/trunk/src/m/enum/VelocityEnum.m	(revision 8073)
+++ /issm/trunk/src/m/enum/VelocityEnum.m	(revision 8074)
@@ -9,3 +9,3 @@
 %      macro=VelocityEnum()
 
-macro=186;
+macro=187;
Index: sm/trunk/src/m/enum/VxOldEnum.m
===================================================================
--- /issm/trunk/src/m/enum/VxOldEnum.m	(revision 8073)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=VxOldEnum()
-%VXOLDENUM - Enum of VxOld
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=VxOldEnum()
-
-macro=214;
Index: /issm/trunk/src/m/enum/VxPicardEnum.m
===================================================================
--- /issm/trunk/src/m/enum/VxPicardEnum.m	(revision 8074)
+++ /issm/trunk/src/m/enum/VxPicardEnum.m	(revision 8074)
@@ -0,0 +1,11 @@
+function macro=VxPicardEnum()
+%VXPICARDENUM - Enum of VxPicard
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=VxPicardEnum()
+
+macro=214;
Index: sm/trunk/src/m/enum/VyOldEnum.m
===================================================================
--- /issm/trunk/src/m/enum/VyOldEnum.m	(revision 8073)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=VyOldEnum()
-%VYOLDENUM - Enum of VyOld
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=VyOldEnum()
-
-macro=219;
Index: /issm/trunk/src/m/enum/VyPicardEnum.m
===================================================================
--- /issm/trunk/src/m/enum/VyPicardEnum.m	(revision 8074)
+++ /issm/trunk/src/m/enum/VyPicardEnum.m	(revision 8074)
@@ -0,0 +1,11 @@
+function macro=VyPicardEnum()
+%VYPICARDENUM - Enum of VyPicard
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=VyPicardEnum()
+
+macro=219;
Index: sm/trunk/src/m/enum/VzOldEnum.m
===================================================================
--- /issm/trunk/src/m/enum/VzOldEnum.m	(revision 8073)
+++ 	(revision )
@@ -1,11 +1,0 @@
-function macro=VzOldEnum()
-%VZOLDENUM - Enum of VzOld
-%
-%   WARNING: DO NOT MODIFY THIS FILE
-%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
-%            Please read src/c/EnumDefinitions/README for more information
-%
-%   Usage:
-%      macro=VzOldEnum()
-
-macro=224;
Index: /issm/trunk/src/m/enum/VzPicardEnum.m
===================================================================
--- /issm/trunk/src/m/enum/VzPicardEnum.m	(revision 8074)
+++ /issm/trunk/src/m/enum/VzPicardEnum.m	(revision 8074)
@@ -0,0 +1,11 @@
+function macro=VzPicardEnum()
+%VZPICARDENUM - Enum of VzPicard
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=VzPicardEnum()
+
+macro=224;
Index: /issm/trunk/src/m/enum/WaterColumnOldEnum.m
===================================================================
--- /issm/trunk/src/m/enum/WaterColumnOldEnum.m	(revision 8074)
+++ /issm/trunk/src/m/enum/WaterColumnOldEnum.m	(revision 8074)
@@ -0,0 +1,11 @@
+function macro=WaterColumnOldEnum()
+%WATERCOLUMNOLDENUM - Enum of WaterColumnOld
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=WaterColumnOldEnum()
+
+macro=252;
Index: /issm/trunk/src/m/enum/WaterColumnPicardEnum.m
===================================================================
--- /issm/trunk/src/m/enum/WaterColumnPicardEnum.m	(revision 8074)
+++ /issm/trunk/src/m/enum/WaterColumnPicardEnum.m	(revision 8074)
@@ -0,0 +1,11 @@
+function macro=WaterColumnPicardEnum()
+%WATERCOLUMNPICARDENUM - Enum of WaterColumnPicard
+%
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
+%            Please read src/c/EnumDefinitions/README for more information
+%
+%   Usage:
+%      macro=WaterColumnPicardEnum()
+
+macro=253;
