run pyupgrade and fix name clashes (#110)

in particular, profile and io should be renamed to not clash with python modules

Author: zingale

advection/simulation.py

@@ -38,7 +38,7 @@ def initialize(self):
             self.particles = particles.Particles(self.cc_data, bc, n_particles, particle_generator)
 
         # now set the initial conditions for the problem
-        problem = importlib.import_module("advection.problems.{}".format(self.problem_name))
+        problem = importlib.import_module(f"advection.problems.{self.problem_name}")
         problem.init_data(self.cc_data, self.rp)
 
     def method_compute_timestep(self):
@@ -141,7 +141,7 @@ def dovis(self):
             ax.set_xlim([myg.xmin, myg.xmax])
             ax.set_ylim([myg.ymin, myg.ymax])
 
-        plt.figtext(0.05, 0.0125, "t = {:10.5f}".format(self.cc_data.t))
+        plt.figtext(0.05, 0.0125, f"t = {self.cc_data.t:10.5f}")
 
         plt.pause(0.001)
         plt.draw()

advection_fv4/simulation.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import importlib
 import advection_rk
 import advection_fv4.fluxes as flx
@@ -33,7 +31,7 @@ def initialize(self):
             self.particles = particles.Particles(self.cc_data, bc, n_particles, particle_generator)
 
         # now set the initial conditions for the problem
-        problem = importlib.import_module("advection_fv4.problems.{}".format(self.problem_name))
+        problem = importlib.import_module(f"advection_fv4.problems.{self.problem_name}")
         problem.init_data(self.cc_data, self.rp)
 
     def substep(self, myd):

advection_nonuniform/simulation.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import importlib
 import numpy as np
 import matplotlib
@@ -61,7 +59,7 @@ def shift(velocity):
             self.particles = particles.Particles(self.cc_data, bc, n_particles, particle_generator)
 
         # now set the initial conditions for the problem
-        problem = importlib.import_module("advection_nonuniform.problems.{}".format(self.problem_name))
+        problem = importlib.import_module(f"advection_nonuniform.problems.{self.problem_name}")
         problem.init_data(self.cc_data, self.rp)
 
         # compute the required shift for each node using corresponding velocity at the node
@@ -168,7 +166,7 @@ def dovis(self):
             ax.set_xlim([myg.xmin, myg.xmax])
             ax.set_ylim([myg.ymin, myg.ymax])
 
-        plt.figtext(0.05, 0.0125, "t = {:10.5f}".format(self.cc_data.t))
+        plt.figtext(0.05, 0.0125, f"t = {self.cc_data.t:10.5f}")
 
         plt.pause(0.001)
         plt.draw()

advection_rk/simulation.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import advection
 import advection_rk.fluxes as flx
 import mesh.integration as integration

advection_weno/simulation.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import advection
 import advection_weno.fluxes as flx
 import mesh.integration as integration

analysis/convergence.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import sys
-import util.io as io
+import util.io_pyro as io
 import numpy as np
 
 # read in two files -- one twice the resolution of the other, and

analysis/dam_compare.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 
 import numpy as np
 from scipy.optimize import brentq
 import sys
 import os
 import matplotlib.pyplot as plt
-from util import msg, runparams, io
+from util import msg, runparams
+import util.io_pyro as io
 
 usage = """
       compare the output for a dam problem with the exact solution contained

analysis/gauss_diffusion_compare.py

@@ -1,12 +1,11 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 
 import numpy as np
 import sys
 import matplotlib.pyplot as plt
 import diffusion.problems.gaussian as gaussian
-from util import io
+import util.io_pyro as io
 import matplotlib as mpl
 
 mpl.rcParams["text.usetex"] = True

analysis/incomp_converge_error.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 
 import numpy as np
 import sys
 import math
-from util import io
+import util.io_pyro as io
 
 usage = """
       compare the output in file from the incompressible converge problem to

analysis/plot_thumbnail.py

@@ -3,7 +3,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import sys
-from util import io
+import util.io_pyro as io
 
 # plot an output file using the solver's dovis script