223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed unused variables 

made hardening matrix finally (?) work
This commit is contained in:
Franz Roters 2007-10-22 14:53:10 +00:00
parent b611af8826
commit 57ed908129
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/IO.f90
View File

@ -476,7 +476,7 @@
use prec, only: pReal,pInt use prec, only: pReal,pInt
implicit none implicit none
integer(pInt) IO_countContinousIntValues,unit,i integer(pInt) IO_countContinousIntValues,unit
integer(pInt), dimension(67) :: pos ! allow for 32 values excl "c" integer(pInt), dimension(67) :: pos ! allow for 32 values excl "c"
character(len=300) line character(len=300) line

13
trunk/constitutive_pheno.f90
View File

@ -250,13 +250,12 @@ character(len=80) function constitutive_Parse_MaterialPart(file)
!********************************************************************* !*********************************************************************
use prec, only: pInt use prec, only: pInt
use IO use IO
use crystal, only: crystal_MaxMaxNslipOfStructure
implicit none implicit none
!* Definition of variables !* Definition of variables
character(len=80) line,tag character(len=80) line,tag
integer(pInt) i integer(pInt) i
integer(pInt), parameter :: maxNchunks = 2 integer(pInt), parameter :: maxNchunks = 3
integer(pInt) file,section integer(pInt) file,section
integer(pInt), dimension(1+2*maxNchunks) :: positions integer(pInt), dimension(1+2*maxNchunks) :: positions
@ -303,8 +302,8 @@ do while(.true.)
material_s_sat(section)=IO_floatValue(line,positions,2) material_s_sat(section)=IO_floatValue(line,positions,2)
case ('w0') case ('w0')
material_w0(section)=IO_floatValue(line,positions,2) material_w0(section)=IO_floatValue(line,positions,2)
case ('hardening_coefficient') case ('hardening_coefficients')
do i=1,crystal_MaxMaxNslipOfStructure do i=1,2
material_SlipIntCoeff(i,section)=IO_floatValue(line,positions,i+1) material_SlipIntCoeff(i,section)=IO_floatValue(line,positions,i+1)
enddo enddo
end select end select
@ -554,7 +553,6 @@ integer(pInt) e,i,j,k,l,m,o,g,s
integer(pInt) matID,texID integer(pInt) matID,texID
integer(pInt), dimension(:,:,:), allocatable :: hybridIA_population integer(pInt), dimension(:,:,:), allocatable :: hybridIA_population
integer(pInt), dimension(texture_maxN) :: Ncomponents,Nsym,multiplicity,sumVolfrac,ODFmap,sampleCount integer(pInt), dimension(texture_maxN) :: Ncomponents,Nsym,multiplicity,sumVolfrac,ODFmap,sampleCount
real(pReal) K_inter
real(pReal), dimension(3,4*(1+texture_maxNGauss+texture_maxNfiber)) :: Euler real(pReal), dimension(3,4*(1+texture_maxNGauss+texture_maxNfiber)) :: Euler
real(pReal), dimension(4*(1+texture_maxNGauss+texture_maxNfiber)) :: texVolfrac real(pReal), dimension(4*(1+texture_maxNGauss+texture_maxNfiber)) :: texVolfrac
@ -691,7 +689,7 @@ do i=1,material_maxN
do j=1,material_Nslip(i) do j=1,material_Nslip(i)
do k=1,material_Nslip(i) do k=1,material_Nslip(i)
!* min function is used to distinguish self hardening from latent hardening !* min function is used to distinguish self hardening from latent hardening
constitutive_HardeningMatrix(k,j,i) = material_SlipIntCoeff(min(3,crystal_SlipIntType(k,j,i)),i) constitutive_HardeningMatrix(k,j,i) = material_SlipIntCoeff(max(2,min(3,crystal_SlipIntType(k,j,i)))-1,i) ! 1,2,3,4,5 --> 1,1,2,2,2
enddo enddo
enddo enddo
enddo enddo
@ -836,8 +834,7 @@ enddo
!* Hardening for all systems !* Hardening for all systems
constitutive_dotState=matmul(constitutive_HardeningMatrix(1:material_Nslip(matID),1:material_Nslip(matID),& constitutive_dotState=matmul(constitutive_HardeningMatrix(1:material_Nslip(matID),1:material_Nslip(matID),&
material_CrystalStructure(matID)),self_hardening) matID),self_hardening)
return return
end function end function