source: issm/oecreview/Archive/25834-26739/ISSM-26642-26643.diff@ 28275

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

@@ -63 +63 @@
         for field in self.fields:
             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'):
                 checkdefaults = True   #field with non-specific dimensionality