Changeset 26643

Timestamp:

11/18/21 12:45:24 (3 years ago)

Author:

vverjans

Message:

BUG: trying to fix field comparisons in stochasticforcing.py

File:

• issm/trunk-jpl/src/m/classes/stochasticforcing.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/stochasticforcing.py

@@ -64 +64 @@
             if 'SMB' in field:
                 mdname = structstoch['mdnames'][structstoch['fields']==field]
-                if type(md.smb).__name__ != mdname:
+                if (type(md.smb) != mdname):
                     raise TypeError('md.smb does not agree with stochasticforcing field {}'.format(field))
             if 'FrontalForcings' in field:
                 mdname = structstoch['mdnames'][structstoch['fields']==field]
-                if type(md.frontalforcings).__name__ != mdname:
+                if (type(md.frontalforcings) != mdname):
                     raise TypeError('md.frontalforcings does not agree with stochasticforcing field {}'.format(field))
             if 'Calving' in field:
                 mdname = structstoch['mdnames'][structstoch['fields']==field]
-                if type(md.calving).__name__ != mdname:
+                if (type(md.calving) != mdname):
                     raise TypeError('md.calving does not agree with stochasticforcing field {}'.format(field))
             if 'BasalforcingsFloatingice' in field:
                 mdname = structstoch['mdnames'][structstoch['fields']==field]
-                if type(md.basalforcings).__name__ != mdname:
+                if (type(md.basalforcings) != mdname):
                     raise TypeError('md.basalforcings does not agree with stochasticforcing field {}'.format(field))#Checking for specific dimensions
             if not (field == 'SMBautoregression' or field == 'FrontalForcingsRignotAutoregression'):