Merge branch 'master' into inactive_tallies

This commit is contained in:
Paul Romano 2012-09-16 21:40:36 -04:00
commit d4eca784f5
13 changed files with 362 additions and 38 deletions

View file

@ -117,18 +117,16 @@ contains
call timer_stop(time_ic_tallies)
! Write out state point if it's been specified for this batch
if (master) then
do i = 1, n_state_points
if (current_batch == statepoint_batch(i)) then
do i = 1, n_state_points
if (current_batch == statepoint_batch(i)) then
#ifdef HDF5
call hdf5_write_state_point()
call hdf5_write_state_point()
#else
call write_state_point()
call write_state_point()
#endif
exit
end if
end do
end if
exit
end if
end do
end subroutine finalize_batch