Merge branch 'polar-coords' of https://github.com/ssagynbayeva/pyro2 into polar-coords

Author: ssagynbayeva

pyro/advection/problems/smooth.py

@@ -8,6 +8,7 @@
 
 def init_data(my_data, rp):
     """ initialize the smooth advection problem """
+    del rp  # this problem doesn't use runtime params
 
     msg.bold("initializing the smooth advection problem...")
 

pyro/advection/problems/test.py

@@ -5,6 +5,7 @@
 
 def init_data(my_data, rp):
     """ an init routine for unit testing """
+    del rp  # this problem doesn't use runtime params
 
     # make sure that we are passed a valid patch object
     if not isinstance(my_data, patch.CellCenterData2d):

pyro/advection/problems/tophat.py

@@ -6,6 +6,7 @@
 
 def init_data(myd, rp):
     """ initialize the tophat advection problem """
+    del rp  # this problem doesn't use runtime params
 
     msg.bold("initializing the tophat advection problem...")
 

pyro/advection_fv4/interface.py

@@ -28,6 +28,7 @@ def states(a, ng, idir):
     out : ndarray, ndarray
         The state predicted to the left and right edges.
     """
+    # pylint: disable=too-many-nested-blocks
 
     qx, qy = a.shape
 

pyro/advection_fv4/problems/smooth.py

@@ -6,6 +6,7 @@
 
 def init_data(my_data, rp):
     """ initialize the smooth advection problem """
+    del rp  # this problem doesn't use runtime params
 
     msg.bold("initializing the smooth FV advection problem...")
 

pyro/advection_nonuniform/problems/test.py

@@ -4,6 +4,7 @@
 
 def init_data(my_data, rp):
     """ an init routine for unit testing """
+    del rp  # this problem doesn't use runtime params
 
     # make sure that we are passed a valid patch object
     if not isinstance(my_data, patch.CellCenterData2d):

pyro/analysis/convergence.py

@@ -25,8 +25,7 @@ def compare(fine, coarse):
     return float(np.abs(e).max()), e.norm()
 
 
-if __name__ == "__main__":
-
+def main():
     if len(sys.argv) != 3:
         print(usage)
         sys.exit(2)
@@ -40,3 +39,7 @@ def compare(fine, coarse):
     result = compare(ff.cc_data, cc.cc_data)
 
     print("inf norm of density: ", result)
+
+
+if __name__ == "__main__":
+    main()

pyro/analysis/dam_compare.py

@@ -106,7 +106,7 @@ def abort(string):
 h0 = rp.get_param("dam.h_right")
 
 
-def find_h2(h2):
+def find_h2(h2):  # pylint: disable=redefined-outer-name
     return (h2/h1)**3 - 9*(h2/h1)**2*(h0/h1) + \
         16*(h2/h1)**1.5*(h0/h1) - (h2/h1)*(h0/h1)*(h0/h1+8) + \
         (h0/h1)**3

pyro/analysis/gauss_diffusion_compare.py

@@ -104,8 +104,7 @@ def process(file):
     return bin_centers, phi_exact, phi_bin
 
 
-if __name__ == "__main__":
-
+def main():
     if len(sys.argv) < 2:
         print(usage)
         sys.exit(2)
@@ -137,3 +136,7 @@ def process(file):
 
     plt.savefig("gauss_diffusion_compare.png", bbox_inches="tight")
     plt.savefig("gauss_diffusion_compare.pdf", bbox_inches="tight", dpi=100)
+
+
+if __name__ == "__main__":
+    main()

pyro/analysis/incomp_converge_error.py

@@ -42,7 +42,7 @@ def get_errors(file):
     return udiff.norm(), vdiff.norm()
 
 
-if __name__ == "__main__":
+def main():
     if len(sys.argv) != 2:
         print(usage)
         sys.exit(2)
@@ -55,3 +55,7 @@ def get_errors(file):
 
     errors = get_errors(file)
     print("errors: ", errors[0], errors[1])
+
+
+if __name__ == "__main__":
+    main()