fixed format issues

Author: cheginit

advection_nonuniform/advective_fluxes.py

@@ -78,27 +78,27 @@ def unsplit_fluxes(my_data, rp, dt, scalar_name):
 
     for index, vel in np.ndenumerate(u.v(buf=1)):
         if vel < 0:
-            a_x.v(buf=1)[index] = a.ip(shift_x.v(buf=1)[index], buf=1)[index] - \
-                                  0.5*(1.0 + cx.v(buf=1)[index]) * \
-                                  ldelta_ax.ip(shift_x.v(buf=1)[index], buf=1)[index]
+            a_x.v(buf=1)[index] = a.ip(shift_x.v(buf=1)[index], buf=1)[index]\
+                - 0.5*(1.0 + cx.v(buf=1)[index]) \
+                * ldelta_ax.ip(shift_x.v(buf=1)[index], buf=1)[index]
         else:
-            a_x.v(buf=1)[index] = a.ip(shift_x.v(buf=1)[index], buf=1)[index] + \
-                                  0.5*(1.0 - cx.v(buf=1)[index]) * \
-                                  ldelta_ax.ip(shift_x.v(buf=1)[index], buf=1)[index]
+            a_x.v(buf=1)[index] = a.ip(shift_x.v(buf=1)[index], buf=1)[index]\
+                + 0.5*(1.0 - cx.v(buf=1)[index]) \
+                * ldelta_ax.ip(shift_x.v(buf=1)[index], buf=1)[index]
 
     # upwind in y-direction
     a_y = myg.scratch_array()
     shift_y = my_data.get_var("y-shift").astype(int)
 
     for index, vel in np.ndenumerate(v.v(buf=1)):
         if vel < 0:
-            a_y.v(buf=1)[index] = a.jp(shift_y.v(buf=1)[index], buf=1)[index] - \
-                                  0.5*(1.0 + cy.v(buf=1)[index]) * \
-                                  ldelta_ay.jp(shift_y.v(buf=1)[index], buf=1)[index]
+            a_y.v(buf=1)[index] = a.jp(shift_y.v(buf=1)[index], buf=1)[index]\
+                - 0.5*(1.0 + cy.v(buf=1)[index]) \
+                * ldelta_ay.jp(shift_y.v(buf=1)[index], buf=1)[index]
         else:
-            a_y.v(buf=1)[index] = a.jp(shift_y.v(buf=1)[index], buf=1)[index] + \
-                                  0.5*(1.0 - cy.v(buf=1)[index]) * \
-                                  ldelta_ay.jp(shift_y.v(buf=1)[index], buf=1)[index]
+            a_y.v(buf=1)[index] = a.jp(shift_y.v(buf=1)[index], buf=1)[index]\
+                + 0.5*(1.0 - cy.v(buf=1)[index]) \
+                * ldelta_ay.jp(shift_y.v(buf=1)[index], buf=1)[index]
 
     # compute the transverse flux differences.  The flux is just (u a)
     # HOTF
@@ -114,13 +114,13 @@ def unsplit_fluxes(my_data, rp, dt, scalar_name):
     dtdy2 = 0.5*dt/myg.dy
 
     for index, vel in np.ndenumerate(u.v(buf=1)):
-        F_x.v(buf=1)[index] = vel*(a_x.v(buf=1)[index] -
-                              dtdy2*(F_yt.ip_jp(shift_x.v(buf=1)[index], 1, buf=1)[index] -
-                                     F_yt.ip(shift_x.v(buf=1)[index], buf=1)[index]))
+        F_x.v(buf=1)[index] = vel * (a_x.v(buf=1)[index] - dtdy2 *
+               (F_yt.ip_jp(shift_x.v(buf=1)[index], 1, buf=1)[index] -
+                F_yt.ip(shift_x.v(buf=1)[index], buf=1)[index]))
 
     for index, vel in np.ndenumerate(v.v(buf=1)):
-        F_y.v(buf=1)[index] = vel*(a_y.v(buf=1)[index] -
-                              dtdx2*(F_xt.ip_jp(1, shift_y.v(buf=1)[index], buf=1)[index] -
-                                     F_xt.jp(shift_y.v(buf=1)[index], buf=1)[index]))
+        F_y.v(buf=1)[index] = vel * (a_y.v(buf=1)[index] - dtdx2 *
+               (F_xt.ip_jp(1, shift_y.v(buf=1)[index], buf=1)[index] -
+                F_xt.jp(shift_y.v(buf=1)[index], buf=1)[index]))
 
     return F_x, F_y

advection_nonuniform/simulation.py

@@ -52,11 +52,16 @@ def shift(velocity):
 
         if self.rp.get_param("particles.do_particles") == 1:
             n_particles = self.rp.get_param("particles.n_particles")
-            particle_generator = self.rp.get_param("particles.particle_generator")
-            self.particles = particles.Particles(self.cc_data, bc, n_particles, particle_generator)
+            particle_generator = \
+                self.rp.get_param("particles.particle_generator")
+            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("advection_nonuniform.problems.{}"
+                                          .format(self.problem_name))
         problem.init_data(self.cc_data, self.rp)
 
         # compute the required shift for each node using corresponding velocity at the node
@@ -131,14 +136,14 @@ def dovis(self):
 
         myg = self.cc_data.grid
 
-        _, axes, cbar_title = plot_tools.setup_axes(myg, 1)
+        _, axes, _ = plot_tools.setup_axes(myg, 1)
 
         # plot density
         ax = axes[0]
         img = ax.imshow(np.transpose(dens.v()),
-                   interpolation="nearest", origin="lower",
-                   extent=[myg.xmin, myg.xmax, myg.ymin, myg.ymax],
-                   cmap=self.cm)
+                        interpolation="nearest", origin="lower",
+                        extent=[myg.xmin, myg.xmax, myg.ymin, myg.ymax],
+                        cmap=self.cm)
 
         ax.set_xlabel("x")
         ax.set_ylabel("y")
@@ -158,7 +163,7 @@ def dovis(self):
 
             # plot particles
             ax.scatter(particle_positions[:, 0],
-                particle_positions[:, 1], c=colors, cmap="Greys")
+                       particle_positions[:, 1], c=colors, cmap="Greys")
             ax.set_xlim([myg.xmin, myg.xmax])
             ax.set_ylim([myg.ymin, myg.ymax])