for backwards compability, alias the old patch.py class names to the

new ones -- this lets the comparison to the old benchmarks work.

Author: Michael Zingale

DEVELOPMENT

@@ -3,6 +3,8 @@ This is a simple list of the improvements we wish to make to pyro.
 
 coding:
 
+  -- make compatible with python 3.x
+
   -- rewrite to adhere to python style guidelines
 
   -- docstrings should be added everywhere possible

compare.py

@@ -17,11 +17,11 @@
 def compare(myg1, myd1, myg2, myd2):
 
     # compare the grids
-    if (not myg1 == myg2): 
+    if not myg1 == myg2: 
         return "gridbad"
 
     # compare the data
-    if (not myd1.vars == myd2.vars):
+    if not myd1.vars == myd2.vars:
         return "namesbad"
 
 
@@ -31,7 +31,7 @@ def compare(myg1, myd1, myg2, myd2):
     result = 0
 
     n = 0
-    while (n < myd1.nvar):
+    while n < myd1.nvar:
 
         d1 = myd1.get_var(myd1.vars[n])
         d2 = myd2.get_var(myd2.vars[n])
@@ -63,7 +63,7 @@ def compare(myg1, myd1, myg2, myd2):
 
     result = compare(myg1, myd1, myg2, myd2)
 
-    if (result == 0):
+    if result == 0:
         print "SUCCESS: files agree"
     else:
         print "ERROR: ", errors[result]

mesh/patch.py

@@ -888,6 +888,11 @@ def pretty_print(self, varname):
             print " "
             j += 1
 
+# backwards compatibility
+ccData2d = CellCenterData2d
+grid2d = Grid2d
+bcObject = BCObject
+
 def read(filename):
     """
     Read a CellCenterData object from a file and return it and the grid 

util/profile.py

@@ -48,8 +48,6 @@
 
 class timer:
 
-
-
     def __init__ (self, name):
         global timers, stackCount, timerNesting, timerOrder