diff --git a/pyro/compressible/interface.py b/pyro/compressible/interface.py index c801bf8ca..d6741650a 100644 --- a/pyro/compressible/interface.py +++ b/pyro/compressible/interface.py @@ -505,13 +505,9 @@ def riemann_cons(idir, ng, coord_type, if idir == 1: U_out[i, j, ixmom] = rho_state * un_state U_out[i, j, iymom] = rho_state * ut_state - if coord_type == 0: - U_out[i, j, ixmom] += p_state else: U_out[i, j, ixmom] = rho_state * ut_state U_out[i, j, iymom] = rho_state * un_state - if coord_type == 0: - U_out[i, j, iymom] += p_state U_out[i, j, iener] = rhoe_state + \ 0.5 * rho_state * (un_state**2 + ut_state**2) diff --git a/pyro/compressible/simulation.py b/pyro/compressible/simulation.py index 94289f3b0..819560fc4 100644 --- a/pyro/compressible/simulation.py +++ b/pyro/compressible/simulation.py @@ -9,7 +9,6 @@ import pyro.mesh.array_indexer as ai import pyro.mesh.boundary as bnd from pyro.compressible import BC, derives, eos -from pyro.mesh.patch import SphericalPolar from pyro.particles import particles from pyro.simulation_null import NullSimulation, bc_setup, grid_setup from pyro.util import msg, plot_tools @@ -369,7 +368,7 @@ def dovis(self): x = myg.scratch_array() y = myg.scratch_array() - if isinstance(myg, SphericalPolar): + if myg.coord_type == 1: x.v()[:, :] = myg.x2d.v()[:, :]*np.sin(myg.y2d.v()[:, :]) y.v()[:, :] = myg.x2d.v()[:, :]*np.cos(myg.y2d.v()[:, :]) else: @@ -408,7 +407,7 @@ def dovis(self): ax.scatter(particle_positions[:, 0], particle_positions[:, 1], s=5, c=colors, alpha=0.8, cmap="Greys") - if isinstance(myg, SphericalPolar): + if myg.coord_type == 1: ax.set_xlim([np.min(x), np.max(x)]) ax.set_ylim([np.min(y), np.max(y)]) else: