Index: /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14576) +++ /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14577) @@ -89,6 +89,5 @@ HydrologyshreveStabilizationEnum, HydrologydcEnum, - SedimentheadEnum, - WaterpressureEnum, + SedimentHeadEnum, HydrologydcSpcsedimentHeadEnum, HydrologydcSedimentCompressibilityEnum, Index: /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14576) +++ /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14577) @@ -94,6 +94,5 @@ 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"; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (revision 14576) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (revision 14577) @@ -47,5 +47,5 @@ } else if(hydrology_model==HydrologydcEnum){ - iomodel->FetchDataToInput(elements,SedimentheadEnum); + iomodel->FetchDataToInput(elements,SedimentHeadEnum); } else{ Index: /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14576) +++ /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14577) @@ -95,6 +95,5 @@ 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,9 +137,9 @@ 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,9 +260,9 @@ 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,9 +383,9 @@ 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,9 +506,9 @@ 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; Index: /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 14576) +++ /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 14577) @@ -84,5 +84,5 @@ 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*/ Index: /issm/trunk-jpl/src/m/classes/initialization.m =================================================================== --- /issm/trunk-jpl/src/m/classes/initialization.m (revision 14576) +++ /issm/trunk-jpl/src/m/classes/initialization.m (revision 14577) @@ -16,5 +16,4 @@ waterfraction = NaN; sediment_head = NaN; - water_pressure = NaN; watercolumn = NaN; end @@ -62,5 +61,4 @@ 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,5 +79,4 @@ 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,5 +90,4 @@ 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 % }}} Index: /issm/trunk-jpl/src/m/classes/initialization.py =================================================================== --- /issm/trunk-jpl/src/m/classes/initialization.py (revision 14576) +++ /issm/trunk-jpl/src/m/classes/initialization.py (revision 14577) @@ -96,5 +96,4 @@ 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()) # }}} Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 14576) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 14577) @@ -779,23 +779,13 @@ 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,4 +5187,4 @@ """ - return 518 - + return 517 + Index: sm/trunk-jpl/src/m/enum/HydrologyCREnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologyCREnum.m (revision 14576) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydrologyCREnum() -%HYDROLOGYCRENUM - Enum of HydrologyCR -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=HydrologyCREnum() - -macro=StringToEnum('HydrologyCR'); Index: sm/trunk-jpl/src/m/enum/HydrologyKnEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologyKnEnum.m (revision 14576) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydrologyKnEnum() -%HYDROLOGYKNENUM - Enum of HydrologyKn -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=HydrologyKnEnum() - -macro=StringToEnum('HydrologyKn'); Index: sm/trunk-jpl/src/m/enum/HydrologyNEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologyNEnum.m (revision 14576) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydrologyNEnum() -%HYDROLOGYNENUM - Enum of HydrologyN -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=HydrologyNEnum() - -macro=StringToEnum('HydrologyN'); Index: sm/trunk-jpl/src/m/enum/HydrologyPEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologyPEnum.m (revision 14576) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydrologyPEnum() -%HYDROLOGYPENUM - Enum of HydrologyP -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=HydrologyPEnum() - -macro=StringToEnum('HydrologyP'); Index: sm/trunk-jpl/src/m/enum/HydrologyQEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologyQEnum.m (revision 14576) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydrologyQEnum() -%HYDROLOGYQENUM - Enum of HydrologyQ -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=HydrologyQEnum() - -macro=StringToEnum('HydrologyQ'); Index: sm/trunk-jpl/src/m/enum/HydrologySpcwatercolumnEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologySpcwatercolumnEnum.m (revision 14576) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydrologySpcwatercolumnEnum() -%HYDROLOGYSPCWATERCOLUMNENUM - Enum of HydrologySpcwatercolumn -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=HydrologySpcwatercolumnEnum() - -macro=StringToEnum('HydrologySpcwatercolumn'); Index: sm/trunk-jpl/src/m/enum/HydrologyStabilizationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologyStabilizationEnum.m (revision 14576) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydrologyStabilizationEnum() -%HYDROLOGYSTABILIZATIONENUM - Enum of HydrologyStabilization -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=HydrologyStabilizationEnum() - -macro=StringToEnum('HydrologyStabilization'); Index: /issm/trunk-jpl/src/m/enum/HydrologydcSedimentPorosityEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologydcSedimentPorosityEnum.m (revision 14577) +++ /issm/trunk-jpl/src/m/enum/HydrologydcSedimentPorosityEnum.m (revision 14577) @@ -0,0 +1,11 @@ +function macro=HydrologydcSedimentPorosityEnum() +%HYDROLOGYDCSEDIMENTPOROSITYENUM - Enum of HydrologydcSedimentPorosity +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=HydrologydcSedimentPorosityEnum() + +macro=StringToEnum('HydrologydcSedimentPorosity'); Index: /issm/trunk-jpl/src/m/enum/HydrologydcSpcsedimentHeadEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologydcSpcsedimentHeadEnum.m (revision 14577) +++ /issm/trunk-jpl/src/m/enum/HydrologydcSpcsedimentHeadEnum.m (revision 14577) @@ -0,0 +1,11 @@ +function macro=HydrologydcSpcsedimentHeadEnum() +%HYDROLOGYDCSPCSEDIMENTHEADENUM - Enum of HydrologydcSpcsedimentHead +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=HydrologydcSpcsedimentHeadEnum() + +macro=StringToEnum('HydrologydcSpcsedimentHead'); Index: /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 14576) +++ /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 14577) @@ -9,3 +9,3 @@ % macro=MaximumNumberOfEnums() -macro=518; +macro=517; Index: sm/trunk-jpl/src/m/enum/SedimentheadEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/SedimentheadEnum.m (revision 14576) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=SedimentheadEnum() -%SEDIMENTHEADENUM - Enum of Sedimenthead -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=SedimentheadEnum() - -macro=StringToEnum('Sedimenthead'); Index: sm/trunk-jpl/src/m/enum/WaterpressureEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/WaterpressureEnum.m (revision 14576) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=WaterpressureEnum() -%WATERPRESSUREENUM - Enum of Waterpressure -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=WaterpressureEnum() - -macro=StringToEnum('Waterpressure');