Changeset 11683

Timestamp:

03/12/12 12:59:22 (14 years ago)

Author:

cborstad

Message:

misc changes prior to merging from trunk-jpl

Location:

issm/branches/trunk-jpl-damage/src

Files:

• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• m/enum/EnumToModelField.m (modified) (1 diff)
• m/model/plot/applyoptions.m (modified) (1 diff)

issm/branches/trunk-jpl-damage/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -137 +137 @@
               else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum;
               else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum;
-              else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
+              if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum;
+              else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;
               else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum;
               else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum;

issm/branches/trunk-jpl-damage/src/m/enum/EnumToModelField.m

@@ -23 +23 @@
                 case InversionVyObsEnum(), string='vy_obs'; return
                 case BasalforcingsMeltingRateEnum(), string='basal_melting_rate'; return
-      case SurfaceforcingsAccumulationRateEnum(), string='surface_accumulation_rate'; return
-                case SurfaceforcingsAblationRateEnum(), string='surface_ablation_rate'; return
                 case SurfaceforcingsMassBalanceEnum(), string='surface_mass_balance'; return
                 otherwise, error(['Enum ' num2str(enum)  ' not found associated to any model field']);

issm/branches/trunk-jpl-damage/src/m/model/plot/applyoptions.m

@@ -166 +166 @@
 
                 c=flipud(c);
+
+        elseif strcmpi(cname,'damage'),
+                c=hsv(64);
+                c(:,3)=1;
+                a=1:-(1/35):0.1;
+                c(1:32,2)=a;
+                c(33:end,2)=fliplr(a);
+                c(1:32,1)=2/3;
+                c(33:end,1)=0.07;
+                c=hsv2rgb(c);
 
         else