Changeset 24195

Timestamp:

10/02/19 14:37:57 (6 years ago)

Author:

schlegel

Message:

CHG: clean up some GEMB logical statements to tie down tols

File:

• issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp

@@ -123 +123 @@
         IssmDouble F = 0.0, H=0.0, G=0.0;
         const IssmDouble E = 0.09;        //[mm d-1] model time growth constant E
-        // convert T from K to ºC
+        // convert T from K to degC
         T = T - CtoK;
 
@@ -219 +219 @@
 
         //set maximum water content by mass to 9 percent (Brun, 1980)
-        for(int i=0;i<m;i++)if(lwc[i]>9.0-Wtol) lwc[i]=9.0;
+        for(int i=0;i<m;i++)if(lwc[i]>9.0+Wtol) lwc[i]=9.0;
 
         /* Calculate temperature gradiant across grid cells 
@@ -280 +280 @@
                                 gsp[i] += D;
                         }
-                                 // dendricity and sphericity can not be > 1 or < 0
-         if (gdn[i]<0.0+Wtol)gdn[i]=0.0;
-         if (gsp[i]<0.0+Wtol)gsp[i]=0.0;
-         if (gdn[i]>1.0-Wtol)gdn[i]=1.0;
-         if (gsp[i]>1.0-Wtol)gsp[i]=1.0;
+                        // dendricity and sphericity can not be > 1 or < 0
+         if (gdn[i]<0.0+Gdntol)gdn[i]=0.0;
+         if (gsp[i]<0.0+Gdntol)gsp[i]=0.0;
+         if (gdn[i]>1.0-Gdntol)gdn[i]=1.0;
+         if (gsp[i]>1.0-Gdntol)gsp[i]=1.0;
 
          // determine new grain size (mm)
@@ -304 +304 @@
                                 IssmDouble C = (-2e8 * exp(-6e3 / T[i]) * dt) * pow(dT[i],.4);
                                 gsp[i] +=C;
-                                if (gsp[i]<0.0+Wtol)gsp[i]=0.0;
+                                if (gsp[i]<0.0+Gdntol)gsp[i]=0.0;
                         }
                         /*Dry snow metamorphism (Marbouty, 1980) grouped model coefficents
@@ -1172 +1172 @@
 
                 case 4: // Kuipers Munneke and others (2015), Greenland
-                        dSnow = 481.0 + 4.834*(Tmean-CtoK+Ttol);
+                        dSnow = 481.0 + 4.834*(Tmean-CtoK);
                         break;
         }