added image, moved ref to bottom

This commit is contained in:
ZoeRichter 2026-01-21 17:07:18 -06:00
parent 745d4e71bf
commit ca8cb3831e
2 changed files with 253 additions and 11 deletions

View file

@ -0,0 +1,247 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="461.78885"
height="312.40613"
viewBox="0 0 92.35777 62.481226"
version="1.1"
id="svg1"
inkscape:version="1.4.3 (fcd0343856, 2026-01-01)"
sodipodi:docname="jt-truncated-cone.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="true"
showguides="false"
inkscape:zoom="1.9972924"
inkscape:cx="8.0108452"
inkscape:cy="243.32942"
inkscape:window-width="3374"
inkscape:window-height="1371"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer4">
<inkscape:grid
id="grid1"
units="px"
originx="-13"
originy="-9.8211146"
spacingx="1"
spacingy="1"
empcolor="#0099e5"
empopacity="0.30196078"
color="#0099ff"
opacity="0.05490196"
empspacing="5"
enabled="true"
visible="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<defs
id="defs1" />
<g
inkscape:label="cone"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-13,-9.8211146)">
<path
style="fill:none;stroke:#000000;stroke-width:0.6;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 20,20 h 20 20 21 19 L 80,60 H 60 40 Z"
id="path7" />
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="rcone"
transform="translate(-13,-9.8211146)">
<path
style="fill:none;stroke:#0000ff;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:3.2, 0.8;stroke-dashoffset:0;stroke-opacity:1"
d="M 105,10 75,70 v 0 0 0"
id="path8" />
</g>
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="rlim"
transform="translate(-13,-9.8211146)">
<path
style="fill:none;stroke:#ff0000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:3.2, 0.8;stroke-dashoffset:0;stroke-opacity:1"
d="M 100,10 70,70 v 0 0"
id="path9" />
</g>
<g
inkscape:groupmode="layer"
id="layer4"
inkscape:label="axisandlabels"
transform="translate(-13,-9.8211146)">
<path
style="fill:none;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:1.6, 0.4;stroke-dashoffset:0;stroke-opacity:1"
d="M 60,60 V 20 20"
id="path10" />
<path
style="fill:none;stroke:#000000;stroke-width:0.638554;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 84.169456,52.331406 -4.338913,-2.662813 v 0"
id="path11" />
<circle
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.6;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path12"
cx="60"
cy="40"
r="1" />
<path
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 82,51 3,4"
id="path16" />
<circle
style="fill:#7b63ff;fill-opacity:0.860451;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path25"
cx="79.5"
cy="29"
r="2.5" />
<path
style="fill:#7b63ff;fill-opacity:0.860451;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:0.6, 0.6;stroke-dashoffset:0;stroke-opacity:1"
d="m 60,29 h 22 v 0"
id="path26" />
<path
style="fill:#000000;fill-opacity:0.860451;stroke:none;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="M 18,20 Z"
id="path27" />
<path
style="fill:none;fill-opacity:0.860451;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 19,20 h -2 v 20 h 2 v 0"
id="path28" />
<path
style="fill:none;fill-opacity:0.860451;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 82.905591,51.244365 0.448148,-0.893959 0.893959,0.448148 v 0"
id="path29"
inkscape:transform-center-x="-1.261405"
inkscape:transform-center-y="0.73565625" />
</g>
<g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="text"
transform="translate(-13,-9.8211146)">
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.4px;font-family:Serif;-inkscape-font-specification:Serif;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.6;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
x="34.91328"
y="17.644531"
id="text12"><tspan
sodipodi:role="line"
id="tspan12"
style="stroke-width:0.6"
x="34.91328"
y="17.644531"
dx="0 0"
dy="0 1">r<tspan
style="font-size:1.6px"
id="tspan13">major</tspan></tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.6px;font-family:Serif;-inkscape-font-specification:Serif;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.6;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
x="45.91328"
y="62.279686"
id="text14"><tspan
sodipodi:role="line"
id="tspan14"
style="font-size:1.6px;stroke-width:0.6"
x="45.91328"
y="62.279686"
dy="0 1"><tspan
style="font-size:2.4px"
id="tspan15">r</tspan>minor</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.4px;font-family:Serif;-inkscape-font-specification:Serif;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
x="62"
y="40"
id="text17"><tspan
sodipodi:role="line"
id="tspan17"
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.4"
x="62"
y="40"
dy="0 1">z<tspan
style="font-size:1.6px"
id="tspan18">0</tspan></tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.4px;font-family:Serif;-inkscape-font-specification:Serif;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
x="67.913284"
y="71.279686"
id="text19"><tspan
sodipodi:role="line"
id="tspan19"
style="stroke-width:0.4"
x="67.913284"
y="71.279686">r<tspan
style="font-size:1.6px"
id="tspan20"
dy="1">lim</tspan></tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.4px;font-family:Serif;-inkscape-font-specification:Serif;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
x="72.913284"
y="71.279686"
id="text21"><tspan
sodipodi:role="line"
id="tspan21"
style="stroke-width:0.4"
x="72.913284"
y="71.279686"
dy="0 1">r<tspan
style="font-size:1.6px"
id="tspan22">cone</tspan></tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.4px;font-family:Serif;-inkscape-font-specification:Serif;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
x="85.11367"
y="56.279686"
id="text23"><tspan
sodipodi:role="line"
id="tspan23"
style="font-size:2.4px;stroke-width:0.4"
x="85.11367"
y="56.279686"
dy="0 1">r<tspan
style="font-size:1.6px"
id="tspan24">s</tspan></tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.4px;font-family:Serif;-inkscape-font-specification:Serif;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
x="12.903906"
y="28.245703"
id="text25"><tspan
sodipodi:role="line"
id="tspan25"
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.4"
x="12.903906"
y="28.245703">z</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.4px;font-family:Serif;-inkscape-font-specification:Serif;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:0.860451;stroke:none;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
x="82.903908"
y="29.245703"
id="text26"><tspan
sodipodi:role="line"
id="tspan26"
style="fill:#000000;fill-opacity:0.860451;stroke:none;stroke-width:0.2;stroke-dasharray:none"
x="82.903908"
y="29.245703"
dy="0 1">zs</tspan></text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 10 KiB

View file

@ -191,7 +191,7 @@ within the container's boundaries. New spheres which overlap with previously
generated spheres are rejected. This random coordinate selection continues
until the target number of random sphere centers is generated.
In OpenMC, the CRP method implemented uses the Jodrey-Tory algorithm [1]_.
In OpenMC, the CRP method implemented uses the Jodrey-Tory algorithm [Jodrey-Tory]_.
In Jodrey-Tory, each sphere is assigned two diameters: the inner diameter,
:math:`d_{inner}`, and the outer diameter, :math:`d_{outer}`,
which approach each other during the simulation. The inner diameter is defined
@ -260,9 +260,9 @@ the top and bottom surfaces are capped by planes (similar to a cylinder). In
the case of such a container, the limit in r is dependent upon the sphere's
current z-coordinate relative to the top and bottom surfaces of the container.
.. _fig-PLACEHOLDER:
.. _fig-cone-container:
.. figure:: ../_images/IMGDOESNOTEXIST.svg
.. figure:: ../_images/jt-truncated-cone.svg
:align: center
:figclass: align-center
:width: 400px
@ -325,13 +325,6 @@ by choosing the sign that results in adding :math:`r_{minor}`, which gives an
[fix refs later, this formatting is probably wrong]
References
----------
.. [1] W. S. Jodrey and E. M. Tory, "Computer simulation of close random
packing of equal spheres", Phys. Rev. A 32 (1985) 2347-2351.
------------------------------------------
Computing the Distance to Nearest Boundary
------------------------------------------
@ -386,7 +379,7 @@ use the minimum function because some of the calculated distances, which should
be the same in theory (e.g. coincident surfaces), may be slightly different due
to the use of floating-point arithmetic. Consequently, we should first check for
floating-point equality of the current distance calculated and the minimum found
thus far. This is done by checking if
thus far. This is done by checking if:
.. math::
:label: fp-distance
@ -1222,3 +1215,5 @@ surface is known as in :ref:`reflection`.
.. _MCNP: https://mcnp.lanl.gov
.. _Serpent: https://serpent.vtt.fi
.. _Monte Carlo Performance benchmark: https://github.com/mit-crpg/benchmarks/tree/master/mc-performance/openmc
.. [Jodrey-Tory] W. S. Jodrey and E. M. Tory, "Computer simulation of close random
packing of equal spheres", Phys. Rev. A 32 (1985) 2347-2351.