whoops, missed some code i could remove

This commit is contained in:
Adam G Nelson 2018-06-13 20:26:20 -04:00
parent a32678865d
commit 7fd4cbb140

View file

@ -24,149 +24,6 @@ contains
! nuclides and sab_tables arrays
!===============================================================================
! subroutine read_mgxs()
! integer :: i ! index in materials array
! integer :: j ! index over nuclides in material
! integer :: i_nuclide ! index in nuclides array
! character(20) :: name ! name of library to load
! integer :: representation ! Data representation
! character(MAX_LINE_LEN) :: temp_str
! type(Material), pointer :: mat
! type(SetChar) :: already_read
! integer(HID_T) :: file_id
! integer(HID_T) :: xsdata_group
! logical :: file_exists
! type(VectorReal), allocatable :: temps(:)
! character(MAX_WORD_LEN) :: word
! integer, allocatable :: array(:)
! ! Check if MGXS Library exists
! inquire(FILE=path_cross_sections, EXIST=file_exists)
! if (.not. file_exists) then
! ! Could not find MGXS Library file
! call fatal_error("Cross sections HDF5 file '" &
! // trim(path_cross_sections) // "' does not exist!")
! end if
! call write_message("Loading cross section data...", 5)
! ! Get temperatures
! call get_temperatures(temps)
! ! Open file for reading
! file_id = file_open(path_cross_sections, 'r', parallel=.true.)
! ! Read filetype
! call read_attribute(word, file_id, "filetype")
! if (word /= 'mgxs') then
! call fatal_error("Provided MGXS Library is not a MGXS Library file.")
! end if
! ! Read revision number for the MGXS Library file and make sure it matches
! ! with the current version
! call read_attribute(array, file_id, "version")
! if (any(array /= VERSION_MGXS_LIBRARY)) then
! call fatal_error("MGXS Library file version does not match current &
! &version supported by OpenMC.")
! end if
! ! allocate arrays for MGXS storage and cross section cache
! allocate(nuclides_MG(n_nuclides))
! ! ==========================================================================
! ! READ ALL MGXS CROSS SECTION TABLES
! ! Loop over all files
! MATERIAL_LOOP: do i = 1, n_materials
! mat => materials(i)
! NUCLIDE_LOOP: do j = 1, mat % n_nuclides
! name = mat % names(j)
! if (.not. already_read % contains(name)) then
! i_nuclide = mat % nuclide(j)
! call write_message("Loading " // trim(name) // " data...", 6)
! ! Check to make sure cross section set exists in the library
! if (object_exists(file_id, trim(name))) then
! xsdata_group = open_group(file_id, trim(name))
! else
! call fatal_error("Data for '" // trim(name) // "' does not exist in "&
! &// trim(path_cross_sections))
! end if
! ! First find out the data representation
! if (attribute_exists(xsdata_group, "representation")) then
! call read_attribute(temp_str, xsdata_group, "representation")
! if (trim(temp_str) == 'isotropic') then
! representation = MGXS_ISOTROPIC
! else if (trim(temp_str) == 'angle') then
! representation = MGXS_ANGLE
! else
! call fatal_error("Invalid Data Representation!")
! end if
! else
! ! Default to isotropic representation
! representation = MGXS_ISOTROPIC
! end if
! ! Now allocate accordingly
! select case(representation)
! case(MGXS_ISOTROPIC)
! allocate(MgxsIso :: nuclides_MG(i_nuclide) % obj)
! case(MGXS_ANGLE)
! allocate(MgxsAngle :: nuclides_MG(i_nuclide) % obj)
! end select
! ! Now read in the data specific to the type we just declared
! call nuclides_MG(i_nuclide) % obj % from_hdf5(xsdata_group, &
! num_energy_groups, num_delayed_groups, temps(i_nuclide), &
! temperature_method, temperature_tolerance, max_order, &
! legendre_to_tabular, legendre_to_tabular_points)
! ! Add name to dictionary
! call already_read % add(name)
! call close_group(xsdata_group)
! end if
! end do NUCLIDE_LOOP
! end do MATERIAL_LOOP
! ! Avoid some valgrind leak errors
! call already_read % clear()
! ! Loop around material
! MATERIAL_LOOP3: do i = 1, n_materials
! ! Get material
! mat => materials(i)
! ! Loop around nuclides in material
! NUCLIDE_LOOP2: do j = 1, mat % n_nuclides
! ! Is this fissionable?
! if (nuclides_MG(mat % nuclide(j)) % obj % fissionable) then
! mat % fissionable = .true.
! end if
! if (mat % fissionable) then
! exit NUCLIDE_LOOP2
! end if
! end do NUCLIDE_LOOP2
! end do MATERIAL_LOOP3
! call file_close(file_id)
! end subroutine read_mgxs
subroutine read_mgxs()
integer :: i ! index in materials array
integer :: j ! index over nuclides in material
@ -248,45 +105,6 @@ contains
! CREATE_MACRO_XS generates the macroscopic xs from the microscopic input data
!===============================================================================
! subroutine create_macro_xs()
! integer :: i_mat ! index in materials array
! type(Material), pointer :: mat ! current material
! type(VectorReal), allocatable :: kTs(:)
! allocate(macro_xs(n_materials))
! ! Get temperatures to read for each material
! call get_mat_kTs(kTs)
! ! Force all nuclides in a material to be the same representation.
! ! Therefore type(nuclides(mat % nuclide(1)) % obj) dictates type(macroxs).
! ! At the same time, we will find the scattering type, as that will dictate
! ! how we allocate the scatter object within macroxs.allocate(macro_xs(n_materials))
! do i_mat = 1, n_materials
! ! Get the material
! mat => materials(i_mat)
! ! Get the scattering type for the first nuclide
! select type(nuc => nuclides_MG(mat % nuclide(1)) % obj)
! type is (MgxsIso)
! allocate(MgxsIso :: macro_xs(i_mat) % obj)
! type is (MgxsAngle)
! allocate(MgxsAngle :: macro_xs(i_mat) % obj)
! end select
! ! Do not read materials which we do not actually use in the problem to
! ! reduce storage
! if (allocated(kTs(i_mat) % data)) then
! call macro_xs(i_mat) % obj % combine(kTs(i_mat), mat, nuclides_MG, &
! num_energy_groups, num_delayed_groups, max_order, &
! temperature_tolerance, temperature_method)
! end if
! end do
! end subroutine create_macro_xs
subroutine create_macro_xs()
integer :: i_mat ! index in materials array
type(Material), pointer :: mat ! current material
@ -318,7 +136,6 @@ contains
end subroutine create_macro_xs
!===============================================================================
! GET_MAT_kTs returns a list of temperatures (in eV) that each
! material appears at in the model.