Changeset 11577 for issm/branches/trunk-jpl-damage/src/c/EnumDefinitions/EnumToModelField.cpp

Timestamp:

02/29/12 13:35:30 (13 years ago)

Author:

cborstad

Message:

merged changes up to r11576 from trunk-jpl into branch

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (2 props)
• src/c (modified) (1 prop)
• src/c/EnumDefinitions/EnumToModelField.cpp (modified) (1 diff)

issm/branches/trunk-jpl-damage

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog

issm/branches/trunk-jpl-damage/src/c

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*

issm/branches/trunk-jpl-damage/src/c/EnumDefinitions/EnumToModelField.cpp

@@ -25 +25 @@
                 case InversionVyObsEnum : return "vy_obs";
                 case BasalforcingsMeltingRateEnum : return "basal_melting_rate";
-      case SurfaceforcingsAccumulationRateEnum : return "surface_accumulation_rate";
-                case SurfaceforcingsAblationRateEnum : return "surface_ablation_rate";
                 case SurfaceforcingsMassBalanceEnum : return "surface_mass_balance";
                 default : _error_("No model field is associated to enum %s",EnumToStringx(en));

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*