223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed deadlock

This commit is contained in:
Martin Diehl 2019-04-15 15:27:58 +02:00
parent a59c5c30c9
commit 18f9deef1a
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/grid_mech_spectral_basic.f90
View File

@ -335,7 +335,6 @@ subroutine grid_mech_spectral_basic_forward(guess,timeinc,timeinc_old,loadCaseTi
write(rankStr,'(a1,i0)')'_',worldrank write(rankStr,'(a1,i0)')'_',worldrank
fileHandle = HDF5_openFile(trim(getSolverJobName())//trim(rankStr)//'.hdf5','w') fileHandle = HDF5_openFile(trim(getSolverJobName())//trim(rankStr)//'.hdf5','w')
print*, trim(getSolverJobName())//trim(rankStr)//'.hdf5';flush(6)
call HDF5_write(fileHandle,F_aim, 'F_aim') call HDF5_write(fileHandle,F_aim, 'F_aim')
call HDF5_write(fileHandle,F_aim_lastInc,'F_aim_lastInc') call HDF5_write(fileHandle,F_aim_lastInc,'F_aim_lastInc')
call HDF5_write(fileHandle,F_aimDot, 'F_aimDot') call HDF5_write(fileHandle,F_aimDot, 'F_aimDot')

9
src/grid_mech_spectral_polarisation.f90
View File

@ -107,8 +107,7 @@ subroutine grid_mech_spectral_polarisation_init
use spectral_utilities, only: & use spectral_utilities, only: &
utilities_constitutiveResponse, & utilities_constitutiveResponse, &
utilities_updateGamma, & utilities_updateGamma, &
utilities_updateIPcoords, & utilities_updateIPcoords
wgt
use mesh, only: & use mesh, only: &
grid, & grid, &
grid3 grid3
@ -197,7 +196,6 @@ subroutine grid_mech_spectral_polarisation_init
call HDF5_read(fileHandle,F_tau, 'F_tau') call HDF5_read(fileHandle,F_tau, 'F_tau')
call HDF5_read(fileHandle,F_tau_lastInc, 'F_tau_lastInc') call HDF5_read(fileHandle,F_tau_lastInc, 'F_tau_lastInc')
elseif (restartInc == 0) then restart elseif (restartInc == 0) then restart
F_lastInc = spread(spread(spread(math_I3,3,grid(1)),4,grid(2)),5,grid3) ! initialize to identity F_lastInc = spread(spread(spread(math_I3,3,grid(1)),4,grid(2)),5,grid3) ! initialize to identity
F = reshape(F_lastInc,[9,grid(1),grid(2),grid3]) F = reshape(F_lastInc,[9,grid(1),grid(2),grid3])
@ -343,7 +341,6 @@ subroutine grid_mech_spectral_polarisation_forward(guess,timeinc,timeinc_old,loa
integer :: i, j, k integer :: i, j, k
real(pReal), dimension(3,3) :: F_lambda33 real(pReal), dimension(3,3) :: F_lambda33
integer :: fileUnit
integer(HID_T) :: fileHandle integer(HID_T) :: fileHandle
character(len=32) :: rankStr character(len=32) :: rankStr
@ -363,15 +360,13 @@ subroutine grid_mech_spectral_polarisation_forward(guess,timeinc,timeinc_old,loa
write(rankStr,'(a1,i0)')'_',worldrank write(rankStr,'(a1,i0)')'_',worldrank
fileHandle = HDF5_openFile(trim(getSolverJobName())//trim(rankStr)//'.hdf5','w') fileHandle = HDF5_openFile(trim(getSolverJobName())//trim(rankStr)//'.hdf5','w')
if (worldrank == 0) then
call HDF5_write(fileHandle,C_volAvg, 'C_volAvg') call HDF5_write(fileHandle,C_volAvg, 'C_volAvg')
call HDF5_write(fileHandle,C_volAvgLastInc,'C_volAvgLastInc') call HDF5_write(fileHandle,C_volAvgLastInc,'C_volAvgLastInc')
call HDF5_write(fileHandle,F_aim, 'F_aim') call HDF5_write(fileHandle,F_aim, 'F_aim')
call HDF5_write(fileHandle,F_aimDot, 'F_aimDot') call HDF5_write(fileHandle,F_aimDot, 'F_aimDot')
call HDF5_write(fileHandle,F_aim_lastInc, 'F_aim_lastInc') call HDF5_write(fileHandle,F_aim_lastInc, 'F_aim_lastInc')
endif
write(rankStr,'(a1,i0)')'_',worldrank
call HDF5_write(fileHandle,F, 'F') call HDF5_write(fileHandle,F, 'F')
call HDF5_write(fileHandle,F_lastInc, 'F_lastInc') call HDF5_write(fileHandle,F_lastInc, 'F_lastInc')
call HDF5_write(fileHandle,F_tau, 'F_tau') call HDF5_write(fileHandle,F_tau, 'F_tau')