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

Last change on this file was 26740, checked in by Mathieu Morlighem, 3 years ago

CHG: added 25834-26739

File size: 1.9 KB
  • ../trunk-jpl/src/m/classes/stochasticforcing.py

     
    6363        for field in self.fields:
    6464            if 'SMB' in field:
    6565                mdname = structstoch['mdnames'][structstoch['fields']==field]
    66                 if type(md.smb).__name__ != mdname:
     66                if (type(md.smb) != mdname):
    6767                    raise TypeError('md.smb does not agree with stochasticforcing field {}'.format(field))
    6868            if 'FrontalForcings' in field:
    6969                mdname = structstoch['mdnames'][structstoch['fields']==field]
    70                 if type(md.frontalforcings).__name__ != mdname:
     70                if (type(md.frontalforcings) != mdname):
    7171                    raise TypeError('md.frontalforcings does not agree with stochasticforcing field {}'.format(field))
    7272            if 'Calving' in field:
    7373                mdname = structstoch['mdnames'][structstoch['fields']==field]
    74                 if type(md.calving).__name__ != mdname:
     74                if (type(md.calving) != mdname):
    7575                    raise TypeError('md.calving does not agree with stochasticforcing field {}'.format(field))
    7676            if 'BasalforcingsFloatingice' in field:
    7777                mdname = structstoch['mdnames'][structstoch['fields']==field]
    78                 if type(md.basalforcings).__name__ != mdname:
     78                if (type(md.basalforcings) != mdname):
    7979                    raise TypeError('md.basalforcings does not agree with stochasticforcing field {}'.format(field))#Checking for specific dimensions
    8080            if not (field == 'SMBautoregression' or field == 'FrontalForcingsRignotAutoregression'):
    8181                checkdefaults = True   #field with non-specific dimensionality
Note: See TracBrowser for help on using the repository browser.