Changeset 17735

Timestamp:

04/15/14 09:15:48 (11 years ago)

Author:

bdef

Message:

BUG: fixing enums

Location:

issm/trunk-jpl/src

Files:

• c/analyses/HydrologyDCEfficientAnalysis.cpp (modified) (4 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (6 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/HydrologydcEplMaxThicknessEnum.m (added)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp ¶

@@ -525 +525 @@
                 IssmDouble epl_conductivity = element->GetMaterialParameter(HydrologydcEplConductivityEnum);
                 IssmDouble init_thick       =   element->GetMaterialParameter(HydrologydcEplInitialThicknessEnum);
+                IssmDouble max_thick        =   element->GetMaterialParameter(HydrologydcEplMaxThicknessEnum);
                 
                 A=pow(B,-n);
@@ -555 +556 @@
                                 
                                 /*Take care of otherthikening*/
-                                if(thickness[i]>10.0*init_thick){
-                                        thickness[i] = 10.0*init_thick;
+                                if(thickness[i]>max_thick){
+                                        thickness[i] = max_thick;
                                 }
                         }
@@ -630 +631 @@
 
         IssmDouble init_thick = basalelement->GetMaterialParameter(HydrologydcEplInitialThicknessEnum);
+        IssmDouble init_thick = basalelement->GetMaterialParameter(HydrologydcEplMaximalThicknessEnum);
 
         Input* active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
@@ -653 +655 @@
                 else if(old_active[i]>0.){
                         vec_mask->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL);
-                        /*If epl thickness gets under , close the layer*/
+                        /*If epl thickness gets under 10-3 initial thickness, close the layer*/
                         if(epl_thickness[i]<0.001*init_thick){
                                 vec_mask->SetValue(basalelement->nodes[i]->Sid(),0.,INS_VAL);

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h ¶

@@ -116 +116 @@
         HydrologydcEplPorosityEnum,
         HydrologydcEplInitialThicknessEnum,
+        HydrologydcEplMaxThicknessEnum,
         HydrologydcEplThicknessEnum,
         HydrologydcEplThicknessOldEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp ¶

@@ -124 +124 @@
                 case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity";
                 case HydrologydcEplInitialThicknessEnum : return "HydrologydcEplInitialThickness";
+                case HydrologydcEplMaxThicknessEnum : return "HydrologydcEplMaxThickness";
                 case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness";
                 case HydrologydcEplThicknessOldEnum : return "HydrologydcEplThicknessOld";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp ¶

@@ -124 +124 @@
               else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum;
               else if (strcmp(name,"HydrologydcEplInitialThickness")==0) return HydrologydcEplInitialThicknessEnum;
+              else if (strcmp(name,"HydrologydcEplMaxThickness")==0) return HydrologydcEplMaxThicknessEnum;
               else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum;
               else if (strcmp(name,"HydrologydcEplThicknessOld")==0) return HydrologydcEplThicknessOldEnum;
@@ -136 +137 @@
               else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
               else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum;
-              else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum;
+              if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum;
+              else if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum;
               else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum;
               else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
@@ -259 +260 @@
               else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
               else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;
-              else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
+              if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
+              else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
               else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
               else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
@@ -382 +383 @@
               else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
               else if (strcmp(name,"FSpressure")==0) return FSpressureEnum;
-              else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"Loads")==0) return LoadsEnum;
+              if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
+              else if (strcmp(name,"Loads")==0) return LoadsEnum;
               else if (strcmp(name,"Materials")==0) return MaterialsEnum;
               else if (strcmp(name,"Nodes")==0) return NodesEnum;
@@ -505 +506 @@
               else if (strcmp(name,"Vx")==0) return VxEnum;
               else if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
-              else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Vy")==0) return VyEnum;
+              if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
+              else if (strcmp(name,"Vy")==0) return VyEnum;
               else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
               else if (strcmp(name,"Vz")==0) return VzEnum;
@@ -628 +629 @@
               else if (strcmp(name,"QmuMaskGroundediceLevelset")==0) return QmuMaskGroundediceLevelsetEnum;
               else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
-              else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
+              if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;
+              else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;
               else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum;
               else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;

issm/trunk-jpl/src/m/enum/EnumDefinitions.py ¶

@@ -116 +116 @@
 def HydrologydcEplPorosityEnum(): return StringToEnum("HydrologydcEplPorosity")[0]
 def HydrologydcEplInitialThicknessEnum(): return StringToEnum("HydrologydcEplInitialThickness")[0]
+def HydrologydcEplMaxThicknessEnum(): return StringToEnum("HydrologydcEplMaxThickness")[0]
 def HydrologydcEplThicknessEnum(): return StringToEnum("HydrologydcEplThickness")[0]
 def HydrologydcEplThicknessOldEnum(): return StringToEnum("HydrologydcEplThicknessOld")[0]