Merge pull request #71 from taataam/master

Cleaned up and added some new information

Author: harpolea

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
@@ -110,17 +110,18 @@ def unsplit_fluxes(my_data, rp, dt, scalar_name):
 
     # the zone where we grab the transverse flux derivative from
     # depends on the sign of the advective velocity
-    dtdx2 = 0.5 * dt / myg.dx
-    dtdy2 = 0.5 * dt / myg.dy
+    dtdx2 = 0.5*dt/myg.dx
+    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/problems/_slotted.defaults

@@ -1,3 +1,3 @@
 [slotted]
-omega = 0.5     ;angular velocity
-offset = 0.25   ;offset of the slot center from domain center
+omega = 0.5   ;angular velocity
+offset = 0.25 ;offset of the slot center from domain center

advection_nonuniform/problems/_smooth.defaults

@@ -15,28 +15,4 @@ advection\_nonuniform\.problems\.slotted module
 .. automodule:: advection_nonuniform.problems.slotted
     :members:
     :undoc-members:
-    :show-inheritance:
-
-advection\_nonuniform\.problems\.smooth module
-----------------------------------------------
-
-.. automodule:: advection_nonuniform.problems.smooth
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-advection\_nonuniform\.problems\.test module
---------------------------------------------
-
-.. automodule:: advection_nonuniform.problems.test
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-advection\_nonuniform\.problems\.tophat module
-----------------------------------------------
-
-.. automodule:: advection_nonuniform.problems.tophat
-    :members:
-    :undoc-members:
-    :show-inheritance:
+    :show-inheritance:

advection_nonuniform/problems/_tophat.defaults

@@ -28,3 +28,12 @@
   | particle_generator               | ``grid``       |                                                    |
   +----------------------------------+----------------+----------------------------------------------------+
 
+* section: [slotted]
+
+  +----------------------------------+----------------+----------------------------------------------------+
+  | option                           | value          | description                                        |
+  +==================================+================+====================================================+
+  | omega                            | ``0.5``        | angular velocity                                   |
+  +----------------------------------+----------------+----------------------------------------------------+
+  | offset                           | ``0.25``       | offset of the slot's center from domain's center   |
+  +----------------------------------+----------------+----------------------------------------------------+