Index: sodarplot/trunk/sodarplot/scintec/meanspeed.py =================================================================== --- sodarplot/trunk/sodarplot/scintec/meanspeed.py (revision 80) +++ sodarplot/trunk/sodarplot/scintec/meanspeed.py (revision 85) @@ -17,5 +17,7 @@ ncFilePattern = os.path.join(ncDir,ncFileGlob) -files = glob.glob(ncFilePattern) +files = glob.glob(ncFilePattern) +files.sort() +# files = files[-3:] previous = [files[-1]] + files[:-1] next = files[1:] + [files[0]] @@ -136,5 +138,5 @@ subplot(2,4,4) title('Mean Wind Direction (Polar)',fontsize=spt.get_fontsize()*0.5) - xlabel('Direction (Wind From)',fontsize=spt.get_fontsize()*0.6) + xlabel('Direction (Windward)',fontsize=spt.get_fontsize()*0.6) xlim(0,360) ylim(0,int(max(z))) @@ -208,5 +210,9 @@ if next <= ncFile: lastMonth = True - p = multiprocessing.Process(target=meanspeed, args=((previous, ncFile, next), pngDir, True, lastMonth)) + p = multiprocessing.Process(target=meanspeed, + args=((previous, ncFile, next), + pngDir, + True, + lastMonth)) p.start() p.join() Index: sodarplot/trunk/sodarplot/scintec/winddist.py =================================================================== --- sodarplot/trunk/sodarplot/scintec/winddist.py (revision 80) +++ sodarplot/trunk/sodarplot/scintec/winddist.py (revision 85) @@ -1,3 +1,3 @@ -import os,datetime,glob +import sys,os,datetime,glob import multiprocessing import numpy as np @@ -20,4 +20,6 @@ ncFilePattern = os.path.join(ncDir,ncFileGlob) files = glob.glob(ncFilePattern) +files.sort() +# files=files[-3:] previous = [files[-1]] + files[:-1] next = files[1:] + [files[0]] @@ -125,5 +127,5 @@ rect = [0.16, 0.16, 0.68, 0.68] ax = WindroseAxes(fig, rect, axisbg='w') - ax.set_title('Wind Distribution at %d Meters Above Sea Level\nPercentage of Wind Magnitude From Direction\n\n' % z[x],fontsize=spt.get_fontsize()*0.8) + ax.set_title('Wind Distribution at %d Meters Above Sea Level\nPercentage of Wind Magnitude Towards Direction\n\n' % z[x],fontsize=spt.get_fontsize()*0.8) fig.add_axes(ax) ax.bar(theta[x], rho[x], bins = np.arange(0.0,20.0,2.5), normed=True, opening=0.8, edgecolor='white') @@ -167,5 +169,9 @@ if next <= ncFile: lastMonth = True - p = multiprocessing.Process(target=winddist, args=((previous, ncFile, next), pngDir, True, lastMonth)) + p = multiprocessing.Process(target=winddist, + args=((previous, ncFile, next), + pngDir, + True, + lastMonth)) p.start() p.join()