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

Last change on this file since 27230 was 26740, checked in by Mathieu Morlighem, 4 years ago

CHG: added 25834-26739
File size: 1.9 KB
RevLine 
[26740]1Index: ../trunk-jpl/src/m/classes/stochasticforcing.py
2===================================================================
3--- ../trunk-jpl/src/m/classes/stochasticforcing.py (revision 26642)
4+++ ../trunk-jpl/src/m/classes/stochasticforcing.py (revision 26643)
5@@ -63,19 +63,19 @@
6 for field in self.fields:
7 if 'SMB' in field:
8 mdname = structstoch['mdnames'][structstoch['fields']==field]
9- if type(md.smb).__name__ != mdname:
10+ if (type(md.smb) != mdname):
11 raise TypeError('md.smb does not agree with stochasticforcing field {}'.format(field))
12 if 'FrontalForcings' in field:
13 mdname = structstoch['mdnames'][structstoch['fields']==field]
14- if type(md.frontalforcings).__name__ != mdname:
15+ if (type(md.frontalforcings) != mdname):
16 raise TypeError('md.frontalforcings does not agree with stochasticforcing field {}'.format(field))
17 if 'Calving' in field:
18 mdname = structstoch['mdnames'][structstoch['fields']==field]
19- if type(md.calving).__name__ != mdname:
20+ if (type(md.calving) != mdname):
21 raise TypeError('md.calving does not agree with stochasticforcing field {}'.format(field))
22 if 'BasalforcingsFloatingice' in field:
23 mdname = structstoch['mdnames'][structstoch['fields']==field]
24- if type(md.basalforcings).__name__ != mdname:
25+ if (type(md.basalforcings) != mdname):
26 raise TypeError('md.basalforcings does not agree with stochasticforcing field {}'.format(field))#Checking for specific dimensions
27 if not (field == 'SMBautoregression' or field == 'FrontalForcingsRignotAutoregression'):
28 checkdefaults = True #field with non-specific dimensionality
Note: See TracBrowser for help on using the repository browser.