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

Merge branch 'master' into cmfd

Browse source
This commit is contained in:
Bryan Herman 2012-01-20 13:41:08 -05:00
commit 363863619a
3 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/hdf5_interface.F90
View file

@ -82,6 +82,32 @@ contains
call h5ltset_attribute_string_f(hdf5_output_file, "n_procs", &
"description", "Number of MPI processes", error)
! Write criticality information
if (problem_type == PROB_CRITICALITY) then
! Need to write integer(8)'s using double instead since there is no H5LT
! call for making a dataset of type long
call h5ltmake_dataset_double_f(hdf5_output_file, "n_particles", &
rank, dims, (/ real(n_particles,8) /), error)
! Use H5LT interface to write n_cycles, n_inactive, and n_active
call h5ltmake_dataset_int_f(hdf5_output_file, "n_cycles", &
rank, dims, (/ n_cycles /), error)
call h5ltmake_dataset_int_f(hdf5_output_file, "n_inactive", &
rank, dims, (/ n_inactive /), error)
call h5ltmake_dataset_int_f(hdf5_output_file, "n_active", &
rank, dims, (/ n_cycles - n_inactive /), error)
! Add description of each variable
call h5ltset_attribute_string_f(hdf5_output_file, "n_particles", &
"description", "Number of particles per cycle", error)
call h5ltset_attribute_string_f(hdf5_output_file, "n_cycles", &
"description", "Total number of cycles", error)
call h5ltset_attribute_string_f(hdf5_output_file, "n_inactive", &
"description", "Number of inactive cycles", error)
call h5ltset_attribute_string_f(hdf5_output_file, "n_active", &
"description", "Number of active cycles", error)
end if
end subroutine hdf5_write_summary
!===============================================================================
@ -94,6 +120,8 @@ contains
integer :: rank = 1
integer(HSIZE_T) :: dims(1) = (/1/)
integer(HID_T) :: timing_group
integer(8) :: total_particles
real(8) :: speed
! Create group for timing
call h5gcreate_f(hdf5_output_file, "/timing", timing_group, error)
@ -150,6 +178,12 @@ contains
call h5ltset_attribute_string_f(timing_group, "time_total", &
"description", "Total time elapsed (s)", error)
! Write calculation rate
total_particles = n_particles * n_cycles
speed = real(total_particles) / time_compute % elapsed
call h5ltmake_dataset_double_f(timing_group, "neutrons_per_second", &
rank, dims, (/ speed /), error)
! Close timing group
call h5gclose_f(timing_group, error)

1
src/initialize.F90
View file

@ -596,7 +596,6 @@ contains
lat => lattices(c % fill)
do x = 1, lat % n_x
do y = 1, lat % n_y
lat => lattices(cells(i_cell) % fill)
universe_num = lat % element(x,y)
if (.not. dict_has_key(build_dict, universe_num)) then
call dict_add_key(build_dict, universe_num, 0)

4
src/output.F90
View file

@ -251,8 +251,8 @@ contains
end if
! Print local coordinates
write(ou,'(1X,A,3ES11.4)') ' xyz = ', coord % xyz
write(ou,'(1X,A,3ES11.4)') ' uvw = ', coord % uvw
write(ou,'(1X,A,3ES12.4)') ' xyz = ', coord % xyz
write(ou,'(1X,A,3ES12.4)') ' uvw = ', coord % uvw
coord => coord % next
i = i + 1