diff --git a/e2-estia.i b/e2-estia.i index dbf91ea..3e9aa73 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -148,8 +148,8 @@ c read file=tallies/bunker_mesh_p.i echo c read file=tallies/bunker_mesh_np.i echo c read file=tallies/bunker_mesh_act.i echo c read file=tallies/full_mesh.i echo -c read file=tallies/full_mesh_p.i echo -read file=tallies/full_mesh_np.i echo +read file=tallies/full_mesh_p.i echo +c read file=tallies/full_mesh_np.i echo c read file=tallies/vs_fine_mesh.i echo c read file=tallies/boundary_meshes.i echo c read file=tallies/boundary_wall_meshes.i echo @@ -188,7 +188,7 @@ ext:n 0 276r $ in monolith 0 146r 0.75v2 8r 0.75v3 4r $CPC1+2 0 28r 0.75v3 4r $ bunker wall 0 37r 0.75v3 7r $ BWC - 0 226r + 0 227r c exponential transform reference vectors: origin, VS, shutter vect v1 0 0 0 v2 1114.8 -1.75 0.5 v3 2137 -1.25 -12.5 c forced collisions in neutron guides @@ -199,7 +199,7 @@ fcl:n 0 276r $ in monolith 0 13r -1.0 6r $ NFGA 0 208r -1 $ Glass in Selene 1 0 51r -1 7r $ S1 back plate and mineral cast in universe - 0 146r + 0 147r c c ----------------------------------------------------------- c ------------------------------------------------------- @@ -212,7 +212,7 @@ stop nps 1e8 CTME 4e5 $f31 0.01 rand gen=2 seed=29976355590901 $ default 19073486328125 c histp mode n p h / z $ neutron, photon, proton, pi+, pi0 -imp:n,p,h,/,z 1 276r 0 0 1 777r +imp:n,p,h,/,z 1 276r 0 0 1 778r c Reduce model size for WWG runs until earlier stages of the model: c void 201255 201257 203123 $ void cells downstream of BBG c imp:n,p,h,/,z 1 276r 0 0 1 323r 0 1 0 1 34r 0 1 414r $ zero for above diff --git a/geometry/estia_cave.i b/geometry/estia_cave.i index 9b90be2..8815b05 100644 --- a/geometry/estia_cave.i +++ b/geometry/estia_cave.i @@ -1,9 +1,9 @@ c Experimental cave c c Sample Position -c 209900 19 -8.65 -209002 209003 -209004 $ Cd +209900 19 -8.65 -209002 209003 -209004 $ Cd c 209900 2 -7.08 -209002 209003 -209004 $ GGG -209900 115 -1 -209001 $ water +c 209900 115 -1 -209001 $ water c 209900 4 -1.2E-3 -209001 $ Air c New experimental cave design concept, separate concrete elements c wall stones, starting on Skadi side upstream @@ -116,7 +116,7 @@ c opening for hatch 210541 4 -1.2e-3 210102 -210103 210119 -210120 210140 -210141 c air above cave 210550 4 -1.2e-3 210103 208203 208709 -210118 100112 208721 - #210611 #210612 + #210611 #210612 #210613 c gaps between ceiling elements 210561 4 -1.2e-3 210201 -210202 -210131 -210134 210205 -210204 210562 4 -1.2e-3 210201 -210202 -210131 -210134 210208 -210207 @@ -141,9 +141,12 @@ c ceiling stones from upstream to downstream 210221 -210118 #( 210201 -210222) 210607 50 0.074981 210102 -210103 -210137 -210118 -210322 c Access hatch items -210611 50 0.074981 210103 -210104 210105 -210106 210139 -210140 +210611 54 0.0833854 210103 -210104 210105 -210106 210139 -210140 210612 54 0.0833854 210103 -210104 210105 -210106 210140 -210414 #(-210415 210411 -210412 -210413) +210613 54 0.0833854 ((210103 -210421 210422 -210423 210425 -210424): + (210103 -210426 210427 -210428 -210131 -210429)) + #(210105 -210106 210139 -210414) c c c visualize ESS 2m source term (comment for real runs) diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index bfa5fa6..0c60fe9 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -645,9 +645,9 @@ c Envelope 210101 pz -200.000 210102 pz 110.001 210103 pz 145.001 -210104 pz 264.401 -210105 px 3383.795 -210106 px 3663.795 +210104 pz 275.001 +210105 px 3367.796 +210106 px 3679.796 c 210111 px 3019.795 210112 px 3069.795 @@ -785,11 +785,21 @@ c Crane Cutout 210403 c/z 4013.295 -177.819 40.000 c c Hatch Steel Door -210411 px 3393.795 -210412 px 3653.795 -210413 py 138.381 -210414 py 148.381 -210415 pz 254.401 +210411 px 3382.796 +210412 px 3664.796 +210413 py 108.381 +210414 py 123.381 +210415 pz 265.001 +c Central Plate +210421 pz 155.001 +210422 px 3273.795 +210423 px 3773.795 +210424 py 212.630 +210425 p 0.119145 0.992877 0.000000 213.951 +210426 pz 148.001 +210427 px 3133.795 +210428 px 3873.795 +210429 py 352.630 c c Shared Wall 210500 px 3629.979 diff --git a/plot b/plot index 4f19a5a..b5aa85c 100755 --- a/plot +++ b/plot @@ -3,13 +3,13 @@ PLOT_NAME=`git describe --tags --long` # if the first argument is an runtpe file, use different plot command if [[ $1 == runs/* ]]; then - /home/ll_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6 p runtpe=$1 \ + /home/l_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6 p runtpe=$1 \ outp=tmp/plota.out comout=tmp/plota.com \ wwout=tmp/plota.wwg wwone=tmp/plota.wwo \ wwinp=weight_windows/current.wwg \ plotm=results/e2-estia_$PLOT_NAME ${@:2} else - /home/ll_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6 ip inp=e2-estia.i \ + /home/l_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6 ip inp=e2-estia.i \ outp=tmp/plota.out comout=tmp/plota.com \ wwout=tmp/plota.wwg wwone=tmp/plota.wwo \ mctal=tmp/plota.mct mdata=tmp/plota.mdt \ diff --git a/sbatch.tsh b/sbatch.tsh index 31a21bb..b5bfe44 100644 --- a/sbatch.tsh +++ b/sbatch.tsh @@ -1,13 +1,13 @@ #!/usr/bin/env tcsh #SBATCH -J mcnpEstia -#SBATCH -N 2 +#SBATCH -N 7 #SBATCH --ntasks-per-node=24 #SBATCH --time=7-00:00:00 #SBATCH --mail-type=fail #SBATCH --mail-user=artur.glavic@psi.ch #SBATCH -o tmp/stdout.log #SBATCH -e tmp/stderr.log -#SBATCH --partition=ll_verylong +#SBATCH --partition=long setenv CURRENT_VERSION $1 #"`/usr/bin/git describe --tags --long`" @@ -19,7 +19,7 @@ echo "Running on $SLURM_NPROCS processors." echo "Current working directory is `pwd`" echo "Estia GIT revision is $CURRENT_VERSION" -mpirun -np $SLURM_NPROCS /home/ll_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6.mpi \ +mpirun -np $SLURM_NPROCS /home/l_glavic/shielding/mcnp6/MCNP_SM/bin/mcnp6.mpi \ inp=e2-estia.i outp=results/e2-estia_$CURRENT_VERSION.out \ runtpe=runs/e2-estia_$CURRENT_VERSION.run \ mctal=results/e2-estia_$CURRENT_VERSION.mct \