Merge remote-tracking branch 'origin/development' into Fortran-simplifications
This commit is contained in:
commit
e848590c5c
|
@ -88,7 +88,7 @@ subroutine HDF5_utilities_init
|
||||||
integer :: hdferr
|
integer :: hdferr
|
||||||
integer(SIZE_T) :: typeSize
|
integer(SIZE_T) :: typeSize
|
||||||
|
|
||||||
write(6,'(/,a)') ' <<<+- HDF5_Utilities init -+>>>'
|
print'(/,a)', ' <<<+- HDF5_Utilities init -+>>>'
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!initialize HDF5 library and check if integer and float type size match
|
!initialize HDF5 library and check if integer and float type size match
|
||||||
|
|
|
@ -1561,9 +1561,9 @@ subroutine crystallite_restartWrite
|
||||||
integer(HID_T) :: fileHandle, groupHandle
|
integer(HID_T) :: fileHandle, groupHandle
|
||||||
character(len=pStringLen) :: fileName, datasetName
|
character(len=pStringLen) :: fileName, datasetName
|
||||||
|
|
||||||
print'(a)', ' writing field and constitutive data required for restart to file';flush(6)
|
print*, ' writing field and constitutive data required for restart to file';flush(6)
|
||||||
|
|
||||||
write(fileName,'(a,i0,a)', trim(getSolverJobName())//'_',worldrank,'.hdf5'
|
write(fileName,'(a,i0,a)') trim(getSolverJobName())//'_',worldrank,'.hdf5'
|
||||||
fileHandle = HDF5_openFile(fileName,'a')
|
fileHandle = HDF5_openFile(fileName,'a')
|
||||||
|
|
||||||
call HDF5_write(fileHandle,crystallite_partionedF,'F')
|
call HDF5_write(fileHandle,crystallite_partionedF,'F')
|
||||||
|
@ -1575,14 +1575,14 @@ subroutine crystallite_restartWrite
|
||||||
|
|
||||||
groupHandle = HDF5_addGroup(fileHandle,'constituent')
|
groupHandle = HDF5_addGroup(fileHandle,'constituent')
|
||||||
do i = 1,size(material_name_phase)
|
do i = 1,size(material_name_phase)
|
||||||
write(datasetName,'(i0,a)', i,'_omega_plastic'
|
write(datasetName,'(i0,a)') i,'_omega_plastic'
|
||||||
call HDF5_write(groupHandle,plasticState(i)%state,datasetName)
|
call HDF5_write(groupHandle,plasticState(i)%state,datasetName)
|
||||||
enddo
|
enddo
|
||||||
call HDF5_closeGroup(groupHandle)
|
call HDF5_closeGroup(groupHandle)
|
||||||
|
|
||||||
groupHandle = HDF5_addGroup(fileHandle,'materialpoint')
|
groupHandle = HDF5_addGroup(fileHandle,'materialpoint')
|
||||||
do i = 1, material_Nhomogenization
|
do i = 1, material_Nhomogenization
|
||||||
write(datasetName,'(i0,a)', i,'_omega_homogenization'
|
write(datasetName,'(i0,a)') i,'_omega_homogenization'
|
||||||
call HDF5_write(groupHandle,homogState(i)%state,datasetName)
|
call HDF5_write(groupHandle,homogState(i)%state,datasetName)
|
||||||
enddo
|
enddo
|
||||||
call HDF5_closeGroup(groupHandle)
|
call HDF5_closeGroup(groupHandle)
|
||||||
|
@ -1604,7 +1604,7 @@ subroutine crystallite_restartRead
|
||||||
|
|
||||||
print'(/,a,i0,a)', ' reading restart information of increment from file'
|
print'(/,a,i0,a)', ' reading restart information of increment from file'
|
||||||
|
|
||||||
write(fileName,'(a,i0,a)', trim(getSolverJobName())//'_',worldrank,'.hdf5'
|
write(fileName,'(a,i0,a)') trim(getSolverJobName())//'_',worldrank,'.hdf5'
|
||||||
fileHandle = HDF5_openFile(fileName)
|
fileHandle = HDF5_openFile(fileName)
|
||||||
|
|
||||||
call HDF5_read(fileHandle,crystallite_F0, 'F')
|
call HDF5_read(fileHandle,crystallite_F0, 'F')
|
||||||
|
|
|
@ -49,7 +49,7 @@ subroutine discretization_init(microstructureAt,&
|
||||||
integer, optional, intent(in) :: &
|
integer, optional, intent(in) :: &
|
||||||
sharedNodesBegin !< index of first node shared among different processes (MPI)
|
sharedNodesBegin !< index of first node shared among different processes (MPI)
|
||||||
|
|
||||||
write(6,'(/,a)') ' <<<+- discretization init -+>>>'; flush(6)
|
print'(/,a)', ' <<<+- discretization init -+>>>'; flush(6)
|
||||||
|
|
||||||
discretization_nElem = size(microstructureAt,1)
|
discretization_nElem = size(microstructureAt,1)
|
||||||
discretization_nIP = size(IPcoords0,2)/discretization_nElem
|
discretization_nIP = size(IPcoords0,2)/discretization_nElem
|
||||||
|
|
|
@ -922,7 +922,7 @@ subroutine tElement_init(self,elemType)
|
||||||
|
|
||||||
self%nIPneighbors = size(self%IPneighbor,1)
|
self%nIPneighbors = size(self%IPneighbor,1)
|
||||||
|
|
||||||
write(6,'(/,a)') ' <<<+- element_init -+>>>'; flush(6)
|
print'(/,a)', ' <<<+- element_init -+>>>'; flush(6)
|
||||||
|
|
||||||
print*, 'element type: ',self%elemType
|
print*, 'element type: ',self%elemType
|
||||||
print*, ' geom type: ',self%geomType
|
print*, ' geom type: ',self%geomType
|
||||||
|
|
Loading…
Reference in New Issue