[cig-commits] [commit] master: py: Remove unused imports. (9bfd9c9)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem1d

On branch  : master
Link       : https://github.com/geodynamics/specfem1d/compare/c63d455e0ff0075e43cb487147ab0bc101d4019c...81ba23d88e3baad884dd78c47c7581ffe856f7b2

>---------------------------------------------------------------

commit 9bfd9c92df766e79729e89c9df242b03bc97fbb8
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Wed Jan 7 03:48:47 2015 -0500

    py: Remove unused imports.


>---------------------------------------------------------------

9bfd9c92df766e79729e89c9df242b03bc97fbb8
 Python_version/defines.py                 | 20 ++++++++------------
 Python_version/functions.py               | 11 +----------
 Python_version/main_for_Python_version.py | 16 +++++-----------
 3 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/Python_version/defines.py b/Python_version/defines.py
index f232838..76b5312 100644
--- a/Python_version/defines.py
+++ b/Python_version/defines.py
@@ -19,14 +19,10 @@ except ImportError:
     # Python 2
     from ConfigParser import SafeConfigParser
 
-import numpy as np  # NumPy (multidimensional arrays, linear algebra, ...)
-import scipy as sp  # SciPy (signal and image processing library)
-import matplotlib as mpl         # Matplotlib (2D/3D plotting library)
-import matplotlib.pyplot as plt  # Matplotlib's pyplot: MATLAB-like syntax
-from pylab import *              # Matplotlib's pylab interface
+import numpy as np
+import matplotlib.pyplot as plt
 
-# --- FUNCTIONS --- #
-import functions        # Contains fundamental functions
+import functions
 
 
 # Gauss Lobatto Legendre points and integration weights
@@ -193,8 +189,8 @@ class OneDgrid:
         self.mu=np.zeros((param.nSpec,param.nGLL))
         self.ticks=np.zeros(param.nSpec+1)
         if param.gridType == 'homogeneous':
-            self.ticks=linspace(0,param.length,param.nSpec+1)
-            for e in arange(param.nSpec):
+            self.ticks = np.linspace(0, param.length, param.nSpec + 1)
+            for e in np.arange(param.nSpec):
                 for i in np.arange(param.nGLL):
                     self.rho[e,i] = param.meanRho
                     self.mu[e,i] = param.meanMu
@@ -230,14 +226,14 @@ class OneDgrid:
         plt.figure(fig)
         sub1=plt.subplot(211)
         plt.hold(True)
-        for e in arange(self.param.nSpec):
+        for e in np.arange(self.param.nSpec):
             for i in np.arange(self.param.nGLL):
                 plt.plot(self.z[self.param.ibool[e,i]],self.rho[e,i],'b+')
         sub1.set_title(r'$\rho(z)$')
         plt.xticks(self.ticks)
         plt.grid(True)
         sub2=plt.subplot(212)
-        for e in arange(self.param.nSpec):
+        for e in np.arange(self.param.nSpec):
             for i in np.arange(self.param.nGLL):
                 plt.plot(self.z[self.param.ibool[e,i]],self.mu[e,i],'r+')
         sub2.set_title(r'$\mu(z)$')
@@ -269,7 +265,7 @@ class Source:
 
     def plotSource(self,fig=1):
         """Plot the source"""
-        t=linspace(0,self.hdur,1000)
+        t = np.linspace(0, self.hdur, 1000)
         plt.figure(fig)
         plt.plot(t,self[t],'b')
         plt.title('Source(t)')
diff --git a/Python_version/functions.py b/Python_version/functions.py
index 54e598f..270b1d0 100644
--- a/Python_version/functions.py
+++ b/Python_version/functions.py
@@ -8,18 +8,9 @@ elements simulations.
 @author: Alexis Bottero (alexis.bottero at gmail.com)
 """
 
-# --- MODULES AND PACKAGES ---
-import numpy as np  # NumPy (multidimensional arrays, linear algebra, ...)
-from numpy import diff
-import scipy as sp  # SciPy (signal and image processing library)
-from scipy import misc
+import numpy as np
 from scipy.interpolate import interp1d
-import matplotlib as mpl         # Matplotlib (2D/3D plotting library)
-import matplotlib.pyplot as plt  # Matplotlib's pyplot: MATLAB-like syntax
-from pylab import *              # Matplotlib's pylab interface
 
-# --- FUNCTIONS ---
-import defines       # Contains all the constants and parameters
 
 def globalArray(nSpec,nGLL):
     """Returns a matrix A. A[element_number,GLL_considered] -> index in the
diff --git a/Python_version/main_for_Python_version.py b/Python_version/main_for_Python_version.py
index 762d484..9517585 100644
--- a/Python_version/main_for_Python_version.py
+++ b/Python_version/main_for_Python_version.py
@@ -14,15 +14,9 @@ Main script for 1D spectral elements.
 @author: Alexis Bottero, CNRS Marseille, France (alexis.bottero at gmail.com)
 """
 
-### --- MODULES AND PACKAGES --- ###
-import numpy as np  # NumPy (multidimensional arrays, linear algebra, ...)
-import scipy as sp  # SciPy (signal and image processing library)
-import matplotlib as mpl         # Matplotlib (2D/3D plotting library)
-import matplotlib.pyplot as plt  # Matplotlib's pyplot: MATLAB-like syntax
-from pylab import *              # Matplotlib's pylab interface
-
-### --- FUNCTIONS --- ###
-import defines          # Contains all the constants and parameters
+import numpy as np
+import matplotlib.pyplot as plt
+
 from defines import Parameter
 from defines import OneDgrid
 from defines import Source
@@ -55,7 +49,7 @@ if param.plot:
     fig = plt.figure()
     plt.hold(False)
     bz = -np.array([i for i in reversed(grid.z)])
-    cz = append(bz, grid.z)
+    cz = np.append(bz, grid.z)
 
 # Main time loop :
 for it in np.arange(param.nts):
@@ -78,7 +72,7 @@ for it in np.arange(param.nts):
     if param.plot and it % param.dplot == 0:
         if param.axisym:
             b=np.array([i for i in reversed(u)])
-            c=append(b,u)
+            c = np.append(b, u)
             plt.plot(cz,c)
             plt.xlim([-max(grid.z),max(grid.z)])
             plt.ylim([-10,10]) #plt.ylim([0,0.01])