Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp
===================================================================
--- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp	(revision 1727)
+++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp	(revision 1728)
@@ -90,9 +90,15 @@
 int SpcEnum(void){                      return          490; }
 
-/*GEOGRAPHIE/FILL:*/
-int WaterEnum(void){                    return          601; }
-int IceEnum(void){                      return          602; }
-int AirEnum(void){                      return          603; }
+/*GEOGRAPHY:*/
+int GeographyEnum(void){                return          500; }
+int WaterEnum(void){                    return          501; }
+int IceSheetEnum(void){                 return          502; }
+int IceShelfEnum(void){                 return          502; }
 
+/*FILL:*/
+int FillEnum(void){                     return          600; }
+int WaterFillEnum(void){                return          601; }
+int IceFillEnum(void){                  return          602; }
+int AirFillEnum(void){                  return          603; }
 
 /*functions on enums: */
Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
===================================================================
--- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h	(revision 1727)
+++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h	(revision 1728)
@@ -91,6 +91,12 @@
 int SpcEnum(void);
 
+/*GEOGRAPHY:*/
+int GeographyEnum(void);
+int WaterEnum(void);
+int IceSheetEnum(void);
+int IceShelfEnum(void);
 
-/*DIVERSE: */
+/*FILL: */
+int FillEnum(void);
 int WaterEnum(void);
 int IceEnum(void);
Index: /issm/trunk/src/c/objects/Icefront.cpp
===================================================================
--- /issm/trunk/src/c/objects/Icefront.cpp	(revision 1727)
+++ /issm/trunk/src/c/objects/Icefront.cpp	(revision 1728)
@@ -366,6 +366,6 @@
 	/*Recover material and fill parameters: */
 	matpar=(Matpar*)element->GetMatPar();
-	if (element->GetShelf())fill=WaterEnum();
-	else fill=AirEnum();
+	if (element->GetShelf())fill=WaterFillEnum();
+	else fill=AirFillEnum();
 
 	//check that the element is onbed (collapsed formulation) otherwise:pe=0
@@ -494,6 +494,6 @@
 	/*Recover material and fill parameters: */
 	matpar=(Matpar*)element->GetMatPar();
-	if (element->GetShelf())fill=WaterEnum();
-	else fill=AirEnum();
+	if (element->GetShelf())fill=WaterFillEnum();
+	else fill=AirFillEnum();
 
 	/* Set pe_g to 0: */
@@ -657,6 +657,6 @@
 	/*Recover material and fill parameters: */
 	matpar=(Matpar*)element->GetMatPar();
-	if (element->GetShelf())fill=WaterEnum();
-	else fill=AirEnum();
+	if (element->GetShelf())fill=WaterFillEnum();
+	else fill=AirFillEnum();
 
 	/* Set pe_g to 0: */
@@ -868,5 +868,5 @@
 		bed=b1*(1+segment_gauss_coord[ig])/2+b2*(1-segment_gauss_coord[ig])/2;
 
-		if (fill==WaterEnum()){
+		if (fill==WaterFillEnum()){
 			//icefront ends in water: 
 			ice_pressure=1.0/2.0*gravity*rho_ice*pow(thickness,2);
@@ -878,5 +878,5 @@
 			water_pressure=1.0/2.0*gravity*rho_water*(pow(surface_under_water,2) - pow(base_under_water,2));
 		}
-		else if (fill==AirEnum()){
+		else if (fill==AirFillEnum()){
 			ice_pressure=1.0/2.0*gravity*rho_ice*pow(thickness,2);
 			air_pressure=0;
@@ -1132,9 +1132,9 @@
 
 			//Now deal with water pressure: 
-			if(fill==WaterEnum()){ //icefront ends in water
+			if(fill==WaterFillEnum()){ //icefront ends in water
 				water_level_above_g_tria=min(0,z_g[i]);//0 if the gaussian point is above water level
 				water_pressure_tria=rho_water*gravity*water_level_above_g_tria;
 			}
-			else if(fill==AirEnum()){
+			else if(fill==AirFillEnum()){
 				water_pressure_tria=0;
 			}
@@ -1381,9 +1381,9 @@
 
 			//Now deal with water pressure: 
-			if(fill==WaterEnum()){ //icefront ends in water
+			if(fill==WaterFillEnum()){ //icefront ends in water
 				water_level_above_g_tria=min(0,z_g[i]);//0 if the gaussian point is above water level
 				water_pressure_tria=rho_water*gravity*water_level_above_g_tria;
 			}
-			else if(fill==AirEnum()){
+			else if(fill==AirFillEnum()){
 				water_pressure_tria=0;
 			}