Changeset 14796

Timestamp:

04/29/13 18:23:28 (12 years ago)

Author:

bdef

Message:

CHG: Hydrologydc have now several ways of fixing the inefficient laer upper limit

Location:

issm/trunk-jpl/src/c

Files:

• classes/objects/Elements/Element.h (modified) (1 diff)
• classes/objects/Elements/Penta.cpp (modified) (1 diff)
• classes/objects/Elements/Penta.h (modified) (1 diff)
• classes/objects/Elements/Tria.cpp (modified) (1 diff)
• classes/objects/Elements/Tria.h (modified) (2 diffs)
• classes/objects/Loads/Pengrid.cpp (modified) (1 diff)
• classes/objects/Materials/Matpar.cpp (modified) (1 diff)
• modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/objects/Elements/Element.h

@@ -125 +125 @@
                 virtual void   InputControlUpdate(IssmDouble scalar,bool save_parameter)=0;
                 #endif
+
+                #ifdef _HAVE_HYDROLOGY_
+                virtual void  GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode)=0;
+                #endif
 };
 #endif

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp

@@ -9339 +9339 @@
 /*}}}*/
 #endif
+#ifdef _HAVE_HYDROLOGY_
+/*FUNCTION Penta::GetHydrologyDCInefficientHmax{{{*/
+void  Penta::GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode){
+        _error_("Hydrological stuff not suported in Penta");
+}
+/*}}}*/
+#endif

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.h

@@ -305 +305 @@
                 #ifdef _HAVE_HYDROLOGY_
                 void    CreateHydrologyWaterVelocityInput(void);
+                void    GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode);
                 #endif
                 #ifdef _HAVE_THERMAL_

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -6338 +6338 @@
 }
 /*}}}*/
+/*FUNCTION Tria::GetHydrologyDCInefficientHmax{{{*/
+void  Tria::GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode){
+
+                int        hmax_flag;
+                IssmDouble h_max;
+                IssmDouble gravity,rho_ice,rho_water;
+                IssmDouble thickness,bed;
+
+                /*Get the flag to the limitation method*/
+                this->parameters->FindParam(&hmax_flag,HydrologydcSedimentlimitFlagEnum);
+                /*Switch between the different cases*/
+                switch(hmax_flag){
+                        case 0:
+                                h_max=1.0e+10;
+                                break;
+                        case 1:
+                                parameters->FindParam(&h_max,HydrologydcSedimentlimitEnum);
+                                break;
+                        case 2:
+                                gravity=matpar->GetG();
+                                rho_ice=matpar->GetRhoIce();
+                                rho_water=matpar->GetRhoFreshwater();
+                                this->GetInputValue(&thickness,innode,ThicknessEnum);
+                                this->GetInputValue(&bed,innode,BedEnum);
+                                h_max=((rho_ice*gravity*thickness)/rho_water)+bed;
+                                break;
+                        case 3:
+                                _error_("Using normal stress  not supported yet");
+                                break;
+                        default:
+                                _error_("no case higher than 3 for SedimentlimitFlag");
+                }
+
+                /*Assign output pointer*/
+                *ph_max=h_max;
+
+}
+/*}}}*/
+
+
 #endif
 

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h

@@ -197 +197 @@
                 ElementVector* CreatePVectorPrognostic_DG(void);
                 ElementVector* CreatePVectorSlope(void);
-                IssmDouble         GetArea(void);
+                IssmDouble     GetArea(void);
                 int            GetElementType(void);
                 void             GetDofList(int** pdoflist,int approximation_enum,int setenum);
@@ -253 +253 @@
                 void      InputUpdateFromSolutionHydrologyDCInefficient(IssmDouble* solution);
                 void      InputUpdateFromSolutionHydrologyDCEfficient(IssmDouble* solution);
+                void    GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode);
                 #endif
                 #ifdef _HAVE_BALANCED_

issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp

@@ -707 +707 @@
         /*Get sediment water head h*/
         element->GetInputValue(&h,node,SedimentHeadEnum);
-        h_max=10000;
+        element->GetHydrologyDCInefficientHmax(&h_max,node);
+        /*printf("hmax %i \n",h_max);*/
 
         if (h>h_max)

issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp

@@ -65 +65 @@
                 iomodel->Constant(&this->water_compressibility,HydrologydcWaterCompressibilityEnum);
                 iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
+                
 
                 if(isefficientlayer){

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp

@@ -16 +16 @@
         Parameters *parameters = NULL;
         int         hydrology_model;
+        int         sedimentlimit_flag;
         bool        isefficientlayer;
+        IssmDouble  sedimentlimit;
 
         /*Get parameters: */
@@ -31 +33 @@
 
         iomodel->FetchData(&isefficientlayer,HydrologydcIsefficientlayerEnum);
+        iomodel->FetchData(&sedimentlimit_flag,HydrologydcSedimentlimitFlagEnum);
+        
+        if(sedimentlimit_flag==1){
+                iomodel->FetchData(&sedimentlimit,HydrologydcSedimentlimitEnum);
+                parameters->AddObject(new DoubleParam(HydrologydcSedimentlimitEnum,sedimentlimit));
+        }
+
         parameters->AddObject(new IntParam(HydrologyEnum,hydrology_model));
         parameters->AddObject(new BoolParam(HydrologydcIsefficientlayerEnum,isefficientlayer));
+        parameters->AddObject(new IntParam(HydrologydcSedimentlimitFlagEnum,sedimentlimit_flag));
 
         /*Assign output pointer: */