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

fixed warning message in constitutive

This commit is contained in:
Martin Diehl 2014-06-17 15:24:44 +00:00
parent 132e43b7b3
commit 2160b37b1e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/constitutive_dislotwin.f90
View File

@ -424,7 +424,7 @@ subroutine constitutive_dislotwin_init(fileUnit)
! parameters depending on slip number of twin families ! parameters depending on slip number of twin families
case ('ntwin') case ('ntwin')
if (positions(1) < Nchunks_TwinFamilies + 1_pInt) & if (positions(1) < Nchunks_TwinFamilies + 1_pInt) &
call IO_warning(50_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_DISLOTWIN_label//')') call IO_warning(51_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_DISLOTWIN_label//')')
if (positions(1) > Nchunks_TwinFamilies + 1_pInt) & if (positions(1) > Nchunks_TwinFamilies + 1_pInt) &
call IO_error(150_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_DISLOTWIN_label//')') call IO_error(150_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_DISLOTWIN_label//')')
Nchunks_TwinFamilies = positions(1) - 1_pInt Nchunks_TwinFamilies = positions(1) - 1_pInt

2
code/constitutive_phenopowerlaw.f90
View File

@ -317,7 +317,7 @@ allocate(constitutive_phenopowerlaw_sizePostResults(maxNinstance),
! parameters depending on number of twin families ! parameters depending on number of twin families
case ('ntwin') case ('ntwin')
if (positions(1) < Nchunks_TwinFamilies + 1_pInt) & if (positions(1) < Nchunks_TwinFamilies + 1_pInt) &
call IO_warning(50_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_PHENOPOWERLAW_label//')') call IO_warning(51_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_PHENOPOWERLAW_label//')')
if (positions(1) > Nchunks_TwinFamilies + 1_pInt) & if (positions(1) > Nchunks_TwinFamilies + 1_pInt) &
call IO_error(150_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_PHENOPOWERLAW_label//')') call IO_error(150_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_PHENOPOWERLAW_label//')')
Nchunks_TwinFamilies = positions(1) - 1_pInt Nchunks_TwinFamilies = positions(1) - 1_pInt

6
code/crystallite.f90
View File

@ -3389,9 +3389,9 @@ logical function crystallite_stateJump(g,i,e)
crystallite_stateJump = .false. crystallite_stateJump = .false.
return return
endif endif
plasticState(mappingConstitutive(2,g,i,e))%state(1:mySizeDotState,mappingConstitutive(1,g,i,e)) = & plasticState( mappingConstitutive(2,g,i,e))%state (1:mySizeDotState,mappingConstitutive(1,g,i,e)) = &
plasticState(mappingConstitutive(2,g,i,e))%state(1:mySizeDotState,mappingConstitutive(1,g,i,e)) & plasticState(mappingConstitutive(2,g,i,e))%state (1:mySizeDotState,mappingConstitutive(1,g,i,e)) + &
+ plasticState(mappingConstitutive(2,g,i,e))%deltaState(1:mySizeDotState,mappingConstitutive(1,g,i,e)) plasticState(mappingConstitutive(2,g,i,e))%deltaState(1:mySizeDotState,mappingConstitutive(1,g,i,e))
#else #else
mySizeDotState = constitutive_sizeDotState(g,i,e) mySizeDotState = constitutive_sizeDotState(g,i,e)
if (any(constitutive_deltaState(g,i,e)%p(1:mySizeDotState) & if (any(constitutive_deltaState(g,i,e)%p(1:mySizeDotState) &