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

fixed bug in initializtion of phase instance, added svn properties for FEM code

This commit is contained in:
Martin Diehl 2014-10-15 12:22:09 +00:00
parent 7e1e6fb26c
commit f9f258d639
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/material.f90
View File

@ -761,7 +761,7 @@ subroutine material_parsePhase(fileUnit,myPart)
integer(pInt), parameter :: MAXNCHUNKS = 2_pInt integer(pInt), parameter :: MAXNCHUNKS = 2_pInt
integer(pInt), dimension(1+2*MAXNCHUNKS) :: positions integer(pInt), dimension(1+2*MAXNCHUNKS) :: positions
integer(pInt) :: Nsections, section integer(pInt) :: Nsections, section, p
character(len=65536) :: & character(len=65536) :: &
tag,line tag,line
logical :: echo logical :: echo
@ -820,7 +820,6 @@ subroutine material_parsePhase(fileUnit,myPart)
case default case default
call IO_error(200_pInt,ext_msg=trim(IO_stringValue(line,positions,2_pInt))) call IO_error(200_pInt,ext_msg=trim(IO_stringValue(line,positions,2_pInt)))
end select end select
phase_elasticityInstance(section) = count(phase_elasticity(1:section) == phase_elasticity(section)) ! count instances
case ('plasticity') case ('plasticity')
select case (IO_lc(IO_stringValue(line,positions,2_pInt))) select case (IO_lc(IO_stringValue(line,positions,2_pInt)))
case (PLASTICITY_NONE_label) case (PLASTICITY_NONE_label)
@ -840,7 +839,6 @@ subroutine material_parsePhase(fileUnit,myPart)
case default case default
call IO_error(201_pInt,ext_msg=trim(IO_stringValue(line,positions,2_pInt))) call IO_error(201_pInt,ext_msg=trim(IO_stringValue(line,positions,2_pInt)))
end select end select
phase_plasticityInstance(section) = count(phase_plasticity(1:section) == phase_plasticity(section)) ! count instances
case ('damage') case ('damage')
select case (IO_lc(IO_stringValue(line,positions,2_pInt))) select case (IO_lc(IO_stringValue(line,positions,2_pInt)))
case (LOCAL_DAMAGE_none_label) case (LOCAL_DAMAGE_none_label)
@ -854,7 +852,6 @@ subroutine material_parsePhase(fileUnit,myPart)
case default case default
call IO_error(200_pInt,ext_msg=trim(IO_stringValue(line,positions,2_pInt))) call IO_error(200_pInt,ext_msg=trim(IO_stringValue(line,positions,2_pInt)))
end select end select
phase_damageInstance(section) = count(phase_damage(1:section) == phase_damage(section)) ! count instances
case ('thermal') case ('thermal')
select case (IO_lc(IO_stringValue(line,positions,2_pInt))) select case (IO_lc(IO_stringValue(line,positions,2_pInt)))
case (LOCAL_THERMAL_ISOTHERMAL_label) case (LOCAL_THERMAL_ISOTHERMAL_label)
@ -864,7 +861,6 @@ subroutine material_parsePhase(fileUnit,myPart)
case default case default
call IO_error(200_pInt,ext_msg=trim(IO_stringValue(line,positions,2_pInt))) call IO_error(200_pInt,ext_msg=trim(IO_stringValue(line,positions,2_pInt)))
end select end select
phase_thermalInstance(section) = count(phase_thermal(1:section) == phase_thermal(section)) ! count instances
case ('vacancy') case ('vacancy')
select case (IO_lc(IO_stringValue(line,positions,2_pInt))) select case (IO_lc(IO_stringValue(line,positions,2_pInt)))
case (LOCAL_VACANCY_CONSTANT_label) case (LOCAL_VACANCY_CONSTANT_label)
@ -874,14 +870,22 @@ subroutine material_parsePhase(fileUnit,myPart)
case default case default
call IO_error(200_pInt,ext_msg=trim(IO_stringValue(line,positions,2_pInt))) call IO_error(200_pInt,ext_msg=trim(IO_stringValue(line,positions,2_pInt)))
end select end select
phase_vacancyInstance(section) = count(phase_vacancy(1:section) == phase_vacancy(section)) ! count instances
end select end select
endif endif
enddo enddo
end subroutine material_parsePhase do p=1_pInt, Nsections
phase_elasticityInstance(p) = count(phase_elasticity(1:p) == phase_elasticity(p))
phase_plasticityInstance(p) = count(phase_plasticity(1:p) == phase_plasticity(p))
phase_damageInstance(p) = count(phase_damage(1:p) == phase_damage(p))
phase_thermalInstance(p) = count(phase_thermal(1:p) == phase_thermal(p))
phase_vacancyInstance(p) = count(phase_vacancy(1:p) == phase_vacancy(p))
enddo
end subroutine material_parsePhase
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief parses the texture part in the material configuration file !> @brief parses the texture part in the material configuration file
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------