crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-26 21:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing indentations and level-spacing. Changed index in 'nuclide_header.f90'

Browse source 
line 891 from 4 to 1 (n,gamma) to account for the re-ordering of DEPLETION_RX.
This commit is contained in:
Jose Salcedo Perez 2018-06-05 19:11:45 +00:00
parent 9857f46231
commit 2602bef154
3 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/nuclide_header.F90
View file

@ -888,7 +888,7 @@ contains
micro_xs % reaction(:) = ZERO
! Only non-zero reaction is (n,gamma)
micro_xs % reaction(4) = sig_a - sig_f
micro_xs % reaction(1) = sig_a - sig_f
end if
! Ensure these values are set
@ -983,6 +983,18 @@ contains
! Initialize entire array to zero in case we skip
! any threshold reaction.
micro_xs % reaction(:) = ZERO
!there shouldn't be a threshold check for (n,gamma).
!I know this is not very clean but I don't want to overload the loop
!with too many conditional statements for now.
i_rxn = this % reaction_index(DEPLETION_RX(1))
if (i_rxn > 0) then
associate (xs => this % reactions(i_rxn) % xs(i_temp))
micro_xs % reaction(1) = (ONE - f) * &
xs % value(i_grid - xs % threshold + 1) + &
f * xs % value(i_grid - xs % threshold + 2)
end associate
end if
!looping from element 2 to element 6.
!treating (n,gamma) differently because it is not a threshold reaction.
do j = 2, 6
@ -998,25 +1010,12 @@ contains
f * xs % value(i_grid - xs % threshold + 2)
! Check if we are below the (n,2n) and/or (n,3n) reaction thresholds to
! skip remaining depletion-xs construction.
else
if (j >= 4) then
exit
end if
elseif (j >= 4) then
exit
end if
end associate
end if
end do
!there shouldn't be a threshold check for (n,gamma).
!I know this is not very clean but I don't want to overload the loop
!with too many conditional statements for now.
i_rxn = this % reaction_index(DEPLETION_RX(1))
if (i_rxn > 0) then
associate (xs => this % reactions(i_rxn) % xs(i_temp))
micro_xs % reaction(1) = (ONE - f) * &
xs % value(i_grid - xs % threshold + 1) + &
f * xs % value(i_grid - xs % threshold + 2)
end associate
end if
end if
end if

2
src/simulation.F90
View file

@ -516,7 +516,7 @@ contains
n = size(results, 3)
count_per_filter = size(results, 1) * size(results, 2)
call MPI_TYPE_CONTIGUOUS(count_per_filter, MPI_DOUBLE, &
result_block, mpi_err)
result_block, mpi_err)
call MPI_TYPE_COMMIT(result_block, mpi_err)
call MPI_BCAST(results, n, result_block, 0, mpi_intracomm, mpi_err)
call MPI_TYPE_FREE(result_block, mpi_err)

12
src/tallies/tally.F90
View file

@ -1074,18 +1074,18 @@ contains
else
! Determine index in NuclideMicroXS % reaction array
select case (score_bin)
case (N_2N)
m = 4
case (N_3N)
m = 5
case (N_4N)
m = 6
case (N_GAMMA)
m = 1
case (N_P)
m = 2
case (N_A)
m = 3
case (N_2N)
m = 4
case (N_3N)
m = 5
case (N_4N)
m = 6
end select
if (i_nuclide > 0) then