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

Made changes with the calling signature

This commit is contained in:
Vitesh Shah 2018-12-14 11:35:41 +01:00
parent 3352cbac4b
commit 7e41ae264d
3 changed files with 243 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/CPFEM2.f90 Normal file → Executable file
View File

@ -154,26 +154,26 @@ subroutine CPFEM_init
fileHandle = HDF5_openFile(trim(getSolverJobName())//trim(rankStr)//'.hdf5') fileHandle = HDF5_openFile(trim(getSolverJobName())//trim(rankStr)//'.hdf5')
call HDF5_read(material_phase, fileHandle,'recordedPhase') call HDF5_read(fileHandle,material_phase,'recordedPhase')
call HDF5_read(crystallite_F0, fileHandle,'convergedF') call HDF5_read(fileHandle, crystallite_F0,'convergedF')
call HDF5_read(crystallite_Fp0, fileHandle,'convergedFp') call HDF5_read(fileHandle, crystallite_Fp0,'convergedFp')
call HDF5_read(crystallite_Fi0, fileHandle,'convergedFi') call HDF5_read(fileHandle, crystallite_Fi0,'convergedFi')
call HDF5_read(crystallite_Lp0, fileHandle,'convergedLp') call HDF5_read(fileHandle, crystallite_Lp0,'convergedLp')
call HDF5_read(crystallite_Li0, fileHandle,'convergedLi') call HDF5_read(fileHandle, crystallite_Li0,'convergedLi')
call HDF5_read(crystallite_dPdF0, fileHandle,'convergeddPdF') call HDF5_read(fileHandle, crystallite_dPdF0, 'convergeddPdF')
call HDF5_read(crystallite_Tstar0_v,fileHandle,'convergedTstar') call HDF5_read(fileHandle,crystallite_Tstar0_v,'convergedTstar')
groupPlasticID = HDF5_openGroup(fileHandle,'PlasticPhases') groupPlasticID = HDF5_openGroup(fileHandle,'PlasticPhases')
do ph = 1_pInt,size(phase_plasticity) do ph = 1_pInt,size(phase_plasticity)
write(PlasticItem,*) ph,'_' write(PlasticItem,*) ph,'_'
call HDF5_read(plasticState(ph)%state0,groupPlasticID,trim(PlasticItem)//'convergedStateConst') call HDF5_read(groupPlasticID,plasticState(ph)%state0,trim(PlasticItem)//'convergedStateConst')
enddo enddo
call HDF5_closeGroup(groupPlasticID) call HDF5_closeGroup(groupPlasticID)
groupHomogID = HDF5_openGroup(fileHandle,'HomogStates') groupHomogID = HDF5_openGroup(fileHandle,'HomogStates')
do homog = 1_pInt, material_Nhomogenization do homog = 1_pInt, material_Nhomogenization
write(HomogItem,*) homog,'_' write(HomogItem,*) homog,'_'
call HDF5_read(homogState(homog)%state0, groupHomogID,trim(HomogItem)//'convergedStateHomog') call HDF5_read(groupHomogID,homogState(homog)%state0, trim(HomogItem)//'convergedStateHomog')
enddo enddo
call HDF5_closeGroup(groupHomogID) call HDF5_closeGroup(groupHomogID)
@ -282,26 +282,26 @@ subroutine CPFEM_age()
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')
call HDF5_write(material_phase, fileHandle,'recordedPhase') call HDF5_write(fileHandle, material_phase,'recordedPhase')
call HDF5_write(crystallite_F0, fileHandle,'convergedF') call HDF5_write(fileHandle, crystallite_F0,'convergedF')
call HDF5_write(crystallite_Fp0, fileHandle,'convergedFp') call HDF5_write(fileHandle, crystallite_Fp0,'convergedFp')
call HDF5_write(crystallite_Fi0, fileHandle,'convergedFi') call HDF5_write(fileHandle, crystallite_Fi0,'convergedFi')
call HDF5_write(crystallite_Lp0, fileHandle,'convergedLp') call HDF5_write(fileHandle, crystallite_Lp0,'convergedLp')
call HDF5_write(crystallite_Li0, fileHandle,'convergedLi') call HDF5_write(fileHandle, crystallite_Li0,'convergedLi')
call HDF5_write(crystallite_dPdF0, fileHandle,'convergeddPdF') call HDF5_write(fileHandle, crystallite_dPdF0,'convergeddPdF')
call HDF5_write(crystallite_Tstar0_v,fileHandle,'convergedTstar') call HDF5_write(fileHandle,crystallite_Tstar0_v,'convergedTstar')
groupPlastic = HDF5_addGroup(fileHandle,'PlasticPhases') groupPlastic = HDF5_addGroup(fileHandle,'PlasticPhases')
do ph = 1_pInt,size(phase_plasticity) do ph = 1_pInt,size(phase_plasticity)
write(PlasticItem,*) ph,'_' write(PlasticItem,*) ph,'_'
call HDF5_write(plasticState(ph)%state0,groupPlastic,trim(PlasticItem)//'convergedStateConst') call HDF5_write(groupPlastic,plasticState(ph)%state0,trim(PlasticItem)//'convergedStateConst')
enddo enddo
call HDF5_closeGroup(groupPlastic) call HDF5_closeGroup(groupPlastic)
groupHomog = HDF5_addGroup(fileHandle,'HomogStates') groupHomog = HDF5_addGroup(fileHandle,'HomogStates')
do homog = 1_pInt, material_Nhomogenization do homog = 1_pInt, material_Nhomogenization
write(HomogItem,*) homog,'_' write(HomogItem,*) homog,'_'
call HDF5_write(homogState(homog)%state0,groupHomog,trim(HomogItem)//'convergedStateHomog') call HDF5_write(groupHomog,homogState(homog)%state0,trim(HomogItem)//'convergedStateHomog')
enddo enddo
call HDF5_closeGroup(groupHomog) call HDF5_closeGroup(groupHomog)

399
src/HDF5_utilities.f90 Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

2
src/results.f90 Normal file → Executable file
View File

@ -954,7 +954,7 @@ subroutine results_writeVectorDataset(group,dataset,label,SIunit)
integer(HID_T) :: groupHandle integer(HID_T) :: groupHandle
groupHandle = results_openGroup(group) groupHandle = results_openGroup(group)
call HDF5_write(dataset,groupHandle,label) call HDF5_write(groupHandle,dataset,label)
call HDF5_closeGroup(groupHandle) call HDF5_closeGroup(groupHandle)
end subroutine results_writeVectorDataset end subroutine results_writeVectorDataset