Changeset 24203

Timestamp:

10/03/19 15:02:49 (5 years ago)

Author:

schlegel

Message:

CHG: adding paren in GEMB density test, move double marshall in matlab gemb, and updating archives

Location:

issm/trunk-jpl

Files:

• src/c/modules/SurfaceMassBalancex/Gembx.cpp (modified) (4 diffs)
• src/m/classes/SMBgemb.m (modified) (1 diff)
• test/Archives/Archive243.arch (modified) ( previous)
• test/Archives/Archive244.arch (modified) ( previous)
• test/Archives/Archive252.arch (modified) ( previous)
• test/NightlyRun/test243.m (modified) (1 diff)
• test/NightlyRun/test243.py (modified) (1 diff)

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

@@ -127 +127 @@
 
         // temperature coefficient F
-        if(T>-6.0+Ttol) F =  0.7 + ((T/-6.0) * 0.3);
-        if(T<=-6.0+Ttol && T>-22.0+Ttol) F =  1.0 - ((T+6.0)/-16.0 * 0.8);
-        if(T<=-22.0+Ttol && T>-40.0+Ttol) F =  0.2 - ((T+22.0)/-18.0 * 0.2);
+        if(T> -6.0+Ttol) F =  0.7 + ((T/-6.0) * 0.3);
+        if(T<= -6.0+Ttol && T> -22.0+Ttol) F =  1.0 - ((T+6.0)/-16.0 * 0.8);
+        if(T<= -22.0+Ttol && T> -40.0+Ttol) F =  0.2 - ((T+22.0)/-18.0 * 0.2);
 
         // density coefficient F
-        if(d<150.0-Dtol) H=1.0;
-
-        if(d>=150.0-Dtol & d<400.0-Dtol) H = 1.0 - ((d-150.0)/250.0);
+        if(d< 150.0-Dtol) H=1.0;
+
+        if(d>= 150.0-Dtol && d <400.0-Dtol) H = 1.0 - ((d-150.0)/250.0);
 
         // temperature gradient coefficient G
@@ -204 +204 @@
 
         /*only when aIdx = 1 or 2 do we run grainGrowth: */
-        if(aIdx!=1 & aIdx!=2){
+        if(aIdx!=1 && aIdx!=2){
                 /*come out as we came in: */
                 return;
@@ -412 +412 @@
         const IssmDouble dSnow = 300;   // density of fresh snow [kg m-3]       
 
-        if(aIdx==0 || (adThresh - d[0]<Dtol)){
+        if(aIdx==0 || (d[0]-adThresh)<Dtol){
                 a[0] = aValue;
         }
@@ -1104 +1104 @@
            adjusts the properties of the top grid cell to account for accumulation
            T_air & T = Air and top grid cell temperatures [K]
+                Tmean =  average surface temperature [K]
                 Vmean =  average wind velocity [m s-1]
                 V =  wind velocity [m s-1]

issm/trunk-jpl/src/m/classes/SMBgemb.m

@@ -415 +415 @@
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','denIdx','format','Integer');
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','dsnowIdx','format','Integer');
-                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','dsnowIdx','format','Integer');
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','InitDensityScaling','format','Double');
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','ThermoDeltaTScaling','format','Double');

issm/trunk-jpl/test/NightlyRun/test243.m

@@ -48 +48 @@
 %Fields and tolerances to track changes
 field_names      ={'SmbDz','SmbT' ,'SmbD' ,'SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF','SmbMeanULW','SmbNetLW','SmbNetSW'};
-field_tolerances ={1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,4e-12,1e-12,1e-12,1e-12,2e-10,2e-11, 2e-11, 1e-11, 1e-9, 2e-11};
+field_tolerances ={1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,4e-12,1e-12,1e-12,1e-12,2e-10,2e-11, 2e-11, 1e-11, 2e-9, 2e-11};
 
 field_values={...

issm/trunk-jpl/test/NightlyRun/test243.py

@@ -62 +62 @@
 #Fields and tolerances to track changes
 field_names = ['SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbA', 'SmbEC', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC', 'SmbMeanSHF', 'SmbMeanLHF', 'SmbMeanULW', 'SmbNetLW', 'SmbNetSW']
-field_tolerances = [1e-11, 1e-12, 1e-11, 2e-11, 1e-11, 1e-11, 1e-12, 4e-12, 1e-12, 1e-12, 1e-12, 2e-10, 2e-11, 2e-11, 1e-11, 1e-9, 2e-11]
+field_tolerances = [1e-11, 1e-12, 1e-11, 2e-11, 1e-11, 1e-11, 1e-12, 4e-12, 1e-12, 1e-12, 1e-12, 2e-10, 2e-11, 2e-11, 1e-11, 2e-9, 2e-11]
 #shape is different in python solution (fixed using reshape) which can cause test failure:
 field_values = [md.results.TransientSolution[-1].SmbDz[0, 0:240].reshape(1, -1),