Changeset 27196

Timestamp:

08/05/22 11:26:40 (3 years ago)

Author:

schlegel

Message:

CHG: make GEMB swId default value 0

Location:

issm/trunk-jpl

Files:

• src/m/classes/SMBgemb.m (modified) (3 diffs)
• src/m/classes/SMBgemb.py (modified) (3 diffs)
• test/NightlyRun/test243.m (modified) (1 diff)
• test/NightlyRun/test243.py (modified) (1 diff)
• test/NightlyRun/test244.m (modified) (1 diff)
• test/NightlyRun/test244.py (modified) (1 diff)
• test/NightlyRun/test252.m (modified) (1 diff)
• test/NightlyRun/test252.py (modified) (1 diff)

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

@@ -73 +73 @@
                 % 2: default value of 1, in areas with grain radius below teThresh and areas of dry snow (not bare ice or wet) at the surface
 
-                swIdx  = NaN; % apply all SW to top grid cell (0) or allow SW to penetrate surface (1) (default 1, if aIdx=2 function of effective radius (Brun et al., 1992) or else dependent on snow density (taken from Bassford, 2002))
+                swIdx  = NaN; %apply all SW to top grid cell (0) or allow SW to penetrate surface (1) (default 0, if swIdx=1 and aIdx=2, function of effective radius (Brun et al., 1992) or else dependent on snow density (taken from Bassford, 2002))
 
                 denIdx = NaN; %densification model to use (default is 2):
@@ -236 +236 @@
                         end
 
-                        fielddisplay(self,'swIdx','apply all SW to top grid cell (0) or allow SW to penetrate surface (1) [default 1, if aIdx=2 function of effective radius (Brun et al., 1992) or else dependent on snow density (taken from Bassford, 2002)]');
+                        fielddisplay(self,'swIdx','apply all SW to top grid cell (0) or allow SW to penetrate surface (1) [default 0, if swIdx=1 and aIdx=2 function of effective radius (Brun et al., 1992) or else dependent on snow density (taken from Bassford, 2002)]');
                         fielddisplay(self,'denIdx',{'densification model to use (default is 2):',...
                                 '1 = emperical model of Herron and Langway (1980)',...
@@ -343 +343 @@
                         self.aIdx = 1;
                         self.eIdx = 1;
-                        self.swIdx = 1;
+                        self.swIdx = 0;
                         self.denIdx = 2;
                         self.dsnowIdx = 1;

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

@@ -80 +80 @@
         # 2: default value of 1, in areas with grain radius below teThresh and areas of dry snow (not bare ice or wet) at the surface
 
-        self.swIdx                  = np.nan    # apply all SW to top grid cell (0) or allow SW to penetrate surface (1) (default 1, if aIdx=2 function of effective radius (Brun et al., 1992) or else dependent on snow density (taken from Bassford, 2002))
+        self.swIdx                  = np.nan    # apply all SW to top grid cell (0) or allow SW to penetrate surface (1) (default 0, if swIdx=1 and aIdx=2, function of effective radius (Brun et al., 1992) or else dependent on snow density (taken from Bassford, 2002)) 
 
         self.denIdx                 = np.nan    # densification model to use (default is 2):
@@ -238 +238 @@
             s += '{}\n'.format(fielddisplay(self, 'K', 'time scale temperature coef. (7) [d]'))
 
-        s += '{}\n'.format(fielddisplay(self, 'swIdx', 'apply all SW to top grid cell (0) or allow SW to penetrate surface (1) [default 1, if aIdx=2 function of effective radius (Brun et al., 1992) or else dependent on snow density (taken from Bassford, 2002)]'))
+        s += '{}\n'.format(fielddisplay(self, 'swIdx', 'apply all SW to top grid cell (0) or allow SW to penetrate surface (1) [default 0, if swIdx=1 and aIdx=2 function of effective radius (Brun et al., 1992) or else dependent on snow density (taken from Bassford, 2002)]'))
         s += '{}\n'.format(fielddisplay(self, 'denIdx', ['densification model to use (default is 2):',
             '1 = emperical model of Herron and Langway (1980)',
@@ -330 +330 @@
         self.aIdx = 1
         self.eIdx = 1
-        self.swIdx = 1
+        self.swIdx = 0 
         self.denIdx = 2
         self.dsnowIdx = 1

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

@@ -10 +10 @@
 md.smb = SMBgemb(md.mesh,md.geometry);
 md.smb.dsnowIdx = 1;
+md.smb.swIdx = 1;
 
 %load hourly surface forcing date from 1979 to 2009:

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

@@ -21 +21 @@
 md.smb = SMBgemb(md.mesh, md.geometry)
 md.smb.dsnowIdx = 1
+md.smb.swIdx = 1
 
 #load hourly surface forcing date from 1979 to 2009:

issm/trunk-jpl/test/NightlyRun/test244.m ¶

@@ -11 +11 @@
 md.smb = SMBgemb(md.mesh,md.geometry);
 md.smb.dsnowIdx = 0;
+md.smb.swIdx = 1;
 
 %load hourly surface forcing date from 1979 to 2009:

issm/trunk-jpl/test/NightlyRun/test244.py ¶

@@ -30 +30 @@
 md.smb = SMBgemb(md.mesh, md.geometry)
 md.smb.dsnowIdx = 0
+md.smb.swIdx = 1
 
 #load hourly surface forcing date from 1979 to 2009:

issm/trunk-jpl/test/NightlyRun/test252.m ¶

@@ -10 +10 @@
 md.smb = SMBgemb(md.mesh,md.geometry);
 md.smb.dsnowIdx = 4;
+md.smb.swIdx = 1;
 
 %load hourly surface forcing date from 1979 to 2009:

issm/trunk-jpl/test/NightlyRun/test252.py ¶

@@ -23 +23 @@
 md.smb = SMBgemb(md.mesh, md.geometry)
 md.smb.dsnowIdx = 4
+md.smb.swIdx = 1
 
 #load hourly surface forcing date from 1979 to 2009: