[cig-commits] [commit] master: py: Only import matplotlib if plotting is on. (4faa8a0)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Jan 8 21:13:30 PST 2015
Repository : https://github.com/geodynamics/specfem1d
On branch : master
Link : https://github.com/geodynamics/specfem1d/compare/81ba23d88e3baad884dd78c47c7581ffe856f7b2...9969ec4660bfbd56d30e7cea351276fec0318f59
>---------------------------------------------------------------
commit 4faa8a0fb98ae318e842165a305bac6243706bbc
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Thu Jan 8 13:39:56 2015 -0500
py: Only import matplotlib if plotting is on.
>---------------------------------------------------------------
4faa8a0fb98ae318e842165a305bac6243706bbc
Python_version/config.py | 2 +-
Python_version/grid.py | 2 +-
Python_version/specfem1d.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Python_version/config.py b/Python_version/config.py
index d4b7a24..17e694d 100644
--- a/Python_version/config.py
+++ b/Python_version/config.py
@@ -20,7 +20,6 @@ except ImportError:
from ConfigParser import SafeConfigParser
import numpy as np
-import matplotlib.pyplot as plt
import gll
import functions
@@ -166,6 +165,7 @@ class Source(object):
def plotSource(self,fig=1):
"""Plot the source"""
+ import matplotlib.pyplot as plt
t = np.linspace(0, self.hdur, 1000)
plt.figure(fig)
plt.plot(t,self[t],'b')
diff --git a/Python_version/grid.py b/Python_version/grid.py
index 9eaf19e..8eb60d1 100644
--- a/Python_version/grid.py
+++ b/Python_version/grid.py
@@ -4,7 +4,6 @@ Definitions of the grid.
'''
import numpy as np
-import matplotlib.pyplot as plt
import functions
import gll
@@ -59,6 +58,7 @@ class OneDimensionalGrid(object):
my_ticks gives the abscissa of the borders
TODO I should test : _the types of the parameters
_their sizes"""
+ import matplotlib.pyplot as plt
plt.figure(fig)
sub1=plt.subplot(211)
plt.hold(True)
diff --git a/Python_version/specfem1d.py b/Python_version/specfem1d.py
index c649bb3..a557c59 100755
--- a/Python_version/specfem1d.py
+++ b/Python_version/specfem1d.py
@@ -16,7 +16,6 @@ Main script for 1D spectral elements.
"""
import numpy as np
-import matplotlib.pyplot as plt
from config import Parameter
from config import Source
@@ -46,6 +45,7 @@ u=np.zeros(param.nGlob,dtype='d')
vel,acc=np.zeros_like(u),np.zeros_like(u)
if param.plot:
+ import matplotlib.pyplot as plt
plt.ion()
fig = plt.figure()
plt.hold(False)
More information about the CIG-COMMITS
mailing list