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

minor fixes

This commit is contained in:
Luv Sharma 2014-09-12 15:58:03 +00:00
parent 5657119b11
commit 05d980f1e3
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/homogenization.f90
View File

@ -1224,17 +1224,16 @@ subroutine field_putDAMAGE(ip,el,fieldDamageValue) ! naming scheme
implicit none implicit none
integer(pInt), intent(in) :: & integer(pInt), intent(in) :: &
ip, & !< integration point number ip, & !< integration point number
el, & el
real(pReal), intent(in) :: &
fieldDamageValue fieldDamageValue
integer(pInt) :: & integer(pInt) :: &
Ngrains, ipc Ngrains, ipc
select case(field_damage_type(material_homog(ip,el))) select case(field_damage_type(material_homog(ip,el)))
case (FIELD_DAMAGE_NONLOCAL_ID) case (FIELD_DAMAGE_NONLOCAL_ID)
fieldDamage(material_homog(ip,el))% & fieldDamage(material_homog(ip,el))% &
state(1:fieldDamage(material_homog(ip,el))%sizeState, & state(1, mappingHomogenization(1,ip,el)) = fieldDamageValue
mappingHomogenization(1,ip,el)) = fieldDamageValue
end select end select
@ -1298,7 +1297,8 @@ subroutine field_putThermal(ip,el,fieldThermalValue)
implicit none implicit none
integer(pInt), intent(in) :: & integer(pInt), intent(in) :: &
ip, & !< integration point number ip, & !< integration point number
el, & el
real(pReal), intent(in) :: &
fieldThermalValue fieldThermalValue
integer(pInt) :: & integer(pInt) :: &
Ngrains, ipc Ngrains, ipc
@ -1306,8 +1306,7 @@ subroutine field_putThermal(ip,el,fieldThermalValue)
select case(field_thermal_type(material_homog(ip,el))) select case(field_thermal_type(material_homog(ip,el)))
case (FIELD_THERMAL_CONDUCTION_ID) case (FIELD_THERMAL_CONDUCTION_ID)
fieldThermal(material_homog(ip,el))% & fieldThermal(material_homog(ip,el))% &
state(1:fieldThermal(material_homog(ip,el))%sizeState, & state(1,mappingHomogenization(1,ip,el)) = fieldThermalValue
mappingHomogenization(1,ip,el)) = fieldThermalValue
end select end select

3
code/homogenization_isostrain.f90
View File

@ -135,6 +135,9 @@ subroutine homogenization_isostrain_init(fileUnit)
tag = IO_lc(IO_stringValue(line,positions,1_pInt)) ! extract key tag = IO_lc(IO_stringValue(line,positions,1_pInt)) ! extract key
select case(tag) select case(tag)
case('type') case('type')
#ifdef NEWSTATE
case('field_damage')
#endif
case ('(output)') case ('(output)')
output = output + 1_pInt output = output + 1_pInt
homogenization_isostrain_output(output,i) = IO_lc(IO_stringValue(line,positions,2_pInt)) homogenization_isostrain_output(output,i) = IO_lc(IO_stringValue(line,positions,2_pInt))