[cig-commits] [commit] master: py: Rename defines to config. (d5d43c5)

[cig_noreply at geodynamics.org]

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

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

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

commit d5d43c531ab6c85bc4f1287094381417b7dad598
Author: Elliott Sales de Andrade <quantum.analyst at gmail.com>
Date:   Wed Jan 7 04:23:54 2015 -0500

    py: Rename defines to config.


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

d5d43c531ab6c85bc4f1287094381417b7dad598
 Python_version/{defines.py => config.py}  | 2 +-
 Python_version/functions.py               | 2 +-
 Python_version/main_for_Python_version.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Python_version/defines.py b/Python_version/config.py
similarity index 99%
rename from Python_version/defines.py
rename to Python_version/config.py
index 3758828..d2ae85b 100644
--- a/Python_version/defines.py
+++ b/Python_version/config.py
@@ -134,7 +134,7 @@ class Parameter(object):
         self.derivGLJ = gll.glj_derivative(self.ksiGLJ)
 
 
-class Source:
+class Source(object):
     """Contains the source properties"""
 
     def __init__(self,param):
diff --git a/Python_version/functions.py b/Python_version/functions.py
index a130cbc..7034f29 100644
--- a/Python_version/functions.py
+++ b/Python_version/functions.py
@@ -25,7 +25,7 @@ def estimateDt(grid,param):
     dzMin=(grid.z[1:]-grid.z[:len(grid.z)-1]).min()
     dh=param.length/(len(grid.z)-1)
     vMax = np.sqrt(param.meanMu/param.meanRho).max()
-    dt = param.cfl*dh/vMax # defines.CFL*dzMin/vMax # TODO : See why...?!
+    dt = param.cfl*dh/vMax # param.CFL*dzMin/vMax # TODO : See why...?!
     return dt
 #    z0=((ksi+1)/(1-ksi)*ticks[elt_number+1]+ticks[elt_number])*1/(1+(ksi+1)/(1-ksi))
 def invProjection(ksi, elt_number, ticks):
diff --git a/Python_version/main_for_Python_version.py b/Python_version/main_for_Python_version.py
index 3d9947b..b57ddb7 100644
--- a/Python_version/main_for_Python_version.py
+++ b/Python_version/main_for_Python_version.py
@@ -17,8 +17,8 @@ Main script for 1D spectral elements.
 import numpy as np
 import matplotlib.pyplot as plt
 
-from defines import Parameter
-from defines import Source
+from config import Parameter
+from config import Source
 import functions        # Contains fundamental functions
 from grid import OneDimensionalGrid