From 9631f44d290adcb61df97c2234b05b83039d0fac Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 24 May 2013 20:14:14 +0000 Subject: [PATCH] [Python] Fixed some more incompatibilities with Python 2.6 --- interfaces/cython/cantera/examples/multiphase/adiabatic.py | 2 +- .../cython/cantera/examples/multiphase/plasma_equilibrium.py | 2 +- interfaces/cython/cantera/examples/onedim/flame_fixed_T.py | 2 +- interfaces/cython/cantera/examples/onedim/stagnation_flame.py | 4 ++-- interfaces/cython/cantera/examples/reactors/surf_pfr.py | 2 +- interfaces/cython/cantera/examples/surface_chemistry/sofc.py | 2 +- interfaces/cython/cantera/examples/thermo/rankine.py | 2 +- interfaces/cython/cantera/test/utilities.py | 2 +- test/python/testConvert.py | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/interfaces/cython/cantera/examples/multiphase/adiabatic.py b/interfaces/cython/cantera/examples/multiphase/adiabatic.py index 2fcc0c161..2a4e38d5a 100644 --- a/interfaces/cython/cantera/examples/multiphase/adiabatic.py +++ b/interfaces/cython/cantera/examples/multiphase/adiabatic.py @@ -81,7 +81,7 @@ with open(csv_file, 'w') as outfile: writer.writerow(['phi','T (K)'] + mix.species_names) for i in range(npoints): writer.writerow([phi[i], tad[i]] + list(xeq[:,i])) -print('Output written to {}'.format(csv_file)) +print('Output written to {0}'.format(csv_file)) if '--plot' in sys.argv: import matplotlib.pyplot as plt diff --git a/interfaces/cython/cantera/examples/multiphase/plasma_equilibrium.py b/interfaces/cython/cantera/examples/multiphase/plasma_equilibrium.py index 17560a44e..89c521f7f 100644 --- a/interfaces/cython/cantera/examples/multiphase/plasma_equilibrium.py +++ b/interfaces/cython/cantera/examples/multiphase/plasma_equilibrium.py @@ -25,7 +25,7 @@ writer.writerow(['T'] + mix.species_names) # loop over temperature for n in range(100): t = 350.0 + 50.0*n - print('T = {}'.format(t)) + print('T = {0}'.format(t)) mix.T = t mix.P = ct.one_atm mix.species_moles = "K:1.03, H2:2.12, O2:0.9" diff --git a/interfaces/cython/cantera/examples/onedim/flame_fixed_T.py b/interfaces/cython/cantera/examples/onedim/flame_fixed_T.py index 91f802a28..68b18497b 100644 --- a/interfaces/cython/cantera/examples/onedim/flame_fixed_T.py +++ b/interfaces/cython/cantera/examples/onedim/flame_fixed_T.py @@ -32,7 +32,7 @@ def getTempData(filename): except Exception: pass - print('read {} temperature values.'.format(len(z))) + print('read {0} temperature values.'.format(len(z))) # convert z values into non-dimensional relative positions. n = len(z) diff --git a/interfaces/cython/cantera/examples/onedim/stagnation_flame.py b/interfaces/cython/cantera/examples/onedim/stagnation_flame.py index afd7f6ddb..e84f766b4 100644 --- a/interfaces/cython/cantera/examples/onedim/stagnation_flame.py +++ b/interfaces/cython/cantera/examples/onedim/stagnation_flame.py @@ -86,9 +86,9 @@ if os.path.exists(outfile): for m,md in enumerate(mdot): sim.inlet.mdot = md sim.solve(loglevel,refine_grid) - sim.save(outfile, 'mdot{}'.format(m), 'mdot = {} kg/m2/s'.format(md)) + sim.save(outfile, 'mdot{0}'.format(m), 'mdot = {0} kg/m2/s'.format(md)) # write the velocity, temperature, and mole fractions to a CSV file - sim.write_csv('stflame1_{}.csv'.format(m), quiet=False) + sim.write_csv('stflame1_{0}.csv'.format(m), quiet=False) sim.show_stats() diff --git a/interfaces/cython/cantera/examples/reactors/surf_pfr.py b/interfaces/cython/cantera/examples/reactors/surf_pfr.py index 4f5bbef24..2ad71ecb1 100644 --- a/interfaces/cython/cantera/examples/reactors/surf_pfr.py +++ b/interfaces/cython/cantera/examples/reactors/surf_pfr.py @@ -155,4 +155,4 @@ for n in range(NReactors): list(gas.X) + list(surf.coverages)) outfile.close() -print("Results saved to '{}'".format(output_filename)) +print("Results saved to '{0}'".format(output_filename)) diff --git a/interfaces/cython/cantera/examples/surface_chemistry/sofc.py b/interfaces/cython/cantera/examples/surface_chemistry/sofc.py index e516920ac..289a25694 100644 --- a/interfaces/cython/cantera/examples/surface_chemistry/sofc.py +++ b/interfaces/cython/cantera/examples/surface_chemistry/sofc.py @@ -45,7 +45,7 @@ TPB_length_per_area = 1.0e7 # TPB length per unit area [1/m] def show_coverages(s): """Print the coverages for surface s.""" - print('\n{}\n'.format(s.name)) + print('\n{0}\n'.format(s.name)) cov = s.coverages names = s.species_names for n in range(s.n_species): diff --git a/interfaces/cython/cantera/examples/thermo/rankine.py b/interfaces/cython/cantera/examples/thermo/rankine.py index cafb8d06a..d93e8497e 100644 --- a/interfaces/cython/cantera/examples/thermo/rankine.py +++ b/interfaces/cython/cantera/examples/thermo/rankine.py @@ -39,7 +39,7 @@ def expand(fluid, p_final, eta): def printState(n, fluid): - print('\n***************** State {} ******************'.format(n)) + print('\n***************** State {0} ******************'.format(n)) print(fluid.report()) diff --git a/interfaces/cython/cantera/test/utilities.py b/interfaces/cython/cantera/test/utilities.py index a801669ff..1f87a8b3e 100644 --- a/interfaces/cython/cantera/test/utilities.py +++ b/interfaces/cython/cantera/test/utilities.py @@ -14,7 +14,7 @@ class CanteraTest(unittest.TestCase): def assertArrayNear(self, A, B, rtol=1e-8, atol=1e-12, msg=None): if len(A) != len(B): - self.fail("Arrays are of different lengths ({}, {})".format(len(A), len(B))) + self.fail("Arrays are of different lengths ({0}, {1})".format(len(A), len(B))) A = np.asarray(A) B = np.asarray(B) diff --git a/test/python/testConvert.py b/test/python/testConvert.py index 528e2ce67..4039f3f62 100644 --- a/test/python/testConvert.py +++ b/test/python/testConvert.py @@ -46,7 +46,7 @@ class chemkinConverterTest(utilities.CanteraTest): ref_s = ref.entropies_R() gas_s = gas.entropies_R() for i in range(gas.nSpecies()): - message = ' for species {} at T = {}'.format(i, T) + message = ' for species {0} at T = {1}'.format(i, T) self.assertNear(ref_cp[i], gas_cp[i], 1e-7, msg='cp'+message) self.assertNear(ref_h[i], gas_h[i], 1e-7, msg='h'+message) self.assertNear(ref_s[i], gas_s[i], 1e-7, msg='s'+message)