white space adjustments
This commit is contained in:
parent
4256f67919
commit
f54a6cdc3b
|
@ -1873,7 +1873,7 @@ subroutine initialize_write(dset_id, filespace_id, memspace_id, plist_id, &
|
||||||
call h5pcreate_f(H5P_DATASET_XFER_F, plist_id, hdferr)
|
call h5pcreate_f(H5P_DATASET_XFER_F, plist_id, hdferr)
|
||||||
if (hdferr < 0) call IO_error(1,ext_msg='initialize_write: h5pcreate_f')
|
if (hdferr < 0) call IO_error(1,ext_msg='initialize_write: h5pcreate_f')
|
||||||
#ifdef PETSc
|
#ifdef PETSc
|
||||||
if (parallel) then
|
if (parallel) then
|
||||||
call h5pset_dxpl_mpio_f(plist_id, H5FD_MPIO_COLLECTIVE_F, hdferr)
|
call h5pset_dxpl_mpio_f(plist_id, H5FD_MPIO_COLLECTIVE_F, hdferr)
|
||||||
if (hdferr < 0) call IO_error(1,ext_msg='initialize_write: h5pset_dxpl_mpio_f')
|
if (hdferr < 0) call IO_error(1,ext_msg='initialize_write: h5pset_dxpl_mpio_f')
|
||||||
endif
|
endif
|
||||||
|
@ -1884,7 +1884,7 @@ if (parallel) then
|
||||||
writeSize = 0
|
writeSize = 0
|
||||||
writeSize(worldrank+1) = int(myShape(ubound(myShape,1)))
|
writeSize(worldrank+1) = int(myShape(ubound(myShape,1)))
|
||||||
#ifdef PETSc
|
#ifdef PETSc
|
||||||
if (parallel) then
|
if (parallel) then
|
||||||
call MPI_allreduce(MPI_IN_PLACE,writeSize,worldsize,MPI_INT,MPI_SUM,PETSC_COMM_WORLD,ierr) ! get total output size over each process
|
call MPI_allreduce(MPI_IN_PLACE,writeSize,worldsize,MPI_INT,MPI_SUM,PETSC_COMM_WORLD,ierr) ! get total output size over each process
|
||||||
if (ierr /= 0) call IO_error(894,ext_msg='initialize_write: MPI_allreduce')
|
if (ierr /= 0) call IO_error(894,ext_msg='initialize_write: MPI_allreduce')
|
||||||
endif
|
endif
|
||||||
|
@ -1928,6 +1928,6 @@ subroutine finalize_write(plist_id, dset_id, filespace_id, memspace_id)
|
||||||
if (hdferr < 0) call IO_error(1,ext_msg='finalize_write: h5sclose_f/memspace_id')
|
if (hdferr < 0) call IO_error(1,ext_msg='finalize_write: h5sclose_f/memspace_id')
|
||||||
|
|
||||||
end subroutine finalize_write
|
end subroutine finalize_write
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
end module HDF5_Utilities
|
end module HDF5_Utilities
|
||||||
|
|
|
@ -605,14 +605,13 @@ subroutine materialpoint_postResults
|
||||||
IpLooping: do i = FEsolving_execIP(1,e),FEsolving_execIP(2,e)
|
IpLooping: do i = FEsolving_execIP(1,e),FEsolving_execIP(2,e)
|
||||||
thePos = 0
|
thePos = 0
|
||||||
|
|
||||||
theSize = homogState (material_homogenizationAt(e))%sizePostResults &
|
theSize = thermalState (material_homogenizationAt(e))%sizePostResults &
|
||||||
+ thermalState (material_homogenizationAt(e))%sizePostResults &
|
|
||||||
+ damageState (material_homogenizationAt(e))%sizePostResults
|
+ damageState (material_homogenizationAt(e))%sizePostResults
|
||||||
materialpoint_results(thePos+1,i,e) = real(theSize,pReal) ! tell size of homogenization results
|
materialpoint_results(thePos+1,i,e) = real(theSize,pReal) ! tell size of homogenization results
|
||||||
thePos = thePos + 1
|
thePos = thePos + 1
|
||||||
|
|
||||||
if (theSize > 0) then ! any homogenization results to mention?
|
if (theSize > 0) then ! any homogenization results to mention?
|
||||||
materialpoint_results(thePos+1:thePos+theSize,i,e) = postResults(i,e) ! tell homogenization results
|
materialpoint_results(thePos+1:thePos+theSize,i,e) = postResults(i,e)
|
||||||
thePos = thePos + theSize
|
thePos = thePos + theSize
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -621,7 +620,7 @@ subroutine materialpoint_postResults
|
||||||
|
|
||||||
grainLooping :do g = 1,myNgrains
|
grainLooping :do g = 1,myNgrains
|
||||||
theSize = 1 + crystallite_sizePostResults(myCrystallite) + &
|
theSize = 1 + crystallite_sizePostResults(myCrystallite) + &
|
||||||
1 + plasticState (material_phaseAt(g,e))%sizePostResults + & !ToDo
|
1 + plasticState (material_phaseAt(g,e))%sizePostResults + &
|
||||||
sum(sourceState(material_phaseAt(g,e))%p(:)%sizePostResults)
|
sum(sourceState(material_phaseAt(g,e))%p(:)%sizePostResults)
|
||||||
materialpoint_results(thePos+1:thePos+theSize,i,e) = crystallite_postResults(g,i,e) ! tell crystallite results
|
materialpoint_results(thePos+1:thePos+theSize,i,e) = crystallite_postResults(g,i,e) ! tell crystallite results
|
||||||
thePos = thePos + theSize
|
thePos = thePos + theSize
|
||||||
|
@ -753,8 +752,7 @@ function postResults(ip,el)
|
||||||
integer, intent(in) :: &
|
integer, intent(in) :: &
|
||||||
ip, & !< integration point
|
ip, & !< integration point
|
||||||
el !< element number
|
el !< element number
|
||||||
real(pReal), dimension( homogState (material_homogenizationAt(el))%sizePostResults &
|
real(pReal), dimension( thermalState (material_homogenizationAt(el))%sizePostResults &
|
||||||
+ thermalState (material_homogenizationAt(el))%sizePostResults &
|
|
||||||
+ damageState (material_homogenizationAt(el))%sizePostResults) :: &
|
+ damageState (material_homogenizationAt(el))%sizePostResults) :: &
|
||||||
postResults
|
postResults
|
||||||
integer :: &
|
integer :: &
|
||||||
|
@ -817,8 +815,6 @@ subroutine homogenization_results
|
||||||
|
|
||||||
enddo
|
enddo
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
end subroutine homogenization_results
|
end subroutine homogenization_results
|
||||||
|
|
||||||
end module homogenization
|
end module homogenization
|
||||||
|
|
Loading…
Reference in New Issue