Changeset 1523 in lmdz_wrf for trunk

Timestamp:

Apr 12, 2017, 8:21:00 PM (8 years ago)

Author:

lfita

Message:

Fixing `addVar', right detection of dimensions

File:

• trunk/tools/nc_var_tools.py (modified) (3 diffs)

trunk/tools/nc_var_tools.py

@@ -18677 +18677 @@
     gen.check_arguments(fname,values,expectargs,'|')
 
-    dnames = values.split('|')[0].split(',')
+    dnames = gen.str_list(values.split('|')[0],',')
     attributes = values.split('|')[1].replace('!',' ')
     kind = values.split('|')[2]
@@ -18694 +18694 @@
         quit(-1)
 
-    if values.split('|')[0].find(',') != -1:
+    if values.split('|')[0] == 'scalar':
+        print '  ' + fname + ': creation of scalar variable !!'
+
+# Variable
+        if kind == 'c':
+            newvar = onc.createVariable(varn, 'c')
+#            newvar[:] = np.zeros(tuple(dsize), dtype=np.float)
+        elif kind == 'f' or kind == 'f4':
+            newvar = onc.createVariable(varn, 'f4')
+            newvar[:] = np.float(0.)
+        elif kind == 'f8':
+            newvar = onc.createVariable(varn, 'f8')
+            newvar[:] = np.float64(0.)
+        elif kind == 'i':
+            newvar = onc.createVariable(varn, 'i')
+            newvar[:] = int(0)
+        else:
+            print errormsg
+            print '  ' + fname + ": variable kind '" + kind + "' not ready!!"
+            quit(-1)
+    elif type(dnames) == type([1,2]):
         # Checking dimensions
         dsize = []
@@ -18728 +18748 @@
             quit(-1)
 
-    elif values.split('|')[0] == 'scalar':
-        print '  ' + fname + ': creation of scalar variable !!'
-
-# Variable
-        if kind == 'c':
-            newvar = onc.createVariable(varn, 'c')
-#            newvar[:] = np.zeros(tuple(dsize), dtype=np.float)
-        elif kind == 'f' or kind == 'f4':
-            newvar = onc.createVariable(varn, 'f4')
-            newvar[:] = np.float(0.)
-        elif kind == 'f8':
-            newvar = onc.createVariable(varn, 'f8')
-            newvar[:] = np.float64(0.)
-        elif kind == 'i':
-            newvar = onc.createVariable(varn, 'i')
-            newvar[:] = int(0)
-        else:
-            print errormsg
-            print '  ' + fname + ": variable kind '" + kind + "' not ready!!"
-            quit(-1)
     else:
         print errormsg
-        print '  ' + fname + ": wrong dimension values: '" + dnames + "' !!"
+        print '  ' + fname + ": wrong dimension values:", dnames, " !!"
         quit(-1)