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

Author: ssagynbayeva

pyproject.toml

@@ -21,6 +21,20 @@ disable = [
   "missing-function-docstring",
   "missing-module-docstring",
 ]
+enable = [
+  "useless-suppression",
+  "use-symbolic-message-instead",
+]
+
+[tool.pylint.CLASSES]
+defining-attr-methods = [
+  "__init__",
+  "__new__",
+  "setUp",
+  "__post_init__",
+  "initialize",
+  "__array_finalize__",
+]
 
 [tool.pylint.FORMAT]
 max-line-length = 132

pyro/advection/advective_fluxes.py

@@ -1,4 +1,4 @@
-import pyro.mesh.reconstruction as reconstruction
+from pyro.mesh import reconstruction
 
 
 def unsplit_fluxes(my_data, rp, dt, scalar_name):

pyro/advection/problems/smooth.py

@@ -2,7 +2,7 @@
 
 import numpy
 
-import pyro.mesh.patch as patch
+from pyro.mesh import patch
 from pyro.util import msg
 
 
@@ -34,4 +34,3 @@ def init_data(my_data, rp):
 
 def finalize():
     """ print out any information to the user at the end of the run """
-    pass

pyro/advection/problems/test.py

@@ -1,6 +1,6 @@
 import sys
 
-import pyro.mesh.patch as patch
+from pyro.mesh import patch
 
 
 def init_data(my_data, rp):
@@ -23,4 +23,3 @@ def init_data(my_data, rp):
 
 def finalize():
     """ print out any information to the user at the end of the run """
-    pass

pyro/advection/problems/tophat.py

@@ -1,6 +1,6 @@
 import sys
 
-import pyro.mesh.patch as patch
+from pyro.mesh import patch
 from pyro.util import msg
 
 
@@ -37,4 +37,3 @@ def init_data(myd, rp):
 
 def finalize():
     """ print out any information to the user at the end of the run """
-    pass

pyro/advection/simulation.py

@@ -5,10 +5,10 @@
 import numpy as np
 
 import pyro.advection.advective_fluxes as flx
-import pyro.mesh.patch as patch
-import pyro.particles.particles as particles
-import pyro.util.plot_tools as plot_tools
+from pyro.mesh import patch
+from pyro.particles import particles
 from pyro.simulation_null import NullSimulation, bc_setup, grid_setup
+from pyro.util import plot_tools
 
 
 class Simulation(NullSimulation):

pyro/advection_fv4/fluxes.py

@@ -1,5 +1,5 @@
-import pyro.advection_fv4.interface as interface
 import pyro.mesh.array_indexer as ai
+from pyro.advection_fv4 import interface
 
 
 def fluxes(my_data, rp, dt):

pyro/advection_fv4/interface.py

@@ -52,7 +52,7 @@ def states(a, ng, idir):
     jhi = ng + ny
 
     # we need interface values on all faces of the domain
-    if (idir == 1):
+    if idir == 1:
 
         for i in range(ilo - 2, ihi + 3):
             for j in range(jlo - 1, jhi + 1):
@@ -110,14 +110,14 @@ def states(a, ng, idir):
                         # MC Eq. 27
                         rho = d2a_lim / d2af[i, j]
 
-                    if (rho < 1.0 - 1.e-12):
+                    if rho < 1.0 - 1.e-12:
                         # we may need to limit -- these quantities are at cell-centers
                         d3a_min = min(d3a[i - 1, j], d3a[i, j],
                                       d3a[i + 1, j], d3a[i + 2, j])
                         d3a_max = max(d3a[i - 1, j], d3a[i, j],
                                       d3a[i + 1, j], d3a[i + 2, j])
 
-                        if (C3 * max(abs(d3a_min), abs(d3a_max)) <= (d3a_max - d3a_min)):
+                        if C3 * max(abs(d3a_min), abs(d3a_max)) <= (d3a_max - d3a_min):
                             # limit
                             if (dafm[i, j] * dafp[i, j] < 0.0):
                                 # Eqs. 29, 30
@@ -135,13 +135,13 @@ def states(a, ng, idir):
 
                 else:
                     # if Eqs. 24 or 25 didn't hold we still may need to limit
-                    if (abs(dafm[i, j]) >= 2.0 * abs(dafp[i, j])):
+                    if abs(dafm[i, j]) >= 2.0 * abs(dafp[i, j]):
                         ar[i, j] = a[i, j] - 2.0 * dafp[i, j]
 
-                    if (abs(dafp[i, j]) >= 2.0 * abs(dafm[i, j])):
+                    if abs(dafp[i, j]) >= 2.0 * abs(dafm[i, j]):
                         al[i + 1, j] = a[i, j] + 2.0 * dafm[i, j]
 
-    elif (idir == 2):
+    elif idir == 2:
 
         for i in range(ilo - 1, ihi + 1):
             for j in range(jlo - 2, jhi + 3):
@@ -199,14 +199,14 @@ def states(a, ng, idir):
                         # MC Eq. 27
                         rho = d2a_lim / d2af[i, j]
 
-                    if (rho < 1.0 - 1.e-12):
+                    if rho < 1.0 - 1.e-12:
                         # we may need to limit -- these quantities are at cell-centers
                         d3a_min = min(d3a[i, j - 1], d3a[i, j],
                                       d3a[i, j + 1], d3a[i, j + 2])
                         d3a_max = max(d3a[i, j - 1], d3a[i, j],
                                       d3a[i, j + 1], d3a[i, j + 2])
 
-                        if (C3 * max(abs(d3a_min), abs(d3a_max)) <= (d3a_max - d3a_min)):
+                        if C3 * max(abs(d3a_min), abs(d3a_max)) <= (d3a_max - d3a_min):
                             # limit
                             if (dafm[i, j] * dafp[i, j] < 0.0):
                                 # Eqs. 29, 30
@@ -224,10 +224,10 @@ def states(a, ng, idir):
 
                 else:
                     # if Eqs. 24 or 25 didn't hold we still may need to limit
-                    if (abs(dafm[i, j]) >= 2.0 * abs(dafp[i, j])):
+                    if abs(dafm[i, j]) >= 2.0 * abs(dafp[i, j]):
                         ar[i, j] = a[i, j] - 2.0 * dafp[i, j]
 
-                    if (abs(dafp[i, j]) >= 2.0 * abs(dafm[i, j])):
+                    if abs(dafp[i, j]) >= 2.0 * abs(dafm[i, j]):
                         al[i, j + 1] = a[i, j] + 2.0 * dafm[i, j]
 
     return al, ar
@@ -273,7 +273,7 @@ def states_nolimit(a, qx, qy, ng, idir):
     jhi = ng + ny
 
     # we need interface values on all faces of the domain
-    if (idir == 1):
+    if idir == 1:
 
         for i in range(ilo - 2, ihi + 3):
             for j in range(jlo - 1, jhi + 1):
@@ -285,7 +285,7 @@ def states_nolimit(a, qx, qy, ng, idir):
                 al[i, j] = a_int[i, j]
                 ar[i, j] = a_int[i, j]
 
-    elif (idir == 2):
+    elif idir == 2:
 
         for i in range(ilo - 1, ihi + 1):
             for j in range(jlo - 2, jhi + 3):

pyro/advection_fv4/problems/smooth.py

@@ -1,6 +1,6 @@
 import numpy
 
-import pyro.mesh.fv as fv
+from pyro.mesh import fv
 from pyro.util import msg
 
 
@@ -45,4 +45,3 @@ def init_data(my_data, rp):
 
 def finalize():
     """ print out any information to the user at the end of the run """
-    pass

pyro/advection_fv4/simulation.py

@@ -1,10 +1,10 @@
 import importlib
 
 import pyro.advection_fv4.fluxes as flx
-import pyro.advection_rk as advection_rk
 import pyro.mesh.array_indexer as ai
-import pyro.mesh.fv as fv
-import pyro.particles.particles as particles
+from pyro import advection_rk
+from pyro.mesh import fv
+from pyro.particles import particles
 from pyro.simulation_null import bc_setup, grid_setup