Changeset 26902

Timestamp:

02/25/22 00:14:27 (3 years ago)

Author:

bdef

Message:

CHG:relaxing some formating requirement on checkfield

File:

• issm/trunk-jpl/src/m/consistency/checkfield.py (modified) (1 diff)

issm/trunk-jpl/src/m/consistency/checkfield.py

@@ -114 +114 @@
         else:
             if len(np.shape(field)) < len(fieldsize):
-                md = md.checkmessage(options.getfieldvalue('message', "field {} has size {} but should be size {}".format(fieldname, np.shape(field), fieldsize)))
+                if fieldsize[-1] > 1:
+                    md = md.checkmessage(options.getfieldvalue('message', "field {} has size {} but should be size {}".format(fieldname, np.shape(field), fieldsize)))
+                else:
+                    #The last dimension is one that follows matlab 2D array regulation but usually not what we do in python, we allow the difference in shape only if the number of element is equal
+                    if np.prod(np.shape(field)) != np.prod(fieldsize):
+                        md = md.checkmessage(options.getfieldvalue('message', "field {} has size {} but should be size {}".format(fieldname, np.shape(field), fieldsize)))
             else:
                 for i in range(np.size(fieldsize)):