Changeset 14804

Timestamp:

04/30/13 08:54:45 (12 years ago)

Author:

bdef

Message:

BUG: fixing upper limit definition in hydrologydc

Location:

issm/trunk-jpl/src/c/classes/objects

Files:

• Elements/Tria.cpp (modified) (1 diff)
• Loads/Pengrid.cpp (modified) (2 diffs)

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

@@ -6348 +6348 @@
                 /*Get the flag to the limitation method*/
                 this->parameters->FindParam(&hmax_flag,HydrologydcSedimentlimitFlagEnum);
-
-                if(this->id==1) printf("flag = %i\n",hmax_flag);
-
+                
                 /*Switch between the different cases*/
                 switch(hmax_flag){

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

@@ -708 +708 @@
         element->GetInputValue(&h,node,SedimentHeadEnum);
         element->GetHydrologyDCInefficientHmax(&h_max,node);
-        /*printf("hmax %g \n",h_max);*/
 
         if (h>h_max)
@@ -754 +753 @@
         ElementVector* pe=new ElementVector(&node,1,this->parameters);
 
-        /*Get h_max*/
-        h_max = 10000.;
-
+        /*Get h_max and compute penalty*/
+        element->GetHydrologyDCInefficientHmax(&h_max,node);
         pe->values[0]=kmax*pow(10.,penalty_factor)*h_max;