diff --git a/examples/jupyter/search.ipynb b/examples/jupyter/search.ipynb index 0299f319a..6031c4c4d 100644 --- a/examples/jupyter/search.ipynb +++ b/examples/jupyter/search.ipynb @@ -70,8 +70,8 @@ " materials = openmc.Materials([fuel, zircaloy, water])\n", " \n", " # Create cylinders for the fuel and clad\n", - " fuel_outer_radius = openmc.ZCylinder(R=0.39218)\n", - " clad_outer_radius = openmc.ZCylinder(R=0.45720)\n", + " fuel_outer_radius = openmc.ZCylinder(r=0.39218)\n", + " clad_outer_radius = openmc.ZCylinder(r=0.45720)\n", "\n", " # Create boundary planes to surround the geometry\n", " min_x = openmc.XPlane(x0=-0.63, boundary_type='reflective')\n", @@ -141,8 +141,6 @@ "name": "stderr", "output_type": "stream", "text": [ - "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/surface.py:1300: FutureWarning: \"ZCylinder(...) accepts an argument named 'r', not 'R'. Future versions of OpenMC will not accept the capitalized version.\n", - " warn(_WARNING_UPPER.format(type(self).__name__, 'r', 'R'), FutureWarning)\n", "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/mixin.py:71: IDWarning: Another Universe instance already exists with id=0.\n", " warn(msg, IDWarning)\n" ] @@ -158,8 +156,6 @@ "name": "stderr", "output_type": "stream", "text": [ - "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/surface.py:1300: FutureWarning: \"ZCylinder(...) accepts an argument named 'r', not 'R'. Future versions of OpenMC will not accept the capitalized version.\n", - " warn(_WARNING_UPPER.format(type(self).__name__, 'r', 'R'), FutureWarning)\n", "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/mixin.py:71: IDWarning: Another Universe instance already exists with id=0.\n", " warn(msg, IDWarning)\n" ] @@ -175,8 +171,6 @@ "name": "stderr", "output_type": "stream", "text": [ - "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/surface.py:1300: FutureWarning: \"ZCylinder(...) accepts an argument named 'r', not 'R'. Future versions of OpenMC will not accept the capitalized version.\n", - " warn(_WARNING_UPPER.format(type(self).__name__, 'r', 'R'), FutureWarning)\n", "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/mixin.py:71: IDWarning: Another Universe instance already exists with id=0.\n", " warn(msg, IDWarning)\n" ] @@ -192,8 +186,6 @@ "name": "stderr", "output_type": "stream", "text": [ - "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/surface.py:1300: FutureWarning: \"ZCylinder(...) accepts an argument named 'r', not 'R'. Future versions of OpenMC will not accept the capitalized version.\n", - " warn(_WARNING_UPPER.format(type(self).__name__, 'r', 'R'), FutureWarning)\n", "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/mixin.py:71: IDWarning: Another Universe instance already exists with id=0.\n", " warn(msg, IDWarning)\n" ] @@ -209,8 +201,6 @@ "name": "stderr", "output_type": "stream", "text": [ - "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/surface.py:1300: FutureWarning: \"ZCylinder(...) accepts an argument named 'r', not 'R'. Future versions of OpenMC will not accept the capitalized version.\n", - " warn(_WARNING_UPPER.format(type(self).__name__, 'r', 'R'), FutureWarning)\n", "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/mixin.py:71: IDWarning: Another Universe instance already exists with id=0.\n", " warn(msg, IDWarning)\n" ] @@ -226,8 +216,6 @@ "name": "stderr", "output_type": "stream", "text": [ - "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/surface.py:1300: FutureWarning: \"ZCylinder(...) accepts an argument named 'r', not 'R'. Future versions of OpenMC will not accept the capitalized version.\n", - " warn(_WARNING_UPPER.format(type(self).__name__, 'r', 'R'), FutureWarning)\n", "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/mixin.py:71: IDWarning: Another Universe instance already exists with id=0.\n", " warn(msg, IDWarning)\n" ] @@ -243,8 +231,6 @@ "name": "stderr", "output_type": "stream", "text": [ - "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/surface.py:1300: FutureWarning: \"ZCylinder(...) accepts an argument named 'r', not 'R'. Future versions of OpenMC will not accept the capitalized version.\n", - " warn(_WARNING_UPPER.format(type(self).__name__, 'r', 'R'), FutureWarning)\n", "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/mixin.py:71: IDWarning: Another Universe instance already exists with id=0.\n", " warn(msg, IDWarning)\n" ] @@ -260,8 +246,6 @@ "name": "stderr", "output_type": "stream", "text": [ - "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/surface.py:1300: FutureWarning: \"ZCylinder(...) accepts an argument named 'r', not 'R'. Future versions of OpenMC will not accept the capitalized version.\n", - " warn(_WARNING_UPPER.format(type(self).__name__, 'r', 'R'), FutureWarning)\n", "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/mixin.py:71: IDWarning: Another Universe instance already exists with id=0.\n", " warn(msg, IDWarning)\n" ] @@ -277,8 +261,6 @@ "name": "stderr", "output_type": "stream", "text": [ - "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/surface.py:1300: FutureWarning: \"ZCylinder(...) accepts an argument named 'r', not 'R'. Future versions of OpenMC will not accept the capitalized version.\n", - " warn(_WARNING_UPPER.format(type(self).__name__, 'r', 'R'), FutureWarning)\n", "/home/shriwise/.pyenv/versions/3.6.7/lib/python3.6/site-packages/openmc-0.10.0-py3.6-linux-x86_64.egg/openmc/mixin.py:71: IDWarning: Another Universe instance already exists with id=0.\n", " warn(msg, IDWarning)\n" ] @@ -310,7 +292,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 4, "metadata": {}, "outputs": [ { diff --git a/examples/python/pincell_depletion/run_depletion.py b/examples/python/pincell_depletion/run_depletion.py index c4319eb96..c1ad9d20a 100644 --- a/examples/python/pincell_depletion/run_depletion.py +++ b/examples/python/pincell_depletion/run_depletion.py @@ -16,7 +16,6 @@ particles = 1000 time_step = 1*24*60*60 # s final_time = 5*24*60*60 # s time_steps = np.full(final_time // time_step, time_step) -print(time_steps) chain_file = './chain_simple.xml' power = 174 # W/cm, for 2D simulations only (use W for 3D) diff --git a/scripts/openmc-plot-mesh-tally b/scripts/openmc-plot-mesh-tally index 7c42b7281..183fe35c5 100755 --- a/scripts/openmc-plot-mesh-tally +++ b/scripts/openmc-plot-mesh-tally @@ -230,8 +230,6 @@ class MeshPlotter(tk.Frame): v_ind = 2 axial_ind = 3 - (h_ind + v_ind) - print(h_ind, v_ind) - print(dims) dims = (dims[h_ind], dims[v_ind]) mesh_dim = len(self.mesh.dimension) diff --git a/src/tallies/tally_scoring.cpp b/src/tallies/tally_scoring.cpp index 80c7444ce..8d51aa7f2 100644 --- a/src/tallies/tally_scoring.cpp +++ b/src/tallies/tally_scoring.cpp @@ -257,8 +257,7 @@ score_fission_eout(const Particle* p, int i_tally, int i_score, int score_bin) #pragma omp atomic tally.results_(filter_index, i_score, RESULT_VALUE) += score; - } else if (score_bin == SCORE_DELAYED_NU_FISSION && - g != 0) { + } else if (score_bin == SCORE_DELAYED_NU_FISSION && g != 0) { // If the delayed group filter is present, tally to corresponding delayed // group bin if it exists