Changeset 778 in lmdz_wrf

Timestamp:

May 27, 2016, 4:40:04 PM (9 years ago)

Author:

lfita

Message:

Fixing som `gen' calls

Location:

trunk/tools

Files:

• nc_var.py (modified) (1 diff)
• nc_var_tools.py (modified) (4 diffs)

trunk/tools/nc_var.py

@@ -171 +171 @@
     ncvar.get_attribute(opts.values, opts.ncfile, opts.varname)
 elif oper == 'get_namelist_vars':
-    gen.get_namelist_vars(opts.values, opts.ncfile)
+    ncvar.get_namelist_vars(opts.values, opts.ncfile)
 elif oper == 'getvalues_lonlat':
     ncvar.getvalues_lonlat(opts.values, opts.ncfile)

trunk/tools/nc_var_tools.py

@@ -5852 +5852 @@
 
     arguments = '[lonName],[latName],[lonSW],[latSW],[lonNE],[latNE]'
-    check_arguments(fname,values,arguments,',')
+    gen.check_arguments(fname,values,arguments,',')
 
 
@@ -6021 +6021 @@
 
 # Adding lonn/latn to the output file
-    if not searchInlist(varns,lonn): varns.append(lonn)
-    if not searchInlist(varns,latn): varns.append(latn)
+    if not gen.searchInlist(varns,lonn): varns.append(lonn)
+    if not gen.searchInlist(varns,latn): varns.append(latn)
 
     for vn in varns:
@@ -6031 +6031 @@
               vn + "' !!"
             quit(-1)
-        if not searchInlist(objfile.variables, vn):
+        if not gen.searchInlist(objfile.variables, vn):
             print errormsg
             print '  ' + fname + ': variable name "' + vn + '" is not in file "' +   \
@@ -6043 +6043 @@
         varslice = []
         for dimn in varinf.dimns:
-            if not searchInlist(newncobj.dimensions, dimn):
+            if not gen.searchInlist(newncobj.dimensions, dimn):
                 newncobj.createDimension(dimn, len(objfile.dimensions[dimn]))
             if dimn == dlonn: