From 8f444b0695c21a20962f947aad7116d1d53cae76 Mon Sep 17 00:00:00 2001 From: Pratheek Shanthraj Date: Sun, 10 Aug 2014 11:14:43 +0000 Subject: [PATCH] minor changes to multiphysicsOut --- code/crystallite.f90 | 15 +++++++++++---- code/homogenization.f90 | 11 ++++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/code/crystallite.f90 b/code/crystallite.f90 index 9ce048fa0..dfb22c4db 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -3945,11 +3945,17 @@ function crystallite_postResults(ipc, ip, el) ip, & !< integration point index ipc !< grain index - real(pReal), dimension(1+crystallite_sizePostResults(microstructure_crystallite(mesh_element(4,el)))+ & - 1+plasticState(material_phase(ipc,ip,el))%sizePostResults) :: &! + & - ! 1+damageState(material_phase(ipc,ip,el))%sizePostResults + & - ! 1+thermalState(material_phase(ipc,ip,el))%sizePostResults) :: & +#ifdef multiphysicsOut + real(pReal), dimension(1+crystallite_sizePostResults(microstructure_crystallite(mesh_element(4,el))) + & + 1+plasticState(material_phase(ipc,ip,el))%sizePostResults + & + 1+damageState(material_phase(ipc,ip,el))%sizePostResults + & + 1+thermalState(material_phase(ipc,ip,el))%sizePostResults) :: & crystallite_postResults +#else + real(pReal), dimension(1+crystallite_sizePostResults(microstructure_crystallite(mesh_element(4,el)))+ & + 1+plasticState(material_phase(ipc,ip,el))%sizePostResults) :: + crystallite_postResults +#endif real(pReal), dimension(3,3) :: & Ee real(pReal), dimension(4) :: & @@ -4073,6 +4079,7 @@ function crystallite_postResults(ipc, ip, el) constitutive_postResults(crystallite_Tstar_v(1:6,ipc,ip,el), crystallite_Fe, & crystallite_temperature(ip,el), ipc, ip, el) c = c + plasticState(material_phase(ipc,ip,el))%sizePostResults + #ifdef multiphysicsOut crystallite_postResults(c+1) = real(damageState(material_phase(ipc,ip,el))%sizePostResults,pReal) ! size of constitutive results c = c + 1_pInt diff --git a/code/homogenization.f90 b/code/homogenization.f90 index 092e76173..d6223020b 100644 --- a/code/homogenization.f90 +++ b/code/homogenization.f90 @@ -646,10 +646,15 @@ subroutine materialpoint_postResults thePos = thePos + 1_pInt grainLooping :do g = 1,myNgrains +#ifdef multiphysicsOut theSize = (1 + crystallite_sizePostResults(myCrystallite)) + & - (1 + plasticState(material_phase(g,i,e))%sizePostResults)! + & !ToDo - ! (1 + damageState(material_phase(g,i,e))%sizePostResults) + & - ! (1 + thermalState(material_phase(g,i,e))%sizePostResults) + (1 + plasticState(material_phase(g,i,e))%sizePostResults) + & !ToDo + (1 + damageState(material_phase(g,i,e))%sizePostResults) + & + (1 + thermalState(material_phase(g,i,e))%sizePostResults) +#else + theSize = (1 + crystallite_sizePostResults(myCrystallite)) + & + (1 + plasticState(material_phase(g,i,e))%sizePostResults) +#endif materialpoint_results(thePos+1:thePos+theSize,i,e) = crystallite_postResults(g,i,e) ! tell crystallite results thePos = thePos + theSize enddo grainLooping