Changeset 25914

Timestamp:

12/28/20 13:06:32 (4 years ago)

Author:

schlegel

Message:

CHG: always display aValue for GEMB

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBgemb.m (modified) (1 diff)
• SMBgemb.py (modified) (1 diff)

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

@@ -348 +348 @@
                         fielddisplay(self,'Sizeini','Initial number of layers when restart [-]');
 
-
                         %additional albedo parameters:
+                        fielddisplay(self,'aValue','Albedo forcing at every element.');
                         switch self.aIdx
-                                case {0 5}
-                                        fielddisplay(self,'aValue','Albedo forcing at every element.  Used only if aIdx == {0,5}.');
                                 case {1 2}
                                         fielddisplay(self,'aSnow','new snow albedo (0.64 - 0.89)');

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

@@ -192 +192 @@
 
         #additional albedo parameters:
+        string = "%s\n%s" % (string, fielddisplay(self, 'aValue', 'Albedo forcing at every element.'))
         if isinstance(self.aIdx, (list, type(np.array([1, 2])))) and (self.aIdx == [1, 2] or (1 in self.aIdx and 2 in self.aIdx)):
             string = "%s\n%s" % (string, fielddisplay(self, 'aSnow', 'new snow albedo (0.64 - 0.89)'))
             string = "%s\n%s" % (string, fielddisplay(self, 'aIce', 'albedo of ice (0.27-0.58)'))
-        elif self.aIdx == 0:
-            string = "%s\n%s" % (string, fielddisplay(self, 'aValue', 'Albedo forcing at every element.  Used only if aIdx == {0, 5}'))
-        elif self.aIdx == 5:
-            string = "%s\n%s" % (string, fielddisplay(self, 'aValue', 'Albedo forcing at every element.  Used only if aIdx == {0, 5}'))
         elif self.aIdx == 3:
             string = "%s\n%s" % (string, fielddisplay(self, 'cldFrac', 'average cloud amount'))