Skip to content
Snippets Groups Projects
Commit acf78ef4 authored by Vladimir Onoprienko's avatar Vladimir Onoprienko
Browse files

Fix bugs

parent 752392d3
Branches
No related tags found
No related merge requests found
...@@ -33,7 +33,7 @@ class CTLReader(object): ...@@ -33,7 +33,7 @@ class CTLReader(object):
dset = re.search("DSET *(.*)", self.ctl).group(1) dset = re.search("DSET *(.*)", self.ctl).group(1)
if dset.startswith('^'): if dset.startswith('^'):
dset = os.path.join(os.path.dirname(self.filename), dset[1:]) dset = os.path.join(os.path.dirname(self.filename), dset[1:])
data = np.fromfile(dset, 'f') data = np.fromfile(dset.strip(), 'f')
if big_endian: if big_endian:
data = data.byteswap() data = data.byteswap()
self.data = np.ma.masked_values(data, self.undef) self.data = np.ma.masked_values(data, self.undef)
...@@ -73,10 +73,20 @@ class CTLReader(object): ...@@ -73,10 +73,20 @@ class CTLReader(object):
SPACE = self.dimensions['latitude'] * self.dimensions['longitude'] SPACE = self.dimensions['latitude'] * self.dimensions['longitude']
if levels[0] > 0: if levels[0] > 0:
var.dimensions = ('time', 'levels', 'latitude', 'longitude') var.dimensions = ('time', 'levels', 'latitude', 'longitude')
if self.dimensions['time'] > 1:
size = self.dimensions['time'] * self.dimensions['levels'] * (SPACE+2) # account for header bytes size = self.dimensions['time'] * self.dimensions['levels'] * (SPACE+2) # account for header bytes
else:
size = self.dimensions['time'] * self.dimensions['levels'] * SPACE
else: else:
var.dimensions = ('time', 'latitude', 'longitude') var.dimensions = ('time', 'latitude', 'longitude')
if self.dimensions['time'] > 1:
size = self.dimensions['time'] * (SPACE+2) # account for header bytes size = self.dimensions['time'] * (SPACE+2) # account for header bytes
else:
size = self.dimensions['time'] * SPACE
var.shape = tuple(self.dimensions[dim] for dim in var.dimensions) var.shape = tuple(self.dimensions[dim] for dim in var.dimensions)
var.data = self.data[i:i+size].reshape(-1, SPACE)[:,:].reshape(var.shape) # remove header bytes var.data = self.data[i:i+size].reshape(-1, SPACE)[:,:].reshape(var.shape) # remove header bytes
......
...@@ -19,6 +19,8 @@ setup( ...@@ -19,6 +19,8 @@ setup(
include_package_data=True, include_package_data=True,
install_requires=[ install_requires=[
'setuptools',
'matplotlib',
'numpy', 'numpy',
'netCDF4' 'netCDF4'
] ]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment