Changeset 9617

Timestamp:

Sep 6, 2011, 1:35:09 PM (15 years ago)

Author:

seroussi

Message:

added hydrology object

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (5 diffs)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (5 diffs)
• c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (5 diffs)
• c/objects/Materials/Matpar.cpp (modified) (2 diffs)
• c/objects/Materials/Matpar.h (modified) (1 diff)
• m/classes/hydrology.m (added)
• m/classes/model/model.m (modified) (5 diffs)
• m/enum/HydroCREnum.m (deleted)
• m/enum/HydroKnEnum.m (deleted)
• m/enum/HydroNEnum.m (deleted)
• m/enum/HydroPEnum.m (deleted)
• m/enum/HydroQEnum.m (deleted)
• m/enum/HydrologyCREnum.m (added)
• m/enum/HydrologyKnEnum.m (added)
• m/enum/HydrologyNEnum.m (added)
• m/enum/HydrologyPEnum.m (added)
• m/enum/HydrologyQEnum.m (added)
• m/enum/HydrologySpcwatercolumnEnum.m (added)
• m/enum/SpcwatercolumnEnum.m (deleted)
• m/model/ismodelselfconsistent.m (modified) (1 diff)
• m/utils/BC/SetMarineIceSheetBC.m (modified) (1 diff)

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

@@ -24 +24 @@
         FrictionPEnum,
         FrictionQEnum,
+        HydrologySpcwatercolumnEnum,
+        HydrologyKnEnum,
+        HydrologyNEnum,
+        HydrologyPEnum,
+        HydrologyQEnum,
+        HydrologyCREnum,
         /*}}}*/
         /*Datasets {{{1*/
@@ -406 +412 @@
         NumControlTypeEnum,
         SpcvyEnum,
-        HydroQEnum,
         NodeOnWaterEnum,
         YEnum,
@@ -413 +418 @@
         PrognosticDGEnum,
         PressureloadEnum,
-        HydroCREnum,
         NameEnum,
         VerticesTypeEnum,
-        HydroKnEnum,
         SpcvzEnum,
         NumberOfNodes2DEnum,
@@ -428 +431 @@
         SpcvxEnum,
         UpperelementsEnum,
-        HydroPEnum,
         NodeOnPattynEnum,
         EdgesEnum,
@@ -436 +438 @@
         NodeOnMacayealEnum,
         ElementconnectivityEnum,
-        SpcwatercolumnEnum,
         ArtificialDiffusivityEnum,
-        HydroNEnum,
         NumlayersEnum,
         DiagnosticRefEnum,

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

@@ -28 +28 @@
                 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 +353 @@
                 case NumControlTypeEnum : return "NumControlType";
                 case SpcvyEnum : return "Spcvy";
-                case HydroQEnum : return "HydroQ";
                 case NodeOnWaterEnum : return "NodeOnWater";
                 case YEnum : return "Y";
@@ -354 +359 @@
                 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 +372 @@
                 case SpcvxEnum : return "Spcvx";
                 case UpperelementsEnum : return "Upperelements";
-                case HydroPEnum : return "HydroP";
                 case NodeOnPattynEnum : return "NodeOnPattyn";
                 case EdgesEnum : return "Edges";
@@ -377 +379 @@
                 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";

issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp

@@ -22 +22 @@
         /*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: */

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

@@ -26 +26 @@
         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 +351 @@
         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 +357 @@
         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 +370 @@
         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 +377 @@
         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;

issm/trunk/src/c/objects/Materials/Matpar.cpp

@@ -38 +38 @@
         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 +362 @@
 }                
 /*}}}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;                  
 }                

issm/trunk/src/c/objects/Materials/Matpar.h

@@ -82 +82 @@
                 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);

issm/trunk/src/m/classes/model/model.m

@@ -19 +19 @@
                  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 +146 @@
                  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 +208 @@
                  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 +539 @@
                          md.friction=friction;
                          md.private=private;
+                         md.hydrology=hydrology;
 
                          %Materials parameters
@@ -722 +716 @@
                          %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

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -471 +471 @@
                 case HydrologyAnalysisEnum,
                         % {{{2
-                        fields={'spcwatercolumn'};
+                        fields={'hydrology.spcwatercolumn'};
                         checkforcing(md,fields);
                         fields={'watercolumn'};

issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m

@@ -52 +52 @@
 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)