diff --git a/PRIVATE b/PRIVATE index 857b994fb..0f9076b0b 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 857b994fb7222ab15a2b8c4ded2bba8787d7feb6 +Subproject commit 0f9076b0b589f5134b0304f6676e0076b99d887f diff --git a/src/homogenization_mechanical.f90 b/src/homogenization_mechanical.f90 index 6a42e6a87..c4b74a15d 100644 --- a/src/homogenization_mechanical.f90 +++ b/src/homogenization_mechanical.f90 @@ -182,8 +182,10 @@ module subroutine mechanical_results(group_base,ho) character(len=*), intent(in) :: group_base integer, intent(in) :: ho + integer :: ou character(len=:), allocatable :: group + group = trim(group_base)//'/mechanical' call results_closeGroup(results_addGroup(group)) @@ -194,12 +196,17 @@ module subroutine mechanical_results(group_base,ho) end select - !temp = reshape(homogenization_F,[3,3,discretization_nIPs*discretization_Nelems]) - !call results_writeDataset(group,temp,'F',& - ! 'deformation gradient','1') - !temp = reshape(homogenization_P,[3,3,discretization_nIPs*discretization_Nelems]) - !call results_writeDataset(group,temp,'P',& - ! '1st Piola-Kirchhoff stress','Pa') + do ou = 1, size(output_mechanical(1)%label) + + select case (output_mechanical(ho)%label(ou)) + case('F') + call results_writeDataset(reshape(homogenization_F,[3,3,discretization_nCells]),group,'F', & + 'deformation gradient','1') + case('P') + call results_writeDataset(reshape(homogenization_P,[3,3,discretization_nCells]),group,'P', & + 'deformation gradient','1') + end select + end do end subroutine mechanical_results diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90 index 37a183b27..882110bc3 100644 --- a/src/phase_mechanical.f90 +++ b/src/phase_mechanical.f90 @@ -331,7 +331,7 @@ module subroutine mechanical_results(group,ph) integer, intent(in) :: ph - call crystallite_results(group,ph) + call results(group,ph) select case(phase_plasticity(ph)) @@ -882,7 +882,7 @@ end function integrateStateRK !-------------------------------------------------------------------------------------------------- !> @brief writes crystallite results to HDF5 output file !-------------------------------------------------------------------------------------------------- -subroutine crystallite_results(group,ph) +subroutine results(group,ph) character(len=*), intent(in) :: group integer, intent(in) :: ph @@ -926,7 +926,7 @@ subroutine crystallite_results(group,ph) if (any(phase_lattice(ph) == ['hP', 'tI'])) & call results_addAttribute('c/a',phase_cOverA(ph),group//'/mechanical/'//output_mechanical(ph)%label(ou)) end select - enddo + end do contains @@ -948,7 +948,7 @@ subroutine crystallite_results(group,ph) end function to_quaternion -end subroutine crystallite_results +end subroutine results !--------------------------------------------------------------------------------------------------