Changeset 25590

Timestamp:

09/23/20 19:40:30 (4 years ago)

Author:

schlegel

Message:

BUG: some code repeated for a1x 2 albedo determinaton

Location:

issm/trunk-jpl

Files:

• src/c/modules/SurfaceMassBalancex/Gembx.cpp (modified) (2 diffs)
• test/Archives/Archive253.arch (modified) ( previous)

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

@@ -504 +504 @@
                         a[0] = sF[0]*a0 + sF[1]*a1 + sF[2]*a2;
 
-                        // In a layer < 10cm, account for mix of ice and snow,
-                        // after P. Alexander et al., 2014
-                        IssmDouble depthsnow=0.0;
-                        IssmDouble aice=0.0;
-                        int lice=0;
-                        for(int l=0;(l<m & d[l]<dPHC-Dtol);l++){
-                                depthsnow=depthsnow+dz[l];
-                                lice=l+1;
-                        }
-                        if (depthsnow<=0.1+Dtol & lice<m & d[lice]>=dPHC-Dtol){
-                                aice = ai_max + (as_min - ai_max)*(d[lice]-dIce)/(dPHC-dIce);
-                                a[0]= aice + max(a[0]-aice,0.0)*(depthsnow/0.1);
-                        }
                 }
                 else if(aIdx==3){
@@ -584 +571 @@
 
                 //If we do not have fresh snow
-                if (aIdx<3 && aIdx>0){
+                if (aIdx<3 && aIdx>0 && (adThresh - d[0])>=Dtol){
                         // In a layer < 10cm, account for mix of ice and snow,
                         // after P. Alexander et al., 2014