Changeset 1728

Timestamp:

08/17/09 13:49:36 (16 years ago)

Author:

Mathieu Morlighem

Message:

change enum name

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumDefinitions.cpp (modified) (1 diff)
• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• objects/Icefront.cpp (modified) (7 diffs)

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

@@ -90 +90 @@
 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: */

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -91 +91 @@
 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);

issm/trunk/src/c/objects/Icefront.cpp

@@ -366 +366 @@
         /*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 +494 @@
         /*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 +657 @@
         /*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 +868 @@
                 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 +878 @@
                         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 +1132 @@
 
                         //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 +1381 @@
 
                         //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;
                         }