Changeset 206

Timestamp:

05/09/14 16:56:34 (5 years ago)

Author:

mjuckes

Message:

debugged ncq3

Location:

CCCC/trunk/ceda_cc

Files:

• c4.py (modified) (2 diffs)
• file_utils.py (modified) (3 diffs)
• ncq3.py (modified) (4 diffs)
• utils_c4.py (modified) (1 diff)

CCCC/trunk/ceda_cc/c4.py

@@ -255 +255 @@
       return
 
+    fltype = None
     argu = []
     while len(args) > 0:
       next = args.pop(0)
       if next == '-f':
+        print '###########',args[0]
         flist = [args.pop(0),]
         self.logByFile = False
+        fltype = '-f'
       elif next == '--log':
         x = args.pop(0)
@@ -306 +309 @@
       self.commandHints( argsIn )
 
-    if self.project == 'CMIP5':
+    if self.project == 'CMIP5' and fltype != '-f':
       fl0 = []
       for f in flist:

CCCC/trunk/ceda_cc/file_utils.py

@@ -15 +15 @@
 
 installedSupportedNetcdf = []
-##ll = []
+ll = []
 
 for x in supportedNetcdf:
@@ -76 +76 @@
       self.loadNc__Scientific(fpath)
     else:
-      raise baseException( 'No supported netcdf module assigned' )
-
-  def loadNc_ncq(self,fpath):
+      self.loadNc__ncq(fpath)
+      ##raise baseException( 'No supported netcdf module assigned' )
+
+  def loadNc__ncq(self,fpath):
     self.nc0 = ncq3.open( fpath )
     self.nc0.getDigest()
     self.nc0.info()
     self.nc = ncq3.Browse( self.nc0.digest )
-    for a in self.nc._ga:
+    for a in self.nc._gal:
        self.ga[a.name] = a.value
     for v in self.nc._vdict.keys():
-      thisv = self.nc._vdict[v]
+      thisv = self.nc._vdict[v][0]
       if v not in self.nc._ddict.keys():
         self.va[v] = {}
-        for a in self.nc._ll[thisv[0].id]:
+        for a in self.nc._ll[thisv.id]:
           self.va[v][a.name] = a.value
         self.va[v]['_type'] = tstr( thisv.type )
@@ -100 +101 @@
         self.da[v] = {}
         thisa = self.nc._ddict[v]
-        for a in self.nc._ll[thisv[0].id]:
+        for a in self.nc._ll[thisv.id]:
           self.da[v][a.name] = a.value
         self.da[v]['_type'] = tstr( thisv.type )

CCCC/trunk/ceda_cc/ncq3.py

@@ -62 +62 @@
       NC_DOUBLE:c_double }
 
+ncmappings.tdict2 = { NC_BYTE:"byte",
+      NC_SHORT:"short",
+      NC_INT:"int",
+      NC_LONG:"long",
+      NC_FLOAT:"float",
+      NC_DOUBLE:"double" }
+
 NC_MAX_NAME = 256
 
@@ -114 +121 @@
     ti = -2
     for a in self.nc.attributes:
-      print a.id, a.vid, a.name, len(self._ll[a.vid])
       if a.vid != -1:
         assert a.id == len(self._ll[a.vid]), 'Unexpected attribute id: %s -- %s' % (str(a),str(self._ll[a.vid]) )
@@ -198 +204 @@
               data = (c_double*len)()
               err = libnetcdf.nc_get_var_double(self.id, i, data)
-              self.vars.append( Variable( name.value, 0, i, type.value, natts.value, ndims.value, list(dimids), data[:] ) )
+              self.vars.append( Variable( name.value, 0, i, ncmappings.tdict2[type.value], natts.value, ndims.value, list(dimids), data[:] ) )
             else:
-              self.vars.append( Variable( name.value, 0, i, type.value, natts.value, ndims.value, list(dimids), None ) )
+              self.vars.append( Variable( name.value, 0, i, ncmappings.tdict2[type.value], natts.value, ndims.value, list(dimids), None ) )
           else:
             self.vars.append( VarInfo( name.value, 0, i, type.value, natts.value, ndims.value, list(dimids) ) )
@@ -255 +261 @@
       tt = ncmappings.tdict.get( type, None )
       if tt == None: raise NCError("unknown data type")
+      t2 = ncmappings.tdict2.get( type, None )
       if len > 1:
         data = (tt*len)()
         err = libnetcdf.nc_get_att(self.id, vid, c_char_p(name), data)
         if err != 0: raise NCError( 'Error reading attribute value %s, type:%s' % (name,type) )
-        return Attribute( name, 0, vid, aid, type, len, data )
+        return Attribute( name, 0, vid, aid, t2, len, data )
       else:
         data = tt()
         err = libnetcdf.nc_get_att(self.id, vid, c_char_p(name), byref(data))
         if err != 0: raise NCError( 'Error reading attribute value %s, type:%s' % (name,type) )
-        return Attribute( name, 0, vid, aid, type, len, data.value )
+        print name, data.value, t2, type, float(data.value)
+        if type == 5:
+          dv = c_float( data.value ).value
+        else:
+          dv = data.value
+        return Attribute( name, 0, vid, aid, t2, len, dv )
 
 ## end of extension ##

CCCC/trunk/ceda_cc/utils_c4.py

@@ -539 +539 @@
       ok &= self.test(  da['time'].has_key( 'calendar' ), 'Time: required attribute calendar missing', part=True )
 
-      ok &= self.test( da['time']['_type'] == "float64", 'Time: data type not float64', part=True )
+      ok &= self.test( da['time']['_type'] in ["float64","double"], 'Time: data type not float64 [%s]' % da['time']['_type'], part=True )
        
       if ok: