Merge pull request clawpack#233 from clawpack/python3

Support Python 3

.travis.yml

@@ -1,16 +1,17 @@
 language: python
 python:
   - 2.7
+  - 3.5
 env:
   - BUILD_TYPE="Release"
 
 before_install:
   - sudo apt-get update
   - sudo apt-get install gfortran liblapack-dev
   # Print NumPy version that is already installed by Travis CI:
-  - python -c "import numpy; print numpy.__version__"
+  - python -c "import numpy; print(numpy.__version__)"
   # - pip install matplotlib
-  # - python -c "import matplotlib; print matplotlib.__version__"
+  # - python -c "import matplotlib; print(matplotlib.__version__)"
   - git clone --branch=master --depth=100 --quiet git://github.com/clawpack/clawpack
   - cd clawpack
   - python setup.py symlink-only

examples/multi-layer/plane_wave/run_tests.py

@@ -17,6 +17,8 @@
 #                     http://www.opensource.org/licenses/
 # ============================================================================
 
+from __future__ import absolute_import
+from __future__ import print_function
 import sys
 import numpy
 
@@ -174,11 +176,11 @@ def __str__(self):
                 tests_to_run.append(tests[int(test)])
 
         controller = batch.BatchController(tests_to_run)
-        print controller
+        print(controller)
         controller.run()
 
     else:
         controller = batch.BatchController(tests)
-        print controller
+        print(controller)
 
 

examples/multi-layer/plane_wave/setplot.py

@@ -7,6 +7,7 @@
     
 """ 
 
+from __future__ import absolute_import
 def setplot(plotdata,  bathy_location=0.15,  bathy_angle=0.0,  
                        bathy_left=-1.0,      bathy_right=-0.2):
     """Setup the plotting data objects.

examples/multi-layer/plane_wave/setrun.py

@@ -6,6 +6,8 @@
 
 """
 
+from __future__ import absolute_import
+from __future__ import print_function
 import numpy as numpy
 
 import clawpack.geoclaw.data
@@ -421,7 +423,7 @@ def setgeo(rundata):
     try:
         geo_data = rundata.geo_data
     except:
-        print "*** Error, this rundata has no geo_data attribute"
+        print("*** Error, this rundata has no geo_data attribute")
         raise AttributeError("Missing geo_data attribute")
 
     # == Physics ==
@@ -511,11 +513,11 @@ def write_topo_file(run_data, out_file, **kwargs):
 
     # Write out simple bathy geometry file for communication to the plotting
     with open("./bathy_geometry.data", 'w') as bathy_geometry_file:
-        if kwargs.has_key("location"):
+        if "location" in kwargs:
             location = kwargs['location']
         else:
             location = 0.15
-        if kwargs.has_key("angle"):
+        if "angle" in kwargs:
             angle = kwargs['angle']
         else:
             angle = 0.0

examples/run_tests.py

@@ -2,6 +2,8 @@
 Run all examples and then compare to gallery versions, if available.
 """
 
+from __future__ import absolute_import
+from __future__ import print_function
 from clawpack.clawutil import regression_tests, make_all
 import os
 
@@ -13,10 +15,10 @@
 make_all.make_all(make_clean_first=True, env=env)
 
 
-print "\n-----------------------------------------------------------\n"
+print("\n-----------------------------------------------------------\n")
 
 all_ok = regression_tests.test_subdirs()
 if all_ok:
-    print "===> All tests pass"
+    print("===> All tests pass")
 else:
-    print "===> Some test(s) failed"
+    print("===> Some test(s) failed")

examples/storm-surge/ike/get_bathy.py

@@ -2,6 +2,7 @@
 
 """Simple implementation of a file fetcher"""
 
+from __future__ import absolute_import
 import sys
 import os
 import clawpack.clawutil.data

examples/storm-surge/ike/plot_num_grids.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import absolute_import
 import os
 import sys
 import glob
@@ -9,6 +10,7 @@
 
 # Plot customization
 import matplotlib
+from six.moves import range
 
 # Markers and line widths
 matplotlib.rcParams['lines.linewidth'] = 2.0
@@ -90,7 +92,7 @@ def set_cell_ticks():
     colors = [ (value / 256.0, value / 256.0, value / 256.0) 
                                     for value in [247, 217, 189, 150, 115, 82, 37] ]
     proxy_artists = [plt.Rectangle((0, 0), 1, 1, fc=colors[level], 
-            label="Level %s" % (str(level+1))) for level in xrange(num_levels)]
+            label="Level %s" % (str(level+1))) for level in range(num_levels)]
 
     # Number of grids
     fig = plt.figure()
@@ -104,7 +106,7 @@ def set_cell_ticks():
     set_day_ticks()
     axes.set_ylabel('Number of Grids')
     axes.set_title("Number of Grids per Level in Time")
-    axes.legend(proxy_artists, ["Level %s" % (str(level+1)) for level in xrange(num_levels)], loc=2)
+    axes.legend(proxy_artists, ["Level %s" % (str(level+1)) for level in range(num_levels)], loc=2)
     fig.savefig("num_grids.png")
 
     # Number of cells
@@ -119,7 +121,7 @@ def set_cell_ticks():
     axes.set_xlabel('Days from landfall')
     axes.set_ylabel('Number of Cells')
     axes.set_title("Number of Cells per Level in Time")
-    axes.legend(proxy_artists, ["Level %s" % (str(level+1)) for level in xrange(num_levels)], loc=2)
+    axes.legend(proxy_artists, ["Level %s" % (str(level+1)) for level in range(num_levels)], loc=2)
     fig.savefig("num_cells.png")
 
 

examples/storm-surge/ike/setplot.py

@@ -7,6 +7,7 @@
     
 """
 
+from __future__ import absolute_import
 article = False
 
 import os

examples/storm-surge/ike/setplot_kml.py

@@ -7,6 +7,7 @@
 
 """
 
+from __future__ import absolute_import
 article = False
 
 import os

examples/storm-surge/ike/setrun.py

@@ -7,6 +7,8 @@
 
 """
 
+from __future__ import absolute_import
+from __future__ import print_function
 import os
 import datetime
 
@@ -360,7 +362,7 @@ def setgeo(rundata):
     try:
         geo_data = rundata.geo_data
     except:
-        print "*** Error, this rundata has no geo_data attribute"
+        print("*** Error, this rundata has no geo_data attribute")
         raise AttributeError("Missing geo_data attribute")
 
     # == Physics ==

examples/tsunami/bowl-radial/maketopo.py

@@ -3,6 +3,7 @@
 Module to create topo and qinit data files for this example.
 """
 
+from __future__ import absolute_import
 from clawpack.geoclaw.topotools import Topography
 from numpy import *
 

examples/tsunami/bowl-radial/setplot.py

@@ -8,10 +8,12 @@
 """ 
 
 
+from __future__ import absolute_import
+from __future__ import print_function
 try:
     from setplotfg import setplotfg
 except:
-    print "Did not find setplotfg.py"
+    print("Did not find setplotfg.py")
     setplotfg = None
 
 

examples/tsunami/bowl-radial/setrun.py

@@ -6,6 +6,8 @@
 
 """
 
+from __future__ import absolute_import
+from __future__ import print_function
 import os
 import numpy as np
 
@@ -355,7 +357,7 @@ def setgeo(rundata):
     try:
         geo_data = rundata.geo_data
     except:
-        print "*** Error, this rundata has no geo_data attribute"
+        print("*** Error, this rundata has no geo_data attribute")
         raise AttributeError("Missing geo_data attribute")
 
 

examples/tsunami/bowl-slosh/maketopo.py

@@ -3,6 +3,7 @@
 Module to create topo and qinit data files for this example.
 """
 
+from __future__ import absolute_import
 from clawpack.geoclaw.topotools import Topography
 from numpy import *
 

examples/tsunami/bowl-slosh/setplot.py

@@ -7,6 +7,7 @@
     
 """ 
 
+from __future__ import absolute_import
 import numpy
 a = 1.
 sigma = 0.5

examples/tsunami/bowl-slosh/setrun.py

@@ -6,6 +6,8 @@
 
 """
 
+from __future__ import absolute_import
+from __future__ import print_function
 import os
 import numpy as np
 
@@ -333,7 +335,7 @@ def setgeo(rundata):
     try:
         geo_data = rundata.geo_data
     except:
-        print "*** Error, this rundata has no geo_data attribute"
+        print("*** Error, this rundata has no geo_data attribute")
         raise AttributeError("Missing geo_data attribute")
 
 

examples/tsunami/chile2010/maketopo.py

@@ -8,6 +8,8 @@
 Call functions with makeplots==True to create plots of topo, slip, and dtopo.
 """
 
+from __future__ import absolute_import
+from __future__ import print_function
 import os
 
 import clawpack.clawutil.data
@@ -36,7 +38,7 @@ def get_topo(makeplots=False):
         topo.plot()
         fname = os.path.splitext(topo_fname)[0] + '.png'
         plt.savefig(fname)
-        print "Created ",fname
+        print("Created ",fname)
 
 
 
@@ -68,13 +70,13 @@ def make_dtopo(makeplots=False):
     fault = dtopotools.Fault()
     fault.subfaults = [usgs_subfault]
 
-    print "Mw = ",fault.Mw()
+    print("Mw = ",fault.Mw())
 
     if os.path.exists(dtopo_fname):
-        print "*** Not regenerating dtopo file (already exists): %s" \
-                    % dtopo_fname
+        print("*** Not regenerating dtopo file (already exists): %s" \
+                    % dtopo_fname)
     else:
-        print "Using Okada model to create dtopo file"
+        print("Using Okada model to create dtopo file")
 
         x = numpy.linspace(-77, -67, 100)
         y = numpy.linspace(-40, -30, 100)
@@ -89,7 +91,7 @@ def make_dtopo(makeplots=False):
         from matplotlib import pyplot as plt
         if fault.dtopo is None:
             # read in the pre-existing file:
-            print "Reading in dtopo file..."
+            print("Reading in dtopo file...")
             dtopo = dtopotools.DTopography()
             dtopo.read(dtopo_fname, dtopo_type=3)
             x = dtopo.x
@@ -103,7 +105,7 @@ def make_dtopo(makeplots=False):
         dtopo.plot_dZ_colors(1.,axes=ax2)
         fname = os.path.splitext(os.path.split(dtopo_fname)[-1])[0] + '.png'
         plt.savefig(fname)
-        print "Created ",fname
+        print("Created ",fname)
 
 
 if __name__=='__main__':

examples/tsunami/chile2010/plot_dart.py

@@ -2,6 +2,7 @@
 Compare DART buoy results to NOAA results.
 """
 
+from __future__ import absolute_import
 import pylab 
 from pyclaw.plotters.data import ClawPlotData
 from matplotlib import image

examples/tsunami/chile2010/plotfg.py

@@ -1,4 +1,5 @@
 
+from __future__ import absolute_import
 from pylab import *
 
 outdir = '_output'

examples/tsunami/chile2010/setplot.py

@@ -7,15 +7,18 @@
     
 """ 
 
+from __future__ import absolute_import
+from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 
 from clawpack.geoclaw import topotools
+from six.moves import range
 
 try:
     TG32412 = np.loadtxt('32412_notide.txt')
 except:
-    print "*** Could not load DART data file"
+    print("*** Could not load DART data file")
 
 #--------------------------
 def setplot(plotdata):

examples/tsunami/chile2010/setplot_kml.py

@@ -7,15 +7,18 @@
 
 """
 
+from __future__ import absolute_import
+from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 
 from clawpack.geoclaw import topotools
+from six.moves import range
 
 try:
     TG32412 = np.loadtxt('32412_notide.txt')
 except:
-    print "*** Could not load DART data file"
+    print("*** Could not load DART data file")
 
 #--------------------------
 def setplot(plotdata):

examples/tsunami/chile2010/setplot_speeds.py

@@ -7,15 +7,18 @@
     
 """ 
 
+from __future__ import absolute_import
+from __future__ import print_function
 import numpy as np
 import matplotlib.pyplot as plt
 
 from clawpack.geoclaw import topotools
+from six.moves import range
 
 try:
     TG32412 = np.loadtxt('32412_notide.txt')
 except:
-    print "*** Could not load DART data file"
+    print("*** Could not load DART data file")
 
 
 #--------------------------