Changeset 24808

Timestamp:

05/06/20 00:46:38 (5 years ago)

Author:

bdef

Message:

CHG: minor tweaks and display formating

Location:

issm/trunk-jpl/src/m

Files:

• consistency/checkfield.py (modified) (1 diff)
• contrib/defleurian/netCDF/export_netCDF.py (modified) (2 diffs)

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

@@ -152 +152 @@
                 md = md.checkmessage(options.getfieldvalue('message', "field '{}' value should be '{}'".format(fieldname, fieldvalues[0])))
             elif len(fieldvalues) == 2:
-                md = md.checkmessage(options.getfieldvalue('message', "field '{}' values should be '{}' or '%s'".format(fieldname, fieldvalues[0], fieldvalues[1])))
+                md = md.checkmessage(options.getfieldvalue('message', "field '{}' values should be '{}' '{}' or '%s'".format(fieldname, fieldvalues[0], fieldvalues[1])))
             else:
                 md = md.checkmessage(options.getfieldvalue('message', "field '{}' should have values in {}".format(fieldname, fieldvalues)))

issm/trunk-jpl/src/m/contrib/defleurian/netCDF/export_netCDF.py

@@ -28 +28 @@
     dimlist = [2, md.mesh.numberofelements, md.mesh.numberofvertices, np.shape(md.mesh.elements)[1]]
     print('===Creating dimensions ===')
-    for i in range(0, 4):
-        if dimlist[i] not in list(DimDict.keys()):
+    for i, newdim in enumerate(dimlist):
+        if newdim not in list(DimDict.keys()):
             dimindex += 1
-            NewDim = NCData.createDimension('DimNum' + str(dimindex), dimlist[i])
+            NewDim = NCData.createDimension('DimNum' + str(dimindex), newdim)
             DimDict[len(NewDim)] = 'DimNum' + str(dimindex)
     typelist = [bool, str, str, int, float, complex,
@@ -114 +114 @@
     except AttributeError:
         val_type = type(var)
+
     # grab dimension
     if val_type in [collections.OrderedDict, dict]: