Index: /issm/trunk/src/c/objects/Riftfront.cpp
===================================================================
--- /issm/trunk/src/c/objects/Riftfront.cpp	(revision 1728)
+++ /issm/trunk/src/c/objects/Riftfront.cpp	(revision 1729)
@@ -445,5 +445,5 @@
 
 		/*Ok, now compute the pressure (in norm) that is being applied to the flanks, depending on the type of fill: */
-		if(fill==WaterEnum()){
+		if(fill==WaterFillEnum()){
 			if(shelf){
 				/*We are on an ice shelf, hydrostatic equilibrium is used to determine the pressure for water fill: */
@@ -455,8 +455,8 @@
 			}
 		}
-		else if(fill==AirEnum()){
+		else if(fill==AirFillEnum()){
 			pressure=rho_ice*gravity*pow(thickness,(double)2)/(double)2;   //icefront on an ice sheet, pressure imbalance ice vs air.
 		}
-		else if(fill==IceEnum()){ //icefront finding itself against another icefront (pressure imbalance is fully compensated, ice vs ice)
+		else if(fill==IceFillEnum()){ //icefront finding itself against another icefront (pressure imbalance is fully compensated, ice vs ice)
 			pressure=0;
 		}
Index: sm/trunk/src/m/enum/AirEnum.m
===================================================================
--- /issm/trunk/src/m/enum/AirEnum.m	(revision 1728)
+++ 	(revision )
@@ -1,9 +1,0 @@
-function macro=AirEnum()
-%AIRENUM - Enum of Air
-%
-%   file generated by src/c/EnumDefinitions/SynchronizeMatlabEnum
-%
-%   Usage:
-%      macro=AirEnum()
-
-macro=603;
Index: /issm/trunk/src/m/enum/AirFillEnum.m
===================================================================
--- /issm/trunk/src/m/enum/AirFillEnum.m	(revision 1729)
+++ /issm/trunk/src/m/enum/AirFillEnum.m	(revision 1729)
@@ -0,0 +1,9 @@
+function macro=AirFillEnum()
+%AIRFILLENUM - Enum of AirFill
+%
+%   file generated by src/c/EnumDefinitions/SynchronizeMatlabEnum
+%
+%   Usage:
+%      macro=AirFillEnum()
+
+macro=603;
Index: /issm/trunk/src/m/enum/FillEnum.m
===================================================================
--- /issm/trunk/src/m/enum/FillEnum.m	(revision 1729)
+++ /issm/trunk/src/m/enum/FillEnum.m	(revision 1729)
@@ -0,0 +1,9 @@
+function macro=FillEnum()
+%FILLENUM - Enum of Fill
+%
+%   file generated by src/c/EnumDefinitions/SynchronizeMatlabEnum
+%
+%   Usage:
+%      macro=FillEnum()
+
+macro=600;
Index: /issm/trunk/src/m/enum/GeographyEnum.m
===================================================================
--- /issm/trunk/src/m/enum/GeographyEnum.m	(revision 1729)
+++ /issm/trunk/src/m/enum/GeographyEnum.m	(revision 1729)
@@ -0,0 +1,9 @@
+function macro=GeographyEnum()
+%GEOGRAPHYENUM - Enum of Geography
+%
+%   file generated by src/c/EnumDefinitions/SynchronizeMatlabEnum
+%
+%   Usage:
+%      macro=GeographyEnum()
+
+macro=500;
Index: sm/trunk/src/m/enum/IceEnum.m
===================================================================
--- /issm/trunk/src/m/enum/IceEnum.m	(revision 1728)
+++ 	(revision )
@@ -1,9 +1,0 @@
-function macro=IceEnum()
-%ICEENUM - Enum of Ice
-%
-%   file generated by src/c/EnumDefinitions/SynchronizeMatlabEnum
-%
-%   Usage:
-%      macro=IceEnum()
-
-macro=602;
Index: /issm/trunk/src/m/enum/IceFillEnum.m
===================================================================
--- /issm/trunk/src/m/enum/IceFillEnum.m	(revision 1729)
+++ /issm/trunk/src/m/enum/IceFillEnum.m	(revision 1729)
@@ -0,0 +1,9 @@
+function macro=IceFillEnum()
+%ICEFILLENUM - Enum of IceFill
+%
+%   file generated by src/c/EnumDefinitions/SynchronizeMatlabEnum
+%
+%   Usage:
+%      macro=IceFillEnum()
+
+macro=602;
Index: /issm/trunk/src/m/enum/IceSheetEnum.m
===================================================================
--- /issm/trunk/src/m/enum/IceSheetEnum.m	(revision 1729)
+++ /issm/trunk/src/m/enum/IceSheetEnum.m	(revision 1729)
@@ -0,0 +1,9 @@
+function macro=IceSheetEnum()
+%ICESHEETENUM - Enum of IceSheet
+%
+%   file generated by src/c/EnumDefinitions/SynchronizeMatlabEnum
+%
+%   Usage:
+%      macro=IceSheetEnum()
+
+macro=502;
Index: /issm/trunk/src/m/enum/IceShelfEnum.m
===================================================================
--- /issm/trunk/src/m/enum/IceShelfEnum.m	(revision 1729)
+++ /issm/trunk/src/m/enum/IceShelfEnum.m	(revision 1729)
@@ -0,0 +1,9 @@
+function macro=IceShelfEnum()
+%ICESHELFENUM - Enum of IceShelf
+%
+%   file generated by src/c/EnumDefinitions/SynchronizeMatlabEnum
+%
+%   Usage:
+%      macro=IceShelfEnum()
+
+macro=502;
Index: /issm/trunk/src/m/enum/WaterEnum.m
===================================================================
--- /issm/trunk/src/m/enum/WaterEnum.m	(revision 1728)
+++ /issm/trunk/src/m/enum/WaterEnum.m	(revision 1729)
@@ -7,3 +7,3 @@
 %      macro=WaterEnum()
 
-macro=601;
+macro=501;
Index: /issm/trunk/src/m/enum/WaterFillEnum.m
===================================================================
--- /issm/trunk/src/m/enum/WaterFillEnum.m	(revision 1729)
+++ /issm/trunk/src/m/enum/WaterFillEnum.m	(revision 1729)
@@ -0,0 +1,9 @@
+function macro=WaterFillEnum()
+%WATERFILLENUM - Enum of WaterFill
+%
+%   file generated by src/c/EnumDefinitions/SynchronizeMatlabEnum
+%
+%   Usage:
+%      macro=WaterFillEnum()
+
+macro=601;