diff --git a/.gitignore b/.gitignore index 879f03d..0f72b90 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ out* slurm-*.out tmp runs - +*.pyc +*.pyo diff --git a/e2-estia.i b/e2-estia.i index 18190c6..57315d1 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -125,7 +125,7 @@ c ------------------------------------------------------- c --------------- PHYSICS CARDS -------------------------- c ------------------------------------------------------- c dbcn 375642321 j j j j j j j j j j j 15291711 -nps 3e9 +nps 2e9 c histp mode n p n h / d t s a c volume calculated for tally cells (spheres) diff --git a/geometry/estia_inbunker.i b/geometry/estia_inbunker.i index 52b07a5..f7ac4b3 100644 --- a/geometry/estia_inbunker.i +++ b/geometry/estia_inbunker.i @@ -137,9 +137,9 @@ c collimators -1691 1690 c c BBG beam top/beam bottom/outside -2001 4 -1.2E-3 2100 -2101 -2301 -2302 -2303 -2304 3 #701 -2011 4 -1.2E-3 2100 -2101 -2301 -2302 -2305 -2306 3 -2021 4 -1.2E-3 2100 -2101 2201 2202 2203 2204 3 +2001 9 2.45e-05 2100 -2101 -2301 -2302 -2303 -2304 3 #701 +2011 9 2.45e-05 2100 -2101 -2301 -2302 -2305 -2306 3 +2021 14 -8.92 2100 -2101 2201 2202 2203 2204 3 (2301:2302:2303:2306:(2304 2305)) c NFGA beam top 3001 0 3100 -3101 -3301 -3311 -3501 -3502 diff --git a/images/e2-estia_bmesh_v04-v03_xy_01.png b/images/e2-estia_bmesh_v04-v03_xy_01.png new file mode 100644 index 0000000..7575313 Binary files /dev/null and b/images/e2-estia_bmesh_v04-v03_xy_01.png differ diff --git a/images/e2-estia_bmesh_v04-v03_xy_02.png b/images/e2-estia_bmesh_v04-v03_xy_02.png new file mode 100644 index 0000000..0735744 Binary files /dev/null and b/images/e2-estia_bmesh_v04-v03_xy_02.png differ diff --git a/images/e2-estia_bmesh_v04-v03_xy_03.png b/images/e2-estia_bmesh_v04-v03_xy_03.png new file mode 100644 index 0000000..cbce7a6 Binary files /dev/null and b/images/e2-estia_bmesh_v04-v03_xy_03.png differ diff --git a/images/e2-estia_bmesh_v04-v03_xy_04.png b/images/e2-estia_bmesh_v04-v03_xy_04.png new file mode 100644 index 0000000..fa8b6ba Binary files /dev/null and b/images/e2-estia_bmesh_v04-v03_xy_04.png differ diff --git a/images/e2-estia_bmesh_v04-v03_xy_05.png b/images/e2-estia_bmesh_v04-v03_xy_05.png new file mode 100644 index 0000000..4f4946d Binary files /dev/null and b/images/e2-estia_bmesh_v04-v03_xy_05.png differ diff --git a/images/e2-estia_bmesh_v04-v03_xy_06.png b/images/e2-estia_bmesh_v04-v03_xy_06.png new file mode 100644 index 0000000..40a4cd9 Binary files /dev/null and b/images/e2-estia_bmesh_v04-v03_xy_06.png differ diff --git a/images/e2-estia_bmesh_v04-v03_xy_07.png b/images/e2-estia_bmesh_v04-v03_xy_07.png new file mode 100644 index 0000000..aabbb02 Binary files /dev/null and b/images/e2-estia_bmesh_v04-v03_xy_07.png differ diff --git a/images/e2-estia_bmesh_v04-v03_xy_08.png b/images/e2-estia_bmesh_v04-v03_xy_08.png new file mode 100644 index 0000000..ce81ff0 Binary files /dev/null and b/images/e2-estia_bmesh_v04-v03_xy_08.png differ diff --git a/plot_tally.py b/plot_tally.py index 2740f3b..b695f50 100644 --- a/plot_tally.py +++ b/plot_tally.py @@ -71,7 +71,8 @@ def plot_xy(outfile, res, zidx=5, Imin=1e-6, Imax=1e4, cticks=None): ax.add_patch(Circle((0,0), radius=5.50, color='black', fill=False, lw=2)) ax.add_patch(Circle((0,0), radius=11.50, color='black', fill=False, lw=2)) ax.add_patch(Circle((0,0), radius=15.00, color='black', fill=False, lw=2)) - fig.savefig(outfile, transparent=False, dpi=300) + if outfile is not None: + fig.savefig(outfile, transparent=False, dpi=300) def plot_xz(outfile, res, yidx=5, Imin=1e-6, Imax=1e4, cticks=None): x,y,z,I,dI=res @@ -91,7 +92,8 @@ def plot_xz(outfile, res, yidx=5, Imin=1e-6, Imax=1e4, cticks=None): ax.plot([sqrt(5.5**2-ypos**2), sqrt(5.5**2-ypos**2)], [z.min()/100., z.max()/100.], color='black', lw=2) ax.plot([sqrt(11.5**2-ypos**2), sqrt(11.5**2-ypos**2)], [z.min()/100., z.max()/100.], color='black', lw=2) ax.plot([sqrt(15.0**2-ypos**2), sqrt(15.0**2-ypos**2)], [z.min()/100., z.max()/100.], color='black', lw=2) - fig.savefig(outfile, transparent=False, dpi=300) + if outfile is not None: + fig.savefig(outfile, transparent=False, dpi=300) def plot_yz(outfile, res, xidx=5, Imin=1e-6, Imax=1e4, cticks=None): x,y,z,I,dI=res @@ -107,7 +109,8 @@ def plot_yz(outfile, res, xidx=5, Imin=1e-6, Imax=1e4, cticks=None): #fig.savefig(outfile) #pc=p.get_facecolors() #pc[:,3]=where(I[xidx].T.flatten()>0, 0.9-0.25*dI[xidx].T.flatten(), 0.) - fig.savefig(outfile, transparent=False, dpi=300) + if outfile is not None: + fig.savefig(outfile, transparent=False, dpi=300) if __name__=='__main__': import sys, os