Index: /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14554) +++ /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14555) @@ -79,11 +79,11 @@ FrictionQEnum, GeometryHydrostaticRatioEnum, - HydrologyCREnum, - HydrologyKnEnum, - HydrologyNEnum, - HydrologyPEnum, - HydrologyQEnum, - HydrologySpcwatercolumnEnum, - HydrologyStabilizationEnum, + HydrologyshreveCREnum, + HydrologyshreveKnEnum, + HydrologyshreveNEnum, + HydrologyshrevePEnum, + HydrologyshreveQEnum, + HydrologyshreveSpcwatercolumnEnum, + HydrologyshreveStabilizationEnum, IndependentObjectEnum, InversionControlParametersEnum, Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 14554) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 14555) @@ -5694,5 +5694,5 @@ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); - this->parameters->FindParam(&diffusivity,HydrologyStabilizationEnum); + this->parameters->FindParam(&diffusivity,HydrologyshreveStabilizationEnum); Input* vx_input=inputs->GetInput(HydrologyWaterVxEnum); _assert_(vx_input); Input* vy_input=inputs->GetInput(HydrologyWaterVyEnum); _assert_(vy_input); Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 14554) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 14555) @@ -40,9 +40,9 @@ iomodel->Constant(&this->g,ConstantsGEnum); - iomodel->Constant(&this->hydro_CR,HydrologyCREnum); - iomodel->Constant(&this->kn,HydrologyKnEnum); - iomodel->Constant(&this->hydro_n,HydrologyNEnum); - iomodel->Constant(&this->hydro_p,HydrologyPEnum); - iomodel->Constant(&this->hydro_q,HydrologyQEnum); + iomodel->Constant(&this->hydro_CR,HydrologyshreveCREnum); + iomodel->Constant(&this->kn,HydrologyshreveKnEnum); + iomodel->Constant(&this->hydro_n,HydrologyshreveNEnum); + iomodel->Constant(&this->hydro_p,HydrologyshrevePEnum); + iomodel->Constant(&this->hydro_q,HydrologyshreveQEnum); this->inputs=NULL; /*not used here*/ } Index: /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14554) +++ /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14555) @@ -84,11 +84,11 @@ case FrictionQEnum : return "FrictionQ"; case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio"; - case HydrologyCREnum : return "HydrologyCR"; - case HydrologyKnEnum : return "HydrologyKn"; - case HydrologyNEnum : return "HydrologyN"; - case HydrologyPEnum : return "HydrologyP"; - case HydrologyQEnum : return "HydrologyQ"; - case HydrologySpcwatercolumnEnum : return "HydrologySpcwatercolumn"; - case HydrologyStabilizationEnum : return "HydrologyStabilization"; + case HydrologyshreveCREnum : return "HydrologyCR"; + case HydrologyshreveKnEnum : return "HydrologyKn"; + case HydrologyshreveNEnum : return "HydrologyN"; + case HydrologyshrevePEnum : return "HydrologyP"; + case HydrologyshreveQEnum : return "HydrologyQ"; + case HydrologyshreveSpcwatercolumnEnum : return "HydrologySpcwatercolumn"; + case HydrologyshreveStabilizationEnum : return "HydrologyStabilization"; case IndependentObjectEnum : return "IndependentObject"; case InversionControlParametersEnum : return "InversionControlParameters"; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 14554) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 14555) @@ -76,5 +76,5 @@ parameters->AddObject(iomodel->CopyConstantObject(ConstantsReferencetemperatureEnum)); parameters->AddObject(iomodel->CopyConstantObject(BalancethicknessStabilizationEnum)); - parameters->AddObject(iomodel->CopyConstantObject(HydrologyStabilizationEnum)); + parameters->AddObject(iomodel->CopyConstantObject(HydrologyshreveStabilizationEnum)); parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMeltingRateEnum)); parameters->AddObject(iomodel->CopyConstantObject(ThermalMaxiterEnum)); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp (revision 14554) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp (revision 14555) @@ -19,5 +19,5 @@ /*Create constraints if they do not exist yet*/ if(!constraints) constraints = new Constraints(); - IoModelToConstraintsx(constraints,iomodel,HydrologySpcwatercolumnEnum,HydrologyAnalysisEnum); + IoModelToConstraintsx(constraints,iomodel,HydrologyshreveSpcwatercolumnEnum,HydrologyAnalysisEnum); /*Assign output pointer: */ Index: /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14554) +++ /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14555) @@ -85,11 +85,11 @@ else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum; - else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum; - else if (strcmp(name,"HydrologyKn")==0) return HydrologyKnEnum; - else if (strcmp(name,"HydrologyN")==0) return HydrologyNEnum; - else if (strcmp(name,"HydrologyP")==0) return HydrologyPEnum; - else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum; - else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum; - else if (strcmp(name,"HydrologyStabilization")==0) return HydrologyStabilizationEnum; + else if (strcmp(name,"HydrologyshreveCR")==0) return HydrologyshreveCREnum; + else if (strcmp(name,"HydrologyshreveKn")==0) return HydrologyshreveKnEnum; + else if (strcmp(name,"HydrologyshreveN")==0) return HydrologyshreveNEnum; + else if (strcmp(name,"HydrologyshreveP")==0) return HydrologyshrevePEnum; + else if (strcmp(name,"HydrologyshreveQ")==0) return HydrologyshreveQEnum; + else if (strcmp(name,"HydrologyshreveSpcwatercolumn")==0) return HydrologyshreveSpcwatercolumnEnum; + else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum; else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum; else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum; Index: sm/trunk-jpl/src/m/classes/hydrology.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrology.m (revision 14554) +++ (revision ) @@ -1,67 +1,0 @@ -%HYDROLOGY class definition -% -% Usage: -% hydrology=hydrology(); - -classdef hydrology - properties (SetAccess=public) - spcwatercolumn = NaN; - n = 0; - CR = 0; - p = 0; - q = 0; - kn = 0; - stabilization = 0; - end - methods - function obj = hydrology(varargin) % {{{ - switch nargin - case 0 - obj=setdefaultparameters(obj); - otherwise - error('constructor not supported'); - end - end % }}} - function obj = setdefaultparameters(obj) % {{{ - - %Parameters from Johnson's 2002 thesis, section 3.5.4 - obj.n=.02; - obj.CR=.01; - obj.p=2; - obj.q=1; - obj.kn=0; - - %Type of stabilization to use 0:nothing 1:artificial_diffusivity - obj.stabilization=1; - end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ - - %Early return - if ~ismember(HydrologyAnalysisEnum(),analyses), return; end - - md = checkfield(md,'hydrology.spcwatercolumn','forcing',1); - md = checkfield(md,'hydrology.stabilization','>=',0); - end % }}} - function disp(obj) % {{{ - disp(sprintf(' hydrology solution parameters:')); - - fielddisplay(obj,'spcwatercolumn','water thickness constraints (NaN means no constraint)'); - fielddisplay(obj,'n','Manning roughness coefficient'); - fielddisplay(obj,'CR','tortuosity parameter'); - fielddisplay(obj,'p','dimensionless exponent in Manning velocity formula'); - fielddisplay(obj,'q','dimensionless exponent in Manning velocity formula'); - fielddisplay(obj,'kn','parameter in effective pressure formula'); - fielddisplay(obj,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.'); - - end % }}} - function marshall(obj,fid) % {{{ - WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','n','format','Double'); - WriteData(fid,'object',obj,'fieldname','CR','format','Double'); - WriteData(fid,'object',obj,'fieldname','p','format','Double'); - WriteData(fid,'object',obj,'fieldname','q','format','Double'); - WriteData(fid,'object',obj,'fieldname','kn','format','Double'); - WriteData(fid,'object',obj,'fieldname','stabilization','format','Double'); - end % }}} - end -end Index: sm/trunk-jpl/src/m/classes/hydrology.py =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrology.py (revision 14554) +++ (revision ) @@ -1,81 +1,0 @@ -#module imports -from fielddisplay import fielddisplay -from EnumDefinitions import * -from checkfield import * -from WriteData import * - -class hydrology(object): - """ - HYDROLOGY class definition - - Usage: - hydrology=hydrology(); - """ - - #properties - def __init__(self): - # {{{ Properties - self.spcwatercolumn = float('NaN') - self.n = 0 - self.CR = 0 - self.p = 0 - self.q = 0 - self.kn = 0 - self.stabilization = 0 - - #set defaults - self.setdefaultparameters() - - #}}} - def __repr__(self): - # {{{ Display - - string=' hydrology solution parameters:' - string="%s\n%s"%(string,fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint)')) - string="%s\n%s"%(string,fielddisplay(self,'n','Manning roughness coefficient')) - string="%s\n%s"%(string,fielddisplay(self,'CR','tortuosity parameter')) - string="%s\n%s"%(string,fielddisplay(self,'p','dimensionless exponent in Manning velocity formula')) - string="%s\n%s"%(string,fielddisplay(self,'q','dimensionless exponent in Manning velocity formula')) - string="%s\n%s"%(string,fielddisplay(self,'kn','parameter in effective pressure formula')) - string="%s\n%s"%(string,fielddisplay(self,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.')) - return string - #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters - - #Parameters from Johnson's 2002 thesis, section 3.5.4 - self.n=.02 - self.CR=.01 - self.p=2 - self.q=1 - self.kn=0 - - #Type of stabilization to use 0:nothing 1:artificial_diffusivity - self.stabilization=1 - - return self - #}}} - - def checkconsistency(self,md,solution,analyses): # {{{ - - #Early return - if HydrologyAnalysisEnum() not in analyses: - return md - - md = checkfield(md,'hydrology.spcwatercolumn','forcing',1) - md = checkfield(md,'hydrology.stabilization','>=',0) - - return md - # }}} - - def marshall(self,fid): # {{{ - WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1) - WriteData(fid,'object',self,'fieldname','n','format','Double') - WriteData(fid,'object',self,'fieldname','CR','format','Double') - WriteData(fid,'object',self,'fieldname','p','format','Double') - WriteData(fid,'object',self,'fieldname','q','format','Double') - WriteData(fid,'object',self,'fieldname','kn','format','Double') - WriteData(fid,'object',self,'fieldname','stabilization','format','Double') - # }}} - Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyshreve.m (revision 14555) +++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.m (revision 14555) @@ -0,0 +1,67 @@ +%HYDROLOGYSHREVE class definition +% +% Usage: +% hydrologyshreve=hydrologyshreve(); + +classdef hydrologyshreve + properties (SetAccess=public) + spcwatercolumn = NaN; + n = 0; + CR = 0; + p = 0; + q = 0; + kn = 0; + stabilization = 0; + end + methods + function obj = hydrologyshreve(varargin) % {{{ + switch nargin + case 0 + obj=setdefaultparameters(obj); + otherwise + error('constructor not supported'); + end + end % }}} + function obj = setdefaultparameters(obj) % {{{ + + %Parameters from Johnson's 2002 thesis, section 3.5.4 + obj.n = .02; + obj.CR = .01; + obj.p = 2; + obj.q = 1; + obj.kn = 0; + + %Type of stabilization to use 0:nothing 1:artificial_diffusivity + obj.stabilization=1; + end % }}} + function md = checkconsistency(obj,md,solution,analyses) % {{{ + + %Early return + if ~ismember(HydrologyAnalysisEnum(),analyses), return; end + + md = checkfield(md,'hydrology.spcwatercolumn','forcing',1); + md = checkfield(md,'hydrology.stabilization','>=',0); + end % }}} + function disp(obj) % {{{ + disp(sprintf(' hydrologyshreve solution parameters:')); + + fielddisplay(obj,'spcwatercolumn','water thickness constraints (NaN means no constraint)'); + fielddisplay(obj,'n','Manning roughness coefficient'); + fielddisplay(obj,'CR','tortuosity parameter'); + fielddisplay(obj,'p','dimensionless exponent in Manning velocity formula'); + fielddisplay(obj,'q','dimensionless exponent in Manning velocity formula'); + fielddisplay(obj,'kn','parameter in effective pressure formula'); + fielddisplay(obj,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.'); + + end % }}} + function marshall(obj,fid) % {{{ + WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'fieldname','n','format','Double'); + WriteData(fid,'object',obj,'fieldname','CR','format','Double'); + WriteData(fid,'object',obj,'fieldname','p','format','Double'); + WriteData(fid,'object',obj,'fieldname','q','format','Double'); + WriteData(fid,'object',obj,'fieldname','kn','format','Double'); + WriteData(fid,'object',obj,'fieldname','stabilization','format','Double'); + end % }}} + end +end Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.py =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyshreve.py (revision 14555) +++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.py (revision 14555) @@ -0,0 +1,81 @@ +#module imports +from fielddisplay import fielddisplay +from EnumDefinitions import * +from checkfield import * +from WriteData import * + +class hydrologyshreve(object): + """ + HYDROLOGYSHREVE class definition + + Usage: + hydrologyshreve=hydrologyshreve(); + """ + + #properties + def __init__(self): + # {{{ Properties + self.spcwatercolumn = float('NaN') + self.n = 0 + self.CR = 0 + self.p = 0 + self.q = 0 + self.kn = 0 + self.stabilization = 0 + + #set defaults + self.setdefaultparameters() + + #}}} + def __repr__(self): + # {{{ Display + + string=' hydrologyshreve solution parameters:' + string="%s\n%s"%(string,fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint)')) + string="%s\n%s"%(string,fielddisplay(self,'n','Manning roughness coefficient')) + string="%s\n%s"%(string,fielddisplay(self,'CR','tortuosity parameter')) + string="%s\n%s"%(string,fielddisplay(self,'p','dimensionless exponent in Manning velocity formula')) + string="%s\n%s"%(string,fielddisplay(self,'q','dimensionless exponent in Manning velocity formula')) + string="%s\n%s"%(string,fielddisplay(self,'kn','parameter in effective pressure formula')) + string="%s\n%s"%(string,fielddisplay(self,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.')) + return string + #}}} + + def setdefaultparameters(self): + # {{{setdefaultparameters + + #Parameters from Johnson's 2002 thesis, section 3.5.4 + self.n=.02 + self.CR=.01 + self.p=2 + self.q=1 + self.kn=0 + + #Type of stabilization to use 0:nothing 1:artificial_diffusivity + self.stabilization=1 + + return self + #}}} + + def checkconsistency(self,md,solution,analyses): # {{{ + + #Early return + if HydrologyAnalysisEnum() not in analyses: + return md + + md = checkfield(md,'hydrology.spcwatercolumn','forcing',1) + md = checkfield(md,'hydrology.stabilization','>=',0) + + return md + # }}} + + def marshall(self,fid): # {{{ + WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1) + WriteData(fid,'object',self,'fieldname','n','format','Double') + WriteData(fid,'object',self,'fieldname','CR','format','Double') + WriteData(fid,'object',self,'fieldname','p','format','Double') + WriteData(fid,'object',self,'fieldname','q','format','Double') + WriteData(fid,'object',self,'fieldname','kn','format','Double') + WriteData(fid,'object',self,'fieldname','stabilization','format','Double') + # }}} + Index: /issm/trunk-jpl/src/m/classes/model/model.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model/model.m (revision 14554) +++ /issm/trunk-jpl/src/m/classes/model/model.m (revision 14555) @@ -1089,5 +1089,5 @@ md.balancethickness = balancethickness(); md.diagnostic = diagnostic(); - md.hydrology = hydrology(); + md.hydrology = hydrologyshreve(); md.prognostic = prognostic(); md.thermal = thermal(); Index: /issm/trunk-jpl/src/m/classes/model/model.py =================================================================== --- /issm/trunk-jpl/src/m/classes/model/model.py (revision 14554) +++ /issm/trunk-jpl/src/m/classes/model/model.py (revision 14555) @@ -78,5 +78,5 @@ self.diagnostic = diagnostic() self.groundingline = groundingline() - self.hydrology = hydrology() + self.hydrology = hydrologyshreve() self.prognostic = prognostic() self.thermal = thermal()