Changeset 14577

Timestamp:

04/15/13 13:54:09 (12 years ago)

Author:

bdef

Message:

BUG: fixing typo for Hydrological enums

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (5 diffs)
• c/solutions/hydrology_core.cpp (modified) (1 diff)
• m/classes/initialization.m (modified) (4 diffs)
• m/classes/initialization.py (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/HydrologyCREnum.m (deleted)
• m/enum/HydrologyKnEnum.m (deleted)
• m/enum/HydrologyNEnum.m (deleted)
• m/enum/HydrologyPEnum.m (deleted)
• m/enum/HydrologyQEnum.m (deleted)
• m/enum/HydrologySpcwatercolumnEnum.m (deleted)
• m/enum/HydrologyStabilizationEnum.m (deleted)
• m/enum/HydrologydcSedimentPorosityEnum.m (added)
• m/enum/HydrologydcSpcsedimentHeadEnum.m (added)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)
• m/enum/SedimentheadEnum.m (deleted)
• m/enum/WaterpressureEnum.m (deleted)

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

@@ -89 +89 @@
         HydrologyshreveStabilizationEnum,
         HydrologydcEnum,
-        SedimentheadEnum,
-        WaterpressureEnum,
+        SedimentHeadEnum,
         HydrologydcSpcsedimentHeadEnum,
         HydrologydcSedimentCompressibilityEnum,

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -94 +94 @@
                 case HydrologyshreveStabilizationEnum : return "HydrologyshreveStabilization";
                 case HydrologydcEnum : return "Hydrologydc";
-                case SedimentheadEnum : return "Sedimenthead";
-                case WaterpressureEnum : return "Waterpressure";
+                case SedimentHeadEnum : return "SedimentHead";
                 case HydrologydcSpcsedimentHeadEnum : return "HydrologydcSpcsedimentHead";
                 case HydrologydcSedimentCompressibilityEnum : return "HydrologydcSedimentCompressibility";

issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp

@@ -47 +47 @@
         }
         else if(hydrology_model==HydrologydcEnum){
-                iomodel->FetchDataToInput(elements,SedimentheadEnum);
+                iomodel->FetchDataToInput(elements,SedimentHeadEnum);
         }
         else{

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

@@ -95 +95 @@
               else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum;
               else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
-              else if (strcmp(name,"Sedimenthead")==0) return SedimentheadEnum;
-              else if (strcmp(name,"Waterpressure")==0) return WaterpressureEnum;
+              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
               else if (strcmp(name,"HydrologydcSpcsedimentHead")==0) return HydrologydcSpcsedimentHeadEnum;
               else if (strcmp(name,"HydrologydcSedimentCompressibility")==0) return HydrologydcSedimentCompressibilityEnum;
@@ -138 +137 @@
               else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
               else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum;
+              else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
-              else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
+              if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
               else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum;
               else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum;
@@ -261 +260 @@
               else if (strcmp(name,"DiagnosticHorizAnalysis")==0) return DiagnosticHorizAnalysisEnum;
               else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum;
+              else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum;
-              else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum;
+              if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum;
               else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
               else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum;
@@ -384 +383 @@
               else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;
               else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
+              else if (strcmp(name,"Misfit")==0) return MisfitEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"Misfit")==0) return MisfitEnum;
-              else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum;
+              if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum;
               else if (strcmp(name,"Pressure")==0) return PressureEnum;
               else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
@@ -507 +506 @@
               else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
               else if (strcmp(name,"Fset")==0) return FsetEnum;
+              else if (strcmp(name,"Gradient1")==0) return Gradient1Enum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Gradient1")==0) return Gradient1Enum;
-              else if (strcmp(name,"Gradient2")==0) return Gradient2Enum;
+              if (strcmp(name,"Gradient2")==0) return Gradient2Enum;
               else if (strcmp(name,"Gradient3")==0) return Gradient3Enum;
               else if (strcmp(name,"Gradient")==0) return GradientEnum;

issm/trunk-jpl/src/c/solutions/hydrology_core.cpp

@@ -84 +84 @@
                         if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
                                 if(VerboseSolution()) _pprintLine_("   saving results ");
-                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentheadEnum);
+                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadEnum);
 
                                 /*unload results*/

issm/trunk-jpl/src/m/classes/initialization.m

@@ -16 +16 @@
                 waterfraction  = NaN;
                 sediment_head  = NaN;
-                water_pressure = NaN;
                 watercolumn    = NaN;
         end
@@ -62 +61 @@
                                 if isa(md.hydrology,'hydrologydc'),
                                         md = checkfield(md,'initialization.sediment_head','NaN',1,'size',[md.mesh.numberofvertices 1]);
-                                        md = checkfield(md,'initialization.water_pressure','NaN',1,'size',[md.mesh.numberofvertices 1]);
                                 else
                                         md = checkfield(md,'initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices 1]);
@@ -81 +79 @@
                         fielddisplay(obj,'waterfraction','fraction of water in the ice');
                         fielddisplay(obj,'sediment_head','sediment water head of subglacial system (meters)');
-                        fielddisplay(obj,'water_pressure','pressure due to the sediment water head (Pa)');
                         fielddisplay(obj,'watercolumn','thickness of subglacial water');
 
@@ -93 +90 @@
                         WriteData(fid,'data',obj.waterfraction,'format','DoubleMat','mattype',1,'enum',WaterfractionEnum);
                         WriteData(fid,'data',obj.sediment_head,'format','DoubleMat','mattype',1,'enum',SedimentHeadEnum);
-                        WriteData(fid,'data',obj.water_pressure,'format','DoubleMat','mattype',1,'enum',WaterPressureEnum);
                         WriteData(fid,'data',obj.watercolumn,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum);
                 end % }}}

issm/trunk-jpl/src/m/classes/initialization.py

@@ -96 +96 @@
                 WriteData(fid,'data',self.watercolumn,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum())
                 WriteData(fid,'data',self.sediment_head,'format','DoubleMat','mattype',1,'enum',SedimentHeadEnum())
-                WriteData(fid,'data',self.water_pressure,'format','DoubleMat','mattype',1,'enum',WaterPressureEnum())
         # }}}
 

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

@@ -779 +779 @@
         return StringToEnum('Hydrologydc')[0]
 
-def SedimentheadEnum():
-        """
-        SEDIMENTHEADENUM - Enum of Sedimenthead
-
-           Usage:
-              macro=SedimentheadEnum()
-        """
-
-        return StringToEnum('Sedimenthead')[0]
-
-def WaterpressureEnum():
-        """
-        WATERPRESSUREENUM - Enum of Waterpressure
-
-           Usage:
-              macro=WaterpressureEnum()
-        """
-
-        return StringToEnum('Waterpressure')[0]
+def SedimentHeadEnum():
+        """
+        SEDIMENTHEADENUM - Enum of SedimentHead
+
+           Usage:
+              macro=SedimentHeadEnum()
+        """
+
+        return StringToEnum('SedimentHead')[0]
 
 def HydrologydcSpcsedimentHeadEnum():
@@ -5197 +5187 @@
         """
 
-        return 518
-
+        return 517
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=518;
+macro=517;