diff --git a/e2-estia.i b/e2-estia.i index ddb334d..1bee55d 100644 --- a/e2-estia.i +++ b/e2-estia.i @@ -5,7 +5,7 @@ c ------------------------------------------------------- read file=geometry/ess_monolith_cells.i echo read file=geometry/ess_outside_cells.i echo c tallies -100701 9 2.45e-05 -100701 +100701 0 -100701:-101701 100702 0 -100702 100703 0 -100703 100704 0 -100704 @@ -29,7 +29,8 @@ read file=geometry/ess_monolith_surfaces.i echo read file=geometry/ess_outside_surfaces.i echo c tallies c 700 s 117.0 -155.00 13.5 3.0 -100701 1 s 542.0 -6.3 6.3 3.0 +100701 1 s 542.0 -6.3 6.3 3.0 +101701 1 s 542.0 -6.3 -6.3 3.0 100702 1 s 1010 -0.8 0 5.0 100703 1 s 1082 -25.0 0 5.0 100704 1 s 1082 -0.25 0 5.0 @@ -212,7 +213,7 @@ c read file=sources/mcstas_source_mf.i echo c read file=sources/mcstas_gammas.i echo c read file=sources/mcstas_gammas_2.i echo c read file=sources/mcstas_source_shutter.i echo -prdmp 1e6 -5 1 2 1e5 +prdmp 1e6 -5 1 2 1e4 print 30 32 40 $ 120 128 150 160 161 162 c ++++++++++++++++++++++ END ++++++++++++++++++++++++++++ diff --git a/geometry/estia_inbunker.i b/geometry/estia_inbunker.i index d11e5ad..b273396 100644 --- a/geometry/estia_inbunker.i +++ b/geometry/estia_inbunker.i @@ -139,6 +139,7 @@ c BBG beam top/beam bottom/outside 202001 9 2.45e-05 202100 -202101 -202301 -202302 -202303 -202304 100003 #100701 202011 9 2.45e-05 202100 -202101 -202301 -202302 -202305 -202306 100003 + #100701 202021 14 -8.92 202100 -202101 202201 202202 202203 202204 100003 (202301:202302:202303:202306:(202304 202305)) c NFGA beam top diff --git a/sources/proton.i b/sources/proton.i index 6039485..85950af 100644 --- a/sources/proton.i +++ b/sources/proton.i @@ -4,7 +4,7 @@ cut:n j 0 cut:p 1e+08 1.667 c weight windows from external file generated by WWG c make sure to supply the correct WWINP file -WWP:n j j 4 j -1 j 1.0e2 1j 1e18 1j +WWP:n j j 4 j -1 j 1.0 1j 1e18 1j c energy splitting for higher neutron energies and roulette below 1keV c esplt:n 0.05 1e-6 0.2 1e-3 1 10 3 100 10 3000 c energy splitting for higher neutron energies no roulette diff --git a/tallies/BBG_f5.i b/tallies/BBG_f5.i index 68e4bf5..d5abbb4 100644 --- a/tallies/BBG_f5.i +++ b/tallies/BBG_f5.i @@ -1,6 +1,6 @@ c f5 tally at BBG fc15 neutron flux at BBG -f15:n 331.2 -448.0 13.3 0 +f15:n 331.2 -448.0 13.3 0 331.2 -448.0 0.7 0 e15 1e-10 1.58e-10 2.51e-10 3.98e-10 6.31e-10 1e-9 1.58e-9 2.51e-9 3.98e-9 6.31e-9 1e-8 1.58e-8 2.51e-8 3.98e-8 6.31e-8 diff --git a/weight_windows/current.wwg b/weight_windows/current.wwg index 8e9ed36..c2484bd 120000 --- a/weight_windows/current.wwg +++ b/weight_windows/current.wwg @@ -1 +1 @@ -e2-estia_newmono_v02-0-g4cefa58.wwg \ No newline at end of file +e2-estia_newmono_v02-4-g5d00284.wwg \ No newline at end of file