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

missed a few details on previous commit (function descriptions, some uses of tally_surface_current)

Browse source
This commit is contained in:
guillaume 2017-07-13 23:16:24 -04:00
parent 53875b7034
commit de803633fd
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmfd_input.F90
View file

@ -241,7 +241,7 @@ contains
! There are 3 tally types:
! 1: Only an energy in filter-> flux,total,p1 scatter
! 2: Energy in and energy out filter-> nu-scatter,nu-fission
! 3: Surface current
! 3: Mesh current
!===============================================================================
subroutine create_cmfd_tally(root)
@ -425,7 +425,7 @@ contains
end select
end if
! Duplicate the mesh filter for the surface current tally since other
! Duplicate the mesh filter for the mesh current tally since other
! tallies use this filter and we need to change the dimension
i_filt = i_filt + 1
allocate(MeshFilter :: filters(i_filt) % obj)
@ -597,7 +597,7 @@ contains
! Set macro bins
t % score_bins(1) = SCORE_CURRENT
t % type = TALLY_SURFACE_CURRENT
t % type = TALLY_MESH_CURRENT
end if
end do

2
src/output.F90
View file

@ -792,7 +792,7 @@ contains
end if
! Handle surface current tallies separately
if (t % type == TALLY_SURFACE_CURRENT) then
if (t % type == TALLY_MESH_CURRENT) then
call write_surface_current(t, unit_tally)
cycle
end if

2
src/tally_filter.F90
View file

@ -963,7 +963,7 @@ contains
do i = 1, this % n_bins
if (abs(p % surface) == this % surfaces(i)) then
next_bin = i
weight = sign(ONE, p % surface)
weight = sign(ONE, real(p % surface, 8))
exit
end if
end do

10
src/trigger.F90
View file

@ -161,8 +161,8 @@ contains
trigger % rel_err = ZERO
trigger % variance = ZERO
! Surface current tally triggers require special treatment
if (t % type == TALLY_SURFACE_CURRENT) then
! Mesh current tally triggers require special treatment
if (t % type == TALLY_MESH_CURRENT) then
call compute_tally_current(t, trigger)
else
@ -281,7 +281,7 @@ contains
!===============================================================================
! COMPUTE_TALLY_CURRENT computes the current for a surface current tally with
! COMPUTE_TALLY_CURRENT computes the current for a mesh current tally with
! precision trigger(s).
!===============================================================================
@ -301,8 +301,8 @@ contains
logical :: print_ebin ! should incoming energy bin be displayed?
real(8) :: rel_err = ZERO ! temporary relative error of result
real(8) :: std_dev = ZERO ! temporary standard deviration of result
type(TallyObject), pointer :: t ! surface current tally
type(TriggerObject) :: trigger ! surface current tally trigger
type(TallyObject), pointer :: t ! mesh current tally
type(TriggerObject) :: trigger ! mesh current tally trigger
type(RegularMesh), pointer :: m ! surface current mesh
! Get pointer to mesh