Changeset 21500

Timestamp:

01/24/17 01:23:24 (8 years ago)

Author:

bdef

Message:

CHG:removing restrictions on N computation

Location:

issm/trunk-jpl/src/c/analyses

Files:

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

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

@@ -573 +573 @@
                                 EPLgrad2 = (epl_slopeX[i]*epl_slopeX[i])+(epl_slopeY[i]*epl_slopeY[i]);
                                 /*And proceed to the real thing*/
-                                thickness[i] = old_thickness[i]/(1.0-((rho_water*gravity*epl_conductivity*EPLgrad2*dt)/(rho_ice*latentheat))+((2.0*A*dt*pow(EPL_N,n))/(pow(n,n))));
+                                thickness[i] = old_thickness[i]/(1.0
+                                                                                                                                                                 -((rho_water*gravity*epl_conductivity*EPLgrad2*dt)/(rho_ice*latentheat))
+                                                                                                                                                                 +((2.0*A*dt*pow(EPL_N,n))/(pow(n,n))));
                                 /*Take care of otherthikening*/
                                 if(thickness[i]>max_thick){

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

@@ -488 +488 @@
                         }
                         //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*(max((min(h_max,values[i])-base[i]),0.0)));
+                        //pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(max((min(h_max,values[i])-base[i]),0.0)));
+                        pressure[i]=(rho_ice*g*thickness[i])-(rho_freshwater*g*(values[i]-base[i]));
                 }
                 xDelete<IssmDouble>(thickness);