Changeset 1266 in lmdz_wrf for trunk

Timestamp:

Nov 3, 2016, 6:55:03 PM (8 years ago)

Author:

lfita

Message:

Updating the version of `compute_opersvarsfiles'

File:

• trunk/tools/model_graphics.py (modified) (2 diffs)

trunk/tools/model_graphics.py

@@ -2866 +2866 @@
                 print "    var in file: '" + vninF + "'"
 
-            dfiles = 'add|' + ifile2 + '|' + vninF + ',sub|' + ifile1 + '|' + vninF
-            values = '|'.join(CFdims) + '@' + dfiles
+            # Range of the dimensions
+            for CFd in CFdims:
+                if CFd == CFdims[0]:
+                    CFdimS = CFd + '|' + CFd + '|-1'
+                else:
+                    CFdimS = CFdims + ';' + CFd + '|' + CFd + '|-1'
+
+            # Attributes of the variable
+            varattrs = ncvar.ivattrs(file2,vninF)
+            varvals = vninF + ',' + varattrs['long_name'] + ',' + varattrs['units']
+
+            values = CFdims + '@' + 'add|' + file2 + '|' + vninF + '%' + CFdims +    \
+              '@' + 'sub|' + file2 + '|' + vninF
             pyins = 'python ' + pyH + "/nc_var.py -o compute_opersvarsfiles -S '" +  \
-              values + "' -v " + vninF
+              values + "' -v " + varvals
 
             try:
                 with gen.Capturing() as output:
-                    ncvar.compute_opersvarsfiles(values,vninF)
+                    ncvar.compute_opersvarsfiles(values,varvals)
             except:
                 print errmsg
-                print 'ncvar.compute_opersvarsfiles(' + values + ',' + vninF + ')'
+                print 'ncvar.compute_opersvarsfiles(' + values + ',' + varvals + ')'
                 for s1out in output: print s1out
                 quit(-1)
@@ -3414 +3425 @@
                 print "    var in file: '" + vninF + "'"
 
-            dfiles = 'add|' + ifile2 + '|' + vninF + ',sub|' + ifile1 + '|' + vninF
-            values = '|'.join(CFdims) + '@' + dfiles
+            # Range of the dimensions
+            for CFd in CFdims:
+                if CFd == CFdims[0]:
+                    CFdimS = CFd + '|' + CFd + '|-1'
+                else:
+                    CFdimS = CFdims + ';' + CFd + '|' + CFd + '|-1'
+
+            # Attributes of the variable
+            varattrs = ncvar.ivattrs(file2,vninF)
+            varvals = vninF + ',' + varattrs['long_name'] + ',' + varattrs['units']
+
+            values = CFdims + '@' + 'add|' + file2 + '|' + vninF + '%' + CFdims +    \
+              '@' + 'sub|' + file2 + '|' + vninF
             pyins = 'python ' + pyH + "/nc_var.py -o compute_opersvarsfiles -S '" +  \
-              values + "' -v " + vninF
+              values + "' -v " + varvals
 
             try:
                 with gen.Capturing() as output:
-                    ncvar.compute_opersvarsfiles(values,vninF)
+                    ncvar.compute_opersvarsfiles(values,varvals)
             except:
                 print errmsg
-                print 'ncvar.compute_opersvarsfiles(' + values + ',' + vninF + ')'
+                print 'ncvar.compute_opersvarsfiles(' + values + ', ' + varvals + ')'
                 for s1out in output: print s1out
                 quit(-1)