crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 05:35:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wow. I think I survived that merge... that was brutal

Browse source
This commit is contained in:
Adam Nelson 2016-02-03 10:42:24 -05:00
parent 63744db909
commit f83d6344ca
3 changed files with 11 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/constants.F90
View file

@ -214,8 +214,8 @@ module constants
! MGXS Table Types
integer, parameter :: &
ISOTROPIC = 1, & ! Isotropically Weighted Data
ANGLE = 2 ! Data by Angular Bins
MGXS_ISOTROPIC = 1, & ! Isotropically Weighted Data
MGXS_ANGLE = 2 ! Data by Angular Bins
! Fission neutron emission (nu) type
integer, parameter :: &

15
src/input_xml.F90
View file

@ -428,22 +428,7 @@ contains
&// "' does not exist!")
end if
! Read parameters for spatial distribution
if (n < coeffs_reqd) then
call fatal_error("Not enough parameters specified for spatial &
&distribution of external source.")
elseif (n > coeffs_reqd) then
call fatal_error("Too many parameters specified for spatial &
&distribution of external source.")
elseif (n > 0) then
allocate(external_source % params_space(n))
call get_node_array(node_dist, "parameters", &
external_source % params_space)
end if
else
call fatal_error("No spatial distribution specified for external &
&source.")
end if
! Spatial distribution for external source
if (check_for_node(node_source, "space")) then

18
src/mgxs_data.F90
View file

@ -106,22 +106,22 @@ contains
call get_node_value(node_xsdata, "representation", temp_str)
temp_str = trim(to_lower(temp_str))
if (temp_str == 'isotropic' .or. temp_str == 'iso') then
representation = ISOTROPIC
representation = MGXS_ISOTROPIC
else if (temp_str == 'angle') then
representation = ANGLE
representation = MGXS_ANGLE
else
call fatal_error("Invalid Data Representation!")
end if
else
! Default to isotropic representation
representation = ISOTROPIC
representation = MGXS_ISOTROPIC
end if
! Now allocate accordingly
select case(representation)
case(ISOTROPIC)
case(MGXS_ISOTROPIC)
allocate(Nuclide_Iso :: nuclides_MG(i_nuclide) % obj)
case(ANGLE)
case(MGXS_ANGLE)
allocate(Nuclide_Angle :: nuclides_MG(i_nuclide) % obj)
end select
@ -677,17 +677,17 @@ contains
legendre_mu_points = nuclides_MG(mat % nuclide(1)) % obj % legendre_mu_points
select type(nuc => nuclides_MG(mat % nuclide(1)) % obj)
type is (Nuclide_Iso)
representation = ISOTROPIC
representation = MGXS_ISOTROPIC
type is (Nuclide_Angle)
representation = ANGLE
representation = MGXS_ANGLE
end select
scatt_type = nuclides_MG(mat % nuclide(1)) % obj % scatt_type
! Now allocate accordingly
select case(representation)
case(ISOTROPIC)
case(MGXS_ISOTROPIC)
allocate(MacroXS_Iso :: macro_xs(i_mat) % obj)
case(ANGLE)
case(MGXS_ANGLE)
allocate(MacroXS_Angle :: macro_xs(i_mat) % obj)
end select