Changeset 19003

Timestamp:

01/13/15 08:37:22 (10 years ago)

Author:

bdef

Message:

CHG:Corection ine Epl thickness and effective pressure computation

Location:

issm/trunk-jpl/src/c/analyses

Files:

• HydrologyDCEfficientAnalysis.cpp (modified) (2 diffs)
• HydrologyDCInefficientAnalysis.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -591 +591 @@
                                 
                                 /*Compute first the effective pressure in the EPL*/
-                                EPL_N=gravity*((rho_ice*ice_thickness[i])-(rho_water*(eplhead[i]-bed[i])));
+                                EPL_N=gravity*((rho_ice*ice_thickness[i])-(rho_water*min(0.0,(eplhead[i]-bed[i]))));
                                 if(EPL_N<0.0)EPL_N=0.0;
                                 /*Get then the square of the gradient of EPL heads*/
-                                EPLgrad2 = (epl_slopeX[i]+epl_slopeY[i])*(epl_slopeX[i]+epl_slopeY[i]);
+                                EPLgrad2 = (epl_slopeX[i]*epl_slopeX[i])+(epl_slopeY[i]*epl_slopeY[i]);
                                 
                                 /*And proceed to the real thing*/
@@ -712 +712 @@
                                         vec_mask->SetValue(basalelement->nodes[i]->Sid(),0.,INS_VAL);
                                         epl_thickness[i]=init_thick;
-                                        //If no more active nodes in the element probably colapse it two
                                 }
                                 else{

issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

@@ -466 +466 @@
                                 residual[i] = 0.;
                         }
-                        pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(min(h_max,values[i])-base[i]));
+                        //adding base in min to take into account heads under bed wich don't change N
+                        pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(min(h_max,values[i],base[i])-base[i]));
                 }
                 xDelete<IssmDouble>(thickness);