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

Fixed failing MPI case - didnt update MPI_BANK type for addition of group - and cleaned up travis log dump change

Browse source
This commit is contained in:
Adam Nelson 2015-11-18 04:52:38 -05:00
parent a093d6fde8
commit bd39cbe59e
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/initialize.F90
View file

@ -202,17 +202,17 @@ contains
subroutine initialize_mpi()
integer :: bank_blocks(5) ! Count for each datatype
integer :: bank_blocks(6) ! Count for each datatype
#ifdef MPIF08
type(MPI_Datatype) :: bank_types(5)
type(MPI_Datatype) :: bank_types(6)
type(MPI_Datatype) :: result_types(1)
type(MPI_Datatype) :: temp_type
#else
integer :: bank_types(5) ! Datatypes
integer :: bank_types(6) ! Datatypes
integer :: result_types(1) ! Datatypes
integer :: temp_type ! temporary derived type
#endif
integer(MPI_ADDRESS_KIND) :: bank_disp(5) ! Displacements
integer(MPI_ADDRESS_KIND) :: bank_disp(6) ! Displacements
integer :: result_blocks(1) ! Count for each datatype
integer(MPI_ADDRESS_KIND) :: result_disp(1) ! Displacements
integer(MPI_ADDRESS_KIND) :: result_base_disp ! Base displacement
@ -246,15 +246,17 @@ contains
call MPI_GET_ADDRESS(b % xyz, bank_disp(2), mpi_err)
call MPI_GET_ADDRESS(b % uvw, bank_disp(3), mpi_err)
call MPI_GET_ADDRESS(b % E, bank_disp(4), mpi_err)
call MPI_GET_ADDRESS(b % delayed_group, bank_disp(5), mpi_err)
call MPI_GET_ADDRESS(b % g, bank_disp(5), mpi_err)
call MPI_GET_ADDRESS(b % delayed_group, bank_disp(6), mpi_err)
! Adjust displacements
bank_disp = bank_disp - bank_disp(1)
! Define MPI_BANK for fission sites
bank_blocks = (/ 1, 3, 3, 1, 1 /)
bank_types = (/ MPI_REAL8, MPI_REAL8, MPI_REAL8, MPI_REAL8, MPI_INTEGER /)
call MPI_TYPE_CREATE_STRUCT(5, bank_blocks, bank_disp, &
bank_blocks = (/ 1, 3, 3, 1, 1, 1 /)
bank_types = (/ MPI_REAL8, MPI_REAL8, MPI_REAL8, MPI_REAL8, &
MPI_INTEGER, MPI_INTEGER /)
call MPI_TYPE_CREATE_STRUCT(6, bank_blocks, bank_disp, &
bank_types, MPI_BANK, mpi_err)
call MPI_TYPE_COMMIT(MPI_BANK, mpi_err)

1
tests/run_tests.py
View file

@ -470,7 +470,6 @@ for key in iter(tests):
logfilename = os.path.splitext(logfilename)[0]
logfilename = logfilename + '_{0}.log'.format(test.name)
shutil.copy(logfile[0], logfilename)
with open(logfilename) as fh: print(fh.read())
# Clear build directory and remove binary and hdf5 files
shutil.rmtree('build', ignore_errors=True)