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

fixed small issues, ATTENTION: Still a bug introduced with rev. 2783 not fixed

This commit is contained in:
Martin Diehl 2013-12-13 13:19:17 +00:00
parent 7ba3cc0ab7
commit 84d51d743c
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
code/crystallite.f90
View File

@ -102,8 +102,6 @@ module crystallite
crystallite_syncSubFracCompleted, & !< description not available crystallite_syncSubFracCompleted, & !< description not available
crystallite_neighborEnforcedCutback !< description not available crystallite_neighborEnforcedCutback !< description not available
real(pReal), dimension(:,:,:), allocatable, private :: &
constitutive_j2_Cslip_66
enum, bind(c) enum, bind(c)
enumerator :: undefined_ID, & enumerator :: undefined_ID, &
phase_ID, & phase_ID, &
@ -320,45 +318,45 @@ subroutine crystallite_init(temperature)
crystallite_output(output,section) = IO_lc(IO_stringValue(line,positions,2_pInt)) crystallite_output(output,section) = IO_lc(IO_stringValue(line,positions,2_pInt))
select case(IO_lc(IO_stringValue(line,positions,2_pInt))) select case(IO_lc(IO_stringValue(line,positions,2_pInt)))
case ('phase') case ('phase')
crystallite_outputID = phase_ID crystallite_outputID(output,section) = phase_ID
case ('texture') case ('texture')
crystallite_outputID = texture_ID crystallite_outputID(output,section) = texture_ID
case ('volume') case ('volume')
crystallite_outputID = volume_ID crystallite_outputID(output,section) = volume_ID
case ('grainrotationx') case ('grainrotationx')
crystallite_outputID = grainrotationx_ID crystallite_outputID(output,section) = grainrotationx_ID
case ('grainrotationy') case ('grainrotationy')
crystallite_outputID = grainrotationy_ID crystallite_outputID(output,section) = grainrotationy_ID
case ('grainrotationz') case ('grainrotationz')
crystallite_outputID = grainrotationx_ID crystallite_outputID(output,section) = grainrotationx_ID
case ('heat') case ('heat')
crystallite_outputID = heat_ID crystallite_outputID(output,section) = heat_ID
case ('orientation') case ('orientation')
crystallite_outputID = orientation_ID crystallite_outputID(output,section) = orientation_ID
case ('grainrotation') case ('grainrotation')
crystallite_outputID = grainrotation_ID crystallite_outputID(output,section) = grainrotation_ID
case ('eulerangles') case ('eulerangles')
crystallite_outputID = eulerangles_ID crystallite_outputID(output,section) = eulerangles_ID
case ('defgrad','f') case ('defgrad','f')
crystallite_outputID = defgrad_ID crystallite_outputID(output,section) = defgrad_ID
case ('fe') case ('fe')
crystallite_outputID = fe_ID crystallite_outputID(output,section) = fe_ID
case ('fp') case ('fp')
crystallite_outputID = fp_ID crystallite_outputID(output,section) = fp_ID
case ('e') case ('e')
crystallite_outputID = e_ID crystallite_outputID(output,section) = e_ID
case ('ee') case ('ee')
crystallite_outputID = ee_ID crystallite_outputID(output,section) = ee_ID
case ('p','firstpiola','1piola') case ('p','firstpiola','1piola')
crystallite_outputID = p_ID crystallite_outputID(output,section) = p_ID
case ('s','tstar','secondpiola','2ndpiola') case ('s','tstar','secondpiola','2ndpiola')
crystallite_outputID = s_ID crystallite_outputID(output,section) = s_ID
case ('elasmatrix') case ('elasmatrix')
crystallite_outputID = elasmatrix_ID crystallite_outputID(output,section) = elasmatrix_ID
case ('neighboringip') case ('neighboringip')
crystallite_outputID = neighboringip_ID crystallite_outputID(output,section) = neighboringip_ID
case ('neighboringelement') case ('neighboringelement')
crystallite_outputID = neighboringelement_ID crystallite_outputID(output,section) = neighboringelement_ID
case default case default
call IO_error(105_pInt,ext_msg=IO_stringValue(line,positions,2_pInt)//' (Crystallite)') call IO_error(105_pInt,ext_msg=IO_stringValue(line,positions,2_pInt)//' (Crystallite)')
end select end select

12
code/homogenization_isostrain.f90
View File

@ -136,13 +136,13 @@ subroutine homogenization_isostrain_init(fileUnit)
case('nconstituents','ngrains') case('nconstituents','ngrains')
homogenization_isostrain_outputID(output,i) = nconstituents_ID homogenization_isostrain_outputID(output,i) = nconstituents_ID
case('temperature') case('temperature')
homogenization_isostrain_outputID(output,i) = nconstituents_ID homogenization_isostrain_outputID(output,i) = temperature_ID
case('ipcoords') case('ipcoords')
homogenization_isostrain_outputID(output,i) = nconstituents_ID homogenization_isostrain_outputID(output,i) = ipcoords_ID
case('avgdefgrad','avgf') case('avgdefgrad','avgf')
homogenization_isostrain_outputID(output,i) = nconstituents_ID homogenization_isostrain_outputID(output,i) = avgdefgrad_ID
case('avgp','avgfirstpiola','avg1stpiola') case('avgp','avgfirstpiola','avg1stpiola')
homogenization_isostrain_outputID(output,i) = nconstituents_ID homogenization_isostrain_outputID(output,i) = avgfirstpiola_ID
case default case default
mySize = 0_pInt mySize = 0_pInt
end select end select
@ -151,9 +151,9 @@ subroutine homogenization_isostrain_init(fileUnit)
case ('mapping') case ('mapping')
select case(IO_lc(IO_stringValue(line,positions,2_pInt))) select case(IO_lc(IO_stringValue(line,positions,2_pInt)))
case ('parallel','sum') case ('parallel','sum')
homogenization_isostrain_mapping(i) = nconstituents_ID homogenization_isostrain_mapping(i) = parallel_ID
case ('average','mean','avg') case ('average','mean','avg')
homogenization_isostrain_mapping(i) = nconstituents_ID homogenization_isostrain_mapping(i) = average_ID
case default case default
end select end select
end select end select