Changeset 21279

Timestamp:

10/17/16 02:41:47 (8 years ago)

Author:

bdef

Message:

CHG: modification in transfer and EPL thickness computations

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (4 diffs)
• analyses/HydrologyDCInefficientAnalysis.cpp (modified) (2 diffs)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (1 diff)

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

@@ -498 +498 @@
                 //Computing continuum function to apply to transfer term, transfer is null only if
                 // epl_head>sediment_head AND sediment_head>h_max
-                continuum=((1.0/(1.0+exp(-20.0*(sediment_head-epl_head)))))+(1.0/(1.0+exp(-20.0*(hmax-sediment_head))));
-                factor=min(continuum,1.0);
-                transfer=leakage*factor;
+                //let's try without that for a while
+                /* continuum=((1.0/(1.0+exp(-20.0*(sediment_head-epl_head)))))+(1.0/(1.0+exp(-20.0*(hmax-sediment_head)))); */
+                /* factor=min(continuum,1.0); */
+                /* transfer=leakage*factor; */
+                transfer=leakage;
                 break;
         default:
@@ -540 +542 @@
                 //Computing continuum function to apply to transfer term, transfer is null only if
                 // epl_head>sediment_head AND sediment_head>h_max
-                continuum=((1.0/(1.0+exp(-20.0*(sediment_head-epl_head)))))+(1.0/(1.0+exp(-20.0*(hmax-sediment_head))));
-                factor=min(continuum,1.0);
-                transfer=sediment_head*leakage*factor;
+                //let's try without that for a while
+                /* continuum=((1.0/(1.0+exp(-20.0*(sediment_head-epl_head)))))+(1.0/(1.0+exp(-20.0*(hmax-sediment_head)))); */
+                /* factor=min(continuum,1.0); */
+                /* transfer=sediment_head*leakage*factor; */
+                transfer=sediment_head*leakage;
 
                 break;
@@ -625 +629 @@
                                 
                                 /*Compute first the effective pressure in the EPL*/
-                                EPL_N=gravity*((rho_ice*ice_thickness[i])-(rho_water*max(0.0,(eplhead[i]-bed[i]))));
+                                //EPL_N=gravity*((rho_ice*ice_thickness[i])-(rho_water*max(0.0,(eplhead[i]-bed[i]))));
+                                //allowing EPLN larger than Pi
+                                EPL_N=gravity*((rho_ice*ice_thickness[i])-(rho_water*(eplhead[i]-bed[i])));
                                 if(EPL_N<0.0)EPL_N=0.0;
                                 /*Get then the square of the gradient of EPL heads*/
@@ -631 +637 @@
                                 
                                 /*And proceed to the real thing*/
-                                thickness[i] = old_thickness[i]*(1.0+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*EPLgrad2-
-                                                                                                                                                                 (2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n))));
-                                
+                                /* thickness[i] = old_thickness[i]*(1.0+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*EPLgrad2- */
+                                /*                                                                                                                               (2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n)))); */
+                                thickness[i] = old_thickness[i]*
+                                        (2.0+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*EPLgrad2-(2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n))))/
+                                        (2.0-((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*EPLgrad2+(2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n))));
+                                //thickness[i] = 0.5*(thickness[i]+old_thickness[i]);
                                 /*Take care of otherthikening*/
                                 if(thickness[i]>max_thick){

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

@@ -629 +629 @@
                 //Computing continuum function to apply to transfer term, transfer is null only if
                 //epl_head>sediment_head AND sediment_head>h_max
-                continuum=((1.0/(1.0+exp(-20.0*(sediment_head-epl_head)))))+(1.0/(1.0+exp(-20.0*(hmax-sediment_head))));
-                factor=min(continuum,1.0);
-                transfer=leakage*factor;
+                //let's try without that for a while
+                /* continuum=((1.0/(1.0+exp(-20.0*(sediment_head-epl_head)))))+(1.0/(1.0+exp(-20.0*(hmax-sediment_head)))); */
+                /* factor=min(continuum,1.0); */
+                /* transfer=leakage*factor; */
+                transfer=leakage; 
 
                 break;
@@ -668 +670 @@
                 //Computing continuum function to apply to transfer term, transfer is null only if
                 //epl_head>sediment_head AND sediment_head>h_max
-                continuum=((1.0/(1.0+exp(-20.0*(sediment_head-epl_head)))))+(1.0/(1.0+exp(-20.0*(hmax-sediment_head))));
-                factor=min(continuum,1.0);
-                transfer=epl_head*leakage*factor;
+                //let's try without that for a while
+                /* continuum=((1.0/(1.0+exp(-20.0*(sediment_head-epl_head)))))+(1.0/(1.0+exp(-20.0*(hmax-sediment_head)))); */
+                /* factor=min(continuum,1.0); */
+                /* transfer=epl_head*leakage*factor; */
+
+                transfer=epl_head*leakage;
+
                 break;
         default:

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

@@ -216 +216 @@
                                 //If there is some colapse go through sediment again
                                 /* if(ThickCount<L2Count)eplconverged=true; */
-                                /* eplcount++; */
+                                eplcount++;
                                 
                                 delete ug_epl_sub_iter;