diff --git a/src/ace_header.F90 b/src/ace_header.F90 index c63e075ee8..0d2a5f4617 100644 --- a/src/ace_header.F90 +++ b/src/ace_header.F90 @@ -246,7 +246,7 @@ module ace_header class(DistAngle), intent(inout) :: this ! The DistAngle object to clear if (allocated(this % energy)) & - deallocate(this % energy, this % type, this % location, this % data) + deallocate(this % energy, this % type, this % location, this % data) end subroutine DistAngle_clear @@ -262,7 +262,7 @@ module ace_header call this % p_valid % clear() if (allocated(this % data)) & - deallocate(this % data) + deallocate(this % data) if (associated(this % next)) then ! recursively clear this item @@ -281,7 +281,7 @@ module ace_header class(Reaction), intent(inout) :: this ! The Reaction object to clear if (allocated(this % sigma)) & - deallocate(this % sigma) + deallocate(this % sigma) if (associated(this % edist)) then call this % edist % clear() @@ -301,7 +301,7 @@ module ace_header class(UrrData), intent(inout) :: this ! The UrrData object to clear if (allocated(this % energy)) & - deallocate(this % energy, this % prob) + deallocate(this % energy, this % prob) end subroutine UrrData_clear @@ -316,28 +316,28 @@ module ace_header integer :: i ! Loop counter if (allocated(this % grid_index)) & - deallocate(this % grid_index) + deallocate(this % grid_index) if (allocated(this % energy)) & - deallocate(this % total, this % elastic, this % fission, & + deallocate(this % total, this % elastic, this % fission, & this % nu_fission, this % absorption) if (allocated(this % heating)) & - deallocate(this % heating) + deallocate(this % heating) if (allocated(this % index_fission)) & - deallocate(this % index_fission) + deallocate(this % index_fission) if (allocated(this % nu_t_data)) & - deallocate(this % nu_t_data) + deallocate(this % nu_t_data) if (allocated(this % nu_p_data)) & - deallocate(this % nu_p_data) + deallocate(this % nu_p_data) if (allocated(this % nu_d_data)) & - deallocate(this % nu_d_data) + deallocate(this % nu_d_data) if (allocated(this % nu_d_precursor_data)) & - deallocate(this % nu_d_precursor_data) + deallocate(this % nu_d_precursor_data) if (associated(this % nu_d_edist)) then do i = 1, size(this % nu_d_edist) diff --git a/src/dict_header.F90 b/src/dict_header.F90 index a0eea0e2ea..79b4a2f0fa 100644 --- a/src/dict_header.F90 +++ b/src/dict_header.F90 @@ -432,7 +432,7 @@ contains end function dict_keys_ii !=============================================================================== -! DICT_DELETE deletes all (key,value) pairs from the dictionary +! DICT_CLEAR Deletes and deallocates the dictionary item !=============================================================================== subroutine dict_clear_ci(this) @@ -456,7 +456,7 @@ contains current => next end do if (associated(this % table(i) % list)) & - nullify(this % table(i) % list) + nullify(this % table(i) % list) end do deallocate(this % table) end if @@ -484,7 +484,7 @@ contains current => next end do if (associated(this % table(i) % list)) & - nullify(this % table(i) % list) + nullify(this % table(i) % list) end do deallocate(this % table) end if diff --git a/src/tally_header.F90 b/src/tally_header.F90 index a35ceac518..18b742d183 100644 --- a/src/tally_header.F90 +++ b/src/tally_header.F90 @@ -142,9 +142,9 @@ module tally_header this % type = NONE this % n_bins = 0 if (allocated(this % int_bins)) & - deallocate(this % int_bins) + deallocate(this % int_bins) if (allocated(this % real_bins)) & - deallocate(this % real_bins) + deallocate(this % real_bins) end subroutine TallyFilter_clear @@ -170,26 +170,26 @@ module tally_header end if if (allocated(this % matching_bins)) & - deallocate(this % matching_bins) + deallocate(this % matching_bins) if (allocated(this % stride)) & - deallocate(this % stride) + deallocate(this % stride) this % find_filter = 0 this % n_nuclide_bins = 0 if (allocated(this % nuclide_bins)) & - deallocate(this % nuclide_bins) + deallocate(this % nuclide_bins) this % all_nuclides = .false. this % n_score_bins = 0 if (allocated(this % score_bins)) & - deallocate(this % score_bins) + deallocate(this % score_bins) if (allocated(this % scatt_order)) & - deallocate(this % scatt_order) + deallocate(this % scatt_order) this % n_user_score_bins = 0 if (allocated(this % results)) & - deallocate(this % results) + deallocate(this % results) this % reset = .false.