diff --git a/bfps/NavierStokes.py b/bfps/NavierStokes.py index 3b40be393891272e6b704cedf8c89c9e1d5cc55b..8c441389b88f6b7dc8dc9e8d89a6dd78d212c857 100644 --- a/bfps/NavierStokes.py +++ b/bfps/NavierStokes.py @@ -27,7 +27,6 @@ import os import numpy as np import h5py -import matplotlib.pyplot as plt import bfps import bfps.fluid_base @@ -406,45 +405,6 @@ class NavierStokes(bfps.fluid_base.fluid_particle_base): self.statistics['Lint'] = (2*self.statistics['energy'])**1.5 / self.statistics['diss'] self.statistics['Taylor_microscale'] = (10 * self.parameters['nu'] * self.statistics['energy'] / self.statistics['diss'])**.5 return None - def plot_spectrum( - self, - axis, - quantity = 'energy', - average = True, - color = (1, 0, 0), - cmap = 'coolwarm', - add_Kspec = True, - normalize_k = True, - normalization = 'energy', - label = None): - self.compute_statistics() - norm_factor = 1.0 - if normalization == 'energy': - norm_factor = (self.parameters['nu']**5 * self.statistics['diss'])**(-.25) - k = self.statistics['kshell'].copy() - if normalize_k: - k *= self.statistics['etaK'] - if average: - axis.plot( - k, - self.statistics[quantity + '(k)']*norm_factor, - color = color, - label = label) - else: - for i in range(self.statistics[quantity + '(t, k)'].shape[0]): - axis.plot(k, - self.statistics[quantity + '(t, k)'][i]*norm_factor, - color = plt.get_cmap(cmap)(i*1.0/self.statistics[quantity + '(t, k)'].shape[0])) - if add_Kspec: - axis.plot( - k, - 2*k**(-5./3), - color = 'black', - dashes = (1, 1), - label = '$2(k \\eta_K)^{-5/3}$') - axis.set_xscale('log') - axis.set_yscale('log') - return None def set_plt_style( self, style = {'dashes' : (None, None)}): diff --git a/setup.py b/setup.py index 778d0fbbcfda97dcd85f03cc2202a515bec56606..115956471030e2660977493143967a4bfe35dfff 100644 --- a/setup.py +++ b/setup.py @@ -92,7 +92,7 @@ libbfps = Extension( setup( name = 'bfps', packages = ['bfps'], - install_requires = ['numpy>=1.8', 'matplotlib>=1.3', 'h5py>=2.2.1'], + install_requires = ['numpy>=1.8', 'h5py>=2.2.1'], ext_modules = [libbfps], package_data = {'bfps': header_list + ['../machine_settings.py', 'install_info.pickle']},