From 7faf4093a5f49a72a060479194146d073fe7a141 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 25 Mar 2008 13:59:22 +0000 Subject: [PATCH] reflect change of mesh_element(2,e) in mesh.f90 -change of line, and those below, will be ignored-- M constitutive_pheno.f90 --- trunk/constitutive_pheno.f90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/constitutive_pheno.f90 b/trunk/constitutive_pheno.f90 index cb8204df0..104c04981 100644 --- a/trunk/constitutive_pheno.f90 +++ b/trunk/constitutive_pheno.f90 @@ -535,7 +535,7 @@ subroutine constitutive_Assignment() !********************************************************************* use prec, only: pReal,pInt use math, only: math_sampleGaussOri,math_sampleFiberOri,math_sampleRandomOri,math_symmetricEulers,math_EulerToR -use mesh, only: mesh_NcpElems,FE_Nips,FE_mapElemtype,mesh_maxNips,mesh_element +use mesh, only: mesh_NcpElems,FE_Nips,mesh_maxNips,mesh_element use IO, only: IO_hybridIA use crystal, only: crystal_SlipIntType @@ -591,7 +591,7 @@ constitutive_maxNstatevars = material_maxNslip + 0_pInt allocate(texture_totalNgrains(texture_maxN)) ; texture_totalNgrains=0_pInt do i=1,mesh_NcpElems texID = mesh_element(4,i) - texture_totalNgrains(texID) = texture_totalNgrains(texID) + FE_Nips(FE_mapElemtype(mesh_element(2,i)))*texture_Ngrains(texID) + texture_totalNgrains(texID) = texture_totalNgrains(texID) + FE_Nips(mesh_element(2,i))*texture_Ngrains(texID) enddo ! generate hybridIA samplings for ODFfile textures to later draw from these populations @@ -621,7 +621,7 @@ constitutive_HardeningMatrix=0.0_pReal do e=1,mesh_NcpElems matID=mesh_element(3,e) texID=mesh_element(4,e) - do i=1,FE_Nips(FE_mapElemtype(mesh_element(2,e))) + do i=1,FE_Nips(mesh_element(2,e)) g = 0_pInt ! grain counter do m = 1,multiplicity(texID) o = 0_pInt ! component counter