Changeset 24069

Timestamp:

07/05/19 06:52:21 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: closer to Elmer's implementation of GlaDS

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyGlaDSAnalysis.cpp (modified) (3 diffs)
• classes/Loads/Channel.cpp (modified) (4 diffs)
• classes/Loads/Moulin.cpp (modified) (1 diff)

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

@@ -4 +4 @@
 #include "../shared/shared.h"
 #include "../modules/modules.h"
+
+#define AEPS 2.22e-15
 
 /*Model processing*/
@@ -256 +258 @@
                 /*Get norm of gradient of hydraulic potential and make sure it is >0*/
                 IssmDouble normgradphi = sqrt(dphi[0]*dphi[0] + dphi[1]*dphi[1]);
-                if(normgradphi < 1.e-12) normgradphi = 1.e-12;
+                if(normgradphi < AEPS) normgradphi = AEPS;
 
                 IssmDouble coeff = k*pow(h,alpha)*pow(normgradphi,beta-2.);
@@ -501 +503 @@
 
                 /*Make sure it is positive*/
-                if(h_new[iv]<1.e-12) h_new[iv] = 1.e-12;
+                if(h_new[iv]<AEPS) h_new[iv] = AEPS;
         }
 

issm/trunk-jpl/src/c/classes/Loads/Channel.cpp

@@ -25 +25 @@
 #define ALPHA_S     5./4.
 #define BETA_S      3./2.
+#define AEPS 2.22e-15
 
 /*Channel constructors and destructor*/
@@ -423 +424 @@
                 dphimds = rho_water*g*(db[0]*tx + db[1]*ty);
                 Ngrad   = fabs(dphids);
-                if(Ngrad<1.e-12) Ngrad = 1.e-12;
+                if(Ngrad<AEPS) Ngrad = AEPS;
 
                 /*Compute the effective conductivity Kc = k h^alpha |grad Phi|^{beta-2} (same for sheet)*/
@@ -550 +551 @@
                 dphimds = rho_water*g*(db[0]*tx + db[1]*ty);
                 Ngrad   = fabs(dphids);
-                if(Ngrad<1.e-12) Ngrad = 1.e-12;
+                if(Ngrad<AEPS) Ngrad = AEPS;
 
                 /*Compute the effective conductivity Ks = k h^alpha |grad Phi|^{beta-2} (same for sheet)*/
@@ -652 +653 @@
         dphimds = rho_water*g*(db[0]*tx + db[1]*ty);
         Ngrad   = fabs(dphids);
-        if(Ngrad<1.e-12) Ngrad = 1.e-12;
+        if(Ngrad<AEPS) Ngrad = AEPS;
 
         /*d(phi - phi_m)/ds*/

issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp

@@ -230 +230 @@
 /*}}}*/
 bool  Moulin::IsPenalty(void){/*{{{*/
-        return true;
+        return false;
 }
 /*}}}*/