Changeset 18903

Timestamp:

12/01/14 17:08:08 (10 years ago)

Author:

bdef

Message:

BUG:Correction on the pseudo-step function used for the transfer

Location:

issm/trunk-jpl/src/c/analyses

Files:

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

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

@@ -457 +457 @@
                 // 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=max(continuum,1.0);
+                factor=min(continuum,1.0);
                 transfer=leakage*factor;
                 break;
@@ -499 +499 @@
                 // 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=max(continuum,1.0);
+                factor=min(continuum,1.0);
                 transfer=sediment_head*leakage*factor;
 

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

@@ -616 +616 @@
                 //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=max(continuum,1.0);
+                factor=min(continuum,1.0);
                 transfer=leakage*factor;
 
@@ -655 +655 @@
                 //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=max(continuum,1.0);
+                factor=min(continuum,1.0);
                 transfer=epl_head*leakage*factor;
                 break;