Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9616) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9617) @@ -24,4 +24,10 @@ FrictionPEnum, FrictionQEnum, + HydrologySpcwatercolumnEnum, + HydrologyKnEnum, + HydrologyNEnum, + HydrologyPEnum, + HydrologyQEnum, + HydrologyCREnum, /*}}}*/ /*Datasets {{{1*/ @@ -406,5 +412,4 @@ NumControlTypeEnum, SpcvyEnum, - HydroQEnum, NodeOnWaterEnum, YEnum, @@ -413,8 +418,6 @@ PrognosticDGEnum, PressureloadEnum, - HydroCREnum, NameEnum, VerticesTypeEnum, - HydroKnEnum, SpcvzEnum, NumberOfNodes2DEnum, @@ -428,5 +431,4 @@ SpcvxEnum, UpperelementsEnum, - HydroPEnum, NodeOnPattynEnum, EdgesEnum, @@ -436,7 +438,5 @@ NodeOnMacayealEnum, ElementconnectivityEnum, - SpcwatercolumnEnum, ArtificialDiffusivityEnum, - HydroNEnum, NumlayersEnum, DiagnosticRefEnum, Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9616) +++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9617) @@ -28,4 +28,10 @@ case FrictionPEnum : return "FrictionP"; case FrictionQEnum : return "FrictionQ"; + case HydrologySpcwatercolumnEnum : return "HydrologySpcwatercolumn"; + case HydrologyKnEnum : return "HydrologyKn"; + case HydrologyNEnum : return "HydrologyN"; + case HydrologyPEnum : return "HydrologyP"; + case HydrologyQEnum : return "HydrologyQ"; + case HydrologyCREnum : return "HydrologyCR"; case ConstraintsEnum : return "Constraints"; case ElementsEnum : return "Elements"; @@ -347,5 +353,4 @@ case NumControlTypeEnum : return "NumControlType"; case SpcvyEnum : return "Spcvy"; - case HydroQEnum : return "HydroQ"; case NodeOnWaterEnum : return "NodeOnWater"; case YEnum : return "Y"; @@ -354,8 +359,6 @@ case PrognosticDGEnum : return "PrognosticDG"; case PressureloadEnum : return "Pressureload"; - case HydroCREnum : return "HydroCR"; case NameEnum : return "Name"; case VerticesTypeEnum : return "VerticesType"; - case HydroKnEnum : return "HydroKn"; case SpcvzEnum : return "Spcvz"; case NumberOfNodes2DEnum : return "NumberOfNodes2D"; @@ -369,5 +372,4 @@ case SpcvxEnum : return "Spcvx"; case UpperelementsEnum : return "Upperelements"; - case HydroPEnum : return "HydroP"; case NodeOnPattynEnum : return "NodeOnPattyn"; case EdgesEnum : return "Edges"; @@ -377,7 +379,5 @@ case NodeOnMacayealEnum : return "NodeOnMacayeal"; case ElementconnectivityEnum : return "Elementconnectivity"; - case SpcwatercolumnEnum : return "Spcwatercolumn"; case ArtificialDiffusivityEnum : return "ArtificialDiffusivity"; - case HydroNEnum : return "HydroN"; case NumlayersEnum : return "Numlayers"; case DiagnosticRefEnum : return "DiagnosticRef"; Index: /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp (revision 9616) +++ /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp (revision 9617) @@ -22,5 +22,5 @@ /*Create constraints if they do not exist yet*/ if(!constraints) constraints = new Constraints(ConstraintsEnum); - IoModelToConstraintsx(constraints,iomodel,SpcwatercolumnEnum,HydrologyAnalysisEnum); + IoModelToConstraintsx(constraints,iomodel,HydrologySpcwatercolumnEnum,HydrologyAnalysisEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9616) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9617) @@ -26,4 +26,10 @@ else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; + else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum; + 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,"HydrologyCR")==0) return HydrologyCREnum; else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; else if (strcmp(name,"Elements")==0) return ElementsEnum; @@ -345,5 +351,4 @@ else if (strcmp(name,"NumControlType")==0) return NumControlTypeEnum; else if (strcmp(name,"Spcvy")==0) return SpcvyEnum; - else if (strcmp(name,"HydroQ")==0) return HydroQEnum; else if (strcmp(name,"NodeOnWater")==0) return NodeOnWaterEnum; else if (strcmp(name,"Y")==0) return YEnum; @@ -352,8 +357,6 @@ else if (strcmp(name,"PrognosticDG")==0) return PrognosticDGEnum; else if (strcmp(name,"Pressureload")==0) return PressureloadEnum; - else if (strcmp(name,"HydroCR")==0) return HydroCREnum; else if (strcmp(name,"Name")==0) return NameEnum; else if (strcmp(name,"VerticesType")==0) return VerticesTypeEnum; - else if (strcmp(name,"HydroKn")==0) return HydroKnEnum; else if (strcmp(name,"Spcvz")==0) return SpcvzEnum; else if (strcmp(name,"NumberOfNodes2D")==0) return NumberOfNodes2DEnum; @@ -367,5 +370,4 @@ else if (strcmp(name,"Spcvx")==0) return SpcvxEnum; else if (strcmp(name,"Upperelements")==0) return UpperelementsEnum; - else if (strcmp(name,"HydroP")==0) return HydroPEnum; else if (strcmp(name,"NodeOnPattyn")==0) return NodeOnPattynEnum; else if (strcmp(name,"Edges")==0) return EdgesEnum; @@ -375,7 +377,5 @@ else if (strcmp(name,"NodeOnMacayeal")==0) return NodeOnMacayealEnum; else if (strcmp(name,"Elementconnectivity")==0) return ElementconnectivityEnum; - else if (strcmp(name,"Spcwatercolumn")==0) return SpcwatercolumnEnum; else if (strcmp(name,"ArtificialDiffusivity")==0) return ArtificialDiffusivityEnum; - else if (strcmp(name,"HydroN")==0) return HydroNEnum; else if (strcmp(name,"Numlayers")==0) return NumlayersEnum; else if (strcmp(name,"DiagnosticRef")==0) return DiagnosticRefEnum; Index: /issm/trunk/src/c/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 9616) +++ /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 9617) @@ -38,9 +38,9 @@ iomodel->Constant(&this->g,ConstantsGEnum); - iomodel->Constant(&this->kn,HydroKnEnum); - iomodel->Constant(&this->hydro_p,HydroPEnum); - iomodel->Constant(&this->hydro_q,HydroQEnum); - iomodel->Constant(&this->hydro_CR,HydroCREnum); - iomodel->Constant(&this->hydro_n,HydroNEnum); + 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); } /*}}}1*/ @@ -362,21 +362,21 @@ } /*}}}1*/ -/*FUNCTION Matpar::GetHydroP {{{1*/ -double Matpar::GetHydroP(){ +/*FUNCTION Matpar::GetHydrologyP {{{1*/ +double Matpar::GetHydrologyP(){ return hydro_p; } /*}}}1*/ -/*FUNCTION Matqar::GetHydroQ {{{1*/ -double Matpar::GetHydroQ(){ +/*FUNCTION Matqar::GetHydrologyQ {{{1*/ +double Matpar::GetHydrologyQ(){ return hydro_q; } /*}}}1*/ -/*FUNCTION Matpar::GetHydroCR {{{1*/ -double Matpar::GetHydroCR(){ +/*FUNCTION Matpar::GetHydrologyCR {{{1*/ +double Matpar::GetHydrologyCR(){ return hydro_CR; } /*}}}1*/ -/*FUNCTION Matpar::GetHydroN {{{1*/ -double Matpar::GetHydroN(){ +/*FUNCTION Matpar::GetHydrologyN {{{1*/ +double Matpar::GetHydrologyN(){ return hydro_n; } Index: /issm/trunk/src/c/objects/Materials/Matpar.h =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.h (revision 9616) +++ /issm/trunk/src/c/objects/Materials/Matpar.h (revision 9617) @@ -82,8 +82,8 @@ double GetReferenceTemperature(); double GetKn(); - double GetHydroP(); - double GetHydroQ(); - double GetHydroCR(); - double GetHydroN(); + double GetHydrologyP(); + double GetHydrologyQ(); + double GetHydrologyCR(); + double GetHydrologyN(); double TMeltingPoint(double pressure); double PureIceEnthalpy(double pressure); Index: /issm/trunk/src/m/classes/hydrology.m =================================================================== --- /issm/trunk/src/m/classes/hydrology.m (revision 9617) +++ /issm/trunk/src/m/classes/hydrology.m (revision 9617) @@ -0,0 +1,48 @@ +%HYDROLOGY class definition +% +% Usage: +% hydrology=hydrology(); + +classdef hydrology + properties (SetAccess=public) + spcwatercolumn = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); + n = modelfield('default',0,'marshall',true,'format','Double'); + CR = modelfield('default',0,'marshall',true,'format','Double'); + p = modelfield('default',0,'marshall',true,'format','Double'); + q = modelfield('default',0,'marshall',true,'format','Double'); + kn = modelfield('default',0,'marshall',true,'format','Double'); + end + methods + function obj = hydrology(varargin) % {{{ + switch nargin + case 0 + obj=setdefaultparameters(obj); + case 1 + in=varargin{1}; + if (isa(in,'numeric') & in==0), + % requesting templates do nothing + else + error('constructor not supported'); + end + otherwise + error('constructor not supported'); + end + end % }}} + function obj = setdefaultparameters(obj) % {{{ + + %first, use the defaults provided by the properties definition above. + fieldnames=fields(obj); + for i=1:length(fieldnames), + fieldname=fieldnames{i}; + obj.(fieldname)=obj.(fieldname).default; + end + + %Parameters from Johnson's 2002 thesis, section 3.5.4 + obj.n=.02; + obj.CR=2; + obj.p=2; + obj.q=1; + obj.kn=0; + end % }}} + end +end Index: /issm/trunk/src/m/classes/model/model.m =================================================================== --- /issm/trunk/src/m/classes/model/model.m (revision 9616) +++ /issm/trunk/src/m/classes/model/model.m (revision 9617) @@ -19,4 +19,5 @@ friction = modelfield('default',0,'marshall',true); private = modelfield('default',0,'marshall',false); + hydrology = modelfield('default',0,'marshall',true); %FIXME: all other fields should belong to other classes @@ -145,5 +146,4 @@ spctemperature = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); spcthickness = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - spcwatercolumn = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); diagnostic_ref = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); @@ -208,11 +208,4 @@ watercolumn = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - %Hydrology - hydro_n = modelfield('default',0,'marshall',true,'format','Double'); - hydro_CR = modelfield('default',0,'marshall',true,'format','Double'); - hydro_p = modelfield('default',0,'marshall',true,'format','Double'); - hydro_q = modelfield('default',0,'marshall',true,'format','Double'); - hydro_kn = modelfield('default',0,'marshall',true,'format','Double'); - %Parallelisation outlog = modelfield('default','','marshall',false); @@ -546,4 +539,5 @@ md.friction=friction; md.private=private; + md.hydrology=hydrology; %Materials parameters @@ -722,12 +716,4 @@ %0 to desactivate md.waitonlock=Inf; - - %hydrology: from Johnson's 2002 thesis, section 3.5.4 - md.hydro_n=.02; - md.hydro_CR=2; - md.hydro_p=2; - md.hydro_q=1; - md.hydro_kn=0; - %Rheology law: what is the temperature dependence of B with T Index: sm/trunk/src/m/enum/HydroCREnum.m =================================================================== --- /issm/trunk/src/m/enum/HydroCREnum.m (revision 9616) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydroCREnum() -%HYDROCRENUM - Enum of HydroCR -% -% 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=HydroCREnum() - -macro=StringToEnum('HydroCR'); Index: sm/trunk/src/m/enum/HydroKnEnum.m =================================================================== --- /issm/trunk/src/m/enum/HydroKnEnum.m (revision 9616) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydroKnEnum() -%HYDROKNENUM - Enum of HydroKn -% -% 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=HydroKnEnum() - -macro=StringToEnum('HydroKn'); Index: sm/trunk/src/m/enum/HydroNEnum.m =================================================================== --- /issm/trunk/src/m/enum/HydroNEnum.m (revision 9616) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydroNEnum() -%HYDRONENUM - Enum of HydroN -% -% 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=HydroNEnum() - -macro=StringToEnum('HydroN'); Index: sm/trunk/src/m/enum/HydroPEnum.m =================================================================== --- /issm/trunk/src/m/enum/HydroPEnum.m (revision 9616) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydroPEnum() -%HYDROPENUM - Enum of HydroP -% -% 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=HydroPEnum() - -macro=StringToEnum('HydroP'); Index: sm/trunk/src/m/enum/HydroQEnum.m =================================================================== --- /issm/trunk/src/m/enum/HydroQEnum.m (revision 9616) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydroQEnum() -%HYDROQENUM - Enum of HydroQ -% -% 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=HydroQEnum() - -macro=StringToEnum('HydroQ'); Index: /issm/trunk/src/m/enum/HydrologyCREnum.m =================================================================== --- /issm/trunk/src/m/enum/HydrologyCREnum.m (revision 9617) +++ /issm/trunk/src/m/enum/HydrologyCREnum.m (revision 9617) @@ -0,0 +1,11 @@ +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: /issm/trunk/src/m/enum/HydrologyKnEnum.m =================================================================== --- /issm/trunk/src/m/enum/HydrologyKnEnum.m (revision 9617) +++ /issm/trunk/src/m/enum/HydrologyKnEnum.m (revision 9617) @@ -0,0 +1,11 @@ +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: /issm/trunk/src/m/enum/HydrologyNEnum.m =================================================================== --- /issm/trunk/src/m/enum/HydrologyNEnum.m (revision 9617) +++ /issm/trunk/src/m/enum/HydrologyNEnum.m (revision 9617) @@ -0,0 +1,11 @@ +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: /issm/trunk/src/m/enum/HydrologyPEnum.m =================================================================== --- /issm/trunk/src/m/enum/HydrologyPEnum.m (revision 9617) +++ /issm/trunk/src/m/enum/HydrologyPEnum.m (revision 9617) @@ -0,0 +1,11 @@ +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: /issm/trunk/src/m/enum/HydrologyQEnum.m =================================================================== --- /issm/trunk/src/m/enum/HydrologyQEnum.m (revision 9617) +++ /issm/trunk/src/m/enum/HydrologyQEnum.m (revision 9617) @@ -0,0 +1,11 @@ +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: /issm/trunk/src/m/enum/HydrologySpcwatercolumnEnum.m =================================================================== --- /issm/trunk/src/m/enum/HydrologySpcwatercolumnEnum.m (revision 9617) +++ /issm/trunk/src/m/enum/HydrologySpcwatercolumnEnum.m (revision 9617) @@ -0,0 +1,11 @@ +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/src/m/enum/SpcwatercolumnEnum.m =================================================================== --- /issm/trunk/src/m/enum/SpcwatercolumnEnum.m (revision 9616) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=SpcwatercolumnEnum() -%SPCWATERCOLUMNENUM - Enum of Spcwatercolumn -% -% 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=SpcwatercolumnEnum() - -macro=StringToEnum('Spcwatercolumn'); Index: /issm/trunk/src/m/model/ismodelselfconsistent.m =================================================================== --- /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9616) +++ /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9617) @@ -471,5 +471,5 @@ case HydrologyAnalysisEnum, % {{{2 - fields={'spcwatercolumn'}; + fields={'hydrology.spcwatercolumn'}; checkforcing(md,fields); fields={'watercolumn'}; Index: /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (revision 9616) +++ /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (revision 9617) @@ -52,7 +52,7 @@ end -md.spcwatercolumn=zeros(md.numberofnodes,2); +md.hydrology.spcwatercolumn=zeros(md.numberofnodes,2); pos=find(md.nodeonboundary); -md.spcwatercolumn(pos,1)=1; +md.hydrology.spcwatercolumn(pos,1)=1; %segment on Neumann (Ice Front)