Changeset 1729

Timestamp:

08/17/09 13:51:42 (16 years ago)

Author:

Mathieu Morlighem

Message:

renamed some enums

Location:

issm/trunk/src

Files:

• c/objects/Riftfront.cpp (modified) (2 diffs)
• m/enum/AirEnum.m (deleted)
• m/enum/AirFillEnum.m (added)
• m/enum/FillEnum.m (added)
• m/enum/GeographyEnum.m (added)
• m/enum/IceEnum.m (deleted)
• m/enum/IceFillEnum.m (added)
• m/enum/IceSheetEnum.m (added)
• m/enum/IceShelfEnum.m (added)
• m/enum/WaterEnum.m (modified) (1 diff)
• m/enum/WaterFillEnum.m (added)

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

@@ -445 +445 @@
 
                 /*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 +455 @@
                         }
                 }
-                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;
                 }

issm/trunk/src/m/enum/WaterEnum.m

@@ -7 +7 @@
 %      macro=WaterEnum()
 
-macro=601;
+macro=501;