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

removed unnecessary PR edits

Browse source
This commit is contained in:
samuelshaner 2017-07-13 10:06:42 -04:00
parent dc71fa2915
commit ddda797c06
3 changed files with 14 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/constants.F90
View file

@ -344,8 +344,8 @@ module constants
SCORE_HEATING = -22, & ! prompt fission Q-value
SCORE_FISS_Q_RECOV = -23, & ! recoverable fission Q-value
SCORE_FISS_Q_PROMPT = -24, & ! prompt fission Q-value
SCORE_FISS_Q_PROMPT_NEUTRONS = -25, & ! recoverable fission Q-value
SCORE_FISS_Q_DELAYED_NEUTRONS = -26, & ! recoverable fission Q-value
SCORE_FISS_Q_PROMPT_NEUTRONS = -25, & ! fission prompt neutrons Q-value
SCORE_FISS_Q_DELAYED_NEUTRONS = -26, & ! fission delayed neutrons Q-value
SCORE_FISS_Q_FRAGMENTS = -27, & ! fission fragments Q-value
SCORE_FISS_Q_BETAS = -28, & ! fission betas Q-value
SCORE_FISS_Q_PROMPT_PHOTONS = -29, & ! fission prompt photons Q-value

22
src/nuclide_header.F90
View file

@ -96,11 +96,11 @@ module nuclide_header
class(Function1D), allocatable :: fission_q_recov ! fragments, neutrons, gammas, betas
class(Function1D), allocatable :: fission_q_fragments ! fragments
class(Function1D), allocatable :: fission_q_betas ! betas
class(Function1D), allocatable :: fission_q_neutrinos ! betas
class(Function1D), allocatable :: fission_q_delayed_neutrons ! betas
class(Function1D), allocatable :: fission_q_prompt_neutrons ! betas
class(Function1D), allocatable :: fission_q_delayed_photons ! betas
class(Function1D), allocatable :: fission_q_prompt_photons ! betas
class(Function1D), allocatable :: fission_q_neutrinos ! neutrinos
class(Function1D), allocatable :: fission_q_delayed_neutrons ! delayed neutrons
class(Function1D), allocatable :: fission_q_prompt_neutrons ! prompt neutrons
class(Function1D), allocatable :: fission_q_delayed_photons ! delayed photons
class(Function1D), allocatable :: fission_q_prompt_photons ! prompt photons
contains
procedure :: clear => nuclide_clear
@ -147,12 +147,12 @@ module nuclide_header
!===============================================================================
type MaterialMacroXS
real(8) :: total ! macroscopic total xs
real(8) :: elastic ! macroscopic elastic scattering xs
real(8) :: absorption ! macroscopic absorption xs
real(8) :: fission ! macroscopic fission xs
real(8) :: nu_fission ! macroscopic production xs
real(8) :: photon_prod ! macroscopic photon production xs
real(8) :: total ! macroscopic total xs
real(8) :: elastic ! macroscopic elastic scattering xs
real(8) :: absorption ! macroscopic absorption xs
real(8) :: fission ! macroscopic fission xs
real(8) :: nu_fission ! macroscopic production xs
real(8) :: photon_prod ! macroscopic photon production xs
! Photon cross sections
real(8) :: coherent ! macroscopic coherent xs

16
src/tally.F90
View file

@ -116,6 +116,7 @@ contains
select case(score_bin)
case (SCORE_FLUX, SCORE_FLUX_YN)
if (t % estimator == ESTIMATOR_ANALOG) then
@ -143,7 +144,6 @@ contains
case (SCORE_TOTAL, SCORE_TOTAL_YN)
if (t % estimator == ESTIMATOR_ANALOG) then
! All events will score to the total reaction rate. We can just
! use the weight of the particle entering the collision as the
@ -166,7 +166,6 @@ contains
case (SCORE_INVERSE_VELOCITY)
! make sure the correct energy is used
if (t % estimator == ESTIMATOR_TRACKLENGTH) then
E = p % E
@ -199,7 +198,6 @@ contains
case (SCORE_SCATTER, SCORE_SCATTER_N)
if (t % estimator == ESTIMATOR_ANALOG) then
! Skip any event where the particle didn't scatter
if (p % event /= EVENT_SCATTER) cycle SCORE_LOOP
@ -220,7 +218,6 @@ contains
case (SCORE_SCATTER_PN)
! Only analog estimators are available.
! Skip any event where the particle didn't scatter
if (p % event /= EVENT_SCATTER) then
@ -234,7 +231,6 @@ contains
case (SCORE_SCATTER_YN)
! Only analog estimators are available.
! Skip any event where the particle didn't scatter
if (p % event /= EVENT_SCATTER) then
@ -248,7 +244,6 @@ contains
case (SCORE_NU_SCATTER, SCORE_NU_SCATTER_N)
! Only analog estimators are available.
! Skip any event where the particle didn't scatter
if (p % event /= EVENT_SCATTER) cycle SCORE_LOOP
@ -273,7 +268,6 @@ contains
case (SCORE_NU_SCATTER_PN)
! Only analog estimators are available.
! Skip any event where the particle didn't scatter
if (p % event /= EVENT_SCATTER) then
@ -301,7 +295,6 @@ contains
case (SCORE_NU_SCATTER_YN)
! Only analog estimators are available.
! Skip any event where the particle didn't scatter
if (p % event /= EVENT_SCATTER) then
@ -329,7 +322,6 @@ contains
case (SCORE_ABSORPTION)
if (t % estimator == ESTIMATOR_ANALOG) then
if (survival_biasing) then
! No absorption events actually occur if survival biasing is on --
@ -1067,12 +1059,10 @@ contains
end if
case (SCORE_EVENTS)
! Simply count number of scoring events
score = ONE
case (ELASTIC)
if (t % estimator == ESTIMATOR_ANALOG) then
! Check if event MT matches
if (p % event_MT /= ELASTIC) cycle SCORE_LOOP
@ -1244,7 +1234,6 @@ contains
score = p % last_wgt * p % last_E
end if
case (SCORE_Q_POSITRONS)
! Positron energy deposition
@ -1266,7 +1255,6 @@ contains
score = p % last_wgt * (p % last_E - p % E)
end if
case (SCORE_HEATING)
! Elastic scattering
@ -1572,7 +1560,6 @@ contains
case (SCORE_FLUX, SCORE_FLUX_YN)
if (t % estimator == ESTIMATOR_ANALOG) then
! All events score to a flux bin. We actually use a collision
! estimator in place of an analog one since there is no way to count
@ -3019,7 +3006,6 @@ contains
! for a previous tally.
do j = 1, size(t % filter)
i_filt = t % filter(j)
if (.not. filter_matches(i_filt) % bins_present) then
call filter_matches(i_filt) % bins % clear()
call filter_matches(i_filt) % weights % clear()