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

fixed array out of bounds error due to misplaced #ifdef

This commit is contained in:
Martin Diehl 2014-06-05 15:22:35 +00:00
parent ab074f1fbc
commit 4d3b09030c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/constitutive.f90
View File

@ -203,11 +203,11 @@ subroutine constitutive_init
outputName = PLASTICITY_PHENOPOWERLAW_label outputName = PLASTICITY_PHENOPOWERLAW_label
thisOutput => constitutive_phenopowerlaw_output thisOutput => constitutive_phenopowerlaw_output
thisSize => constitutive_phenopowerlaw_sizePostResult thisSize => constitutive_phenopowerlaw_sizePostResult
#ifndef NEWSTATE
case (PLASTICITY_DISLOTWIN_ID) case (PLASTICITY_DISLOTWIN_ID)
outputName = PLASTICITY_DISLOTWIN_label outputName = PLASTICITY_DISLOTWIN_label
thisOutput => constitutive_dislotwin_output thisOutput => constitutive_dislotwin_output
thisSize => constitutive_dislotwin_sizePostResult thisSize => constitutive_dislotwin_sizePostResult
#ifndef NEWSTATE
case (PLASTICITY_TITANMOD_ID) case (PLASTICITY_TITANMOD_ID)
outputName = PLASTICITY_TITANMOD_label outputName = PLASTICITY_TITANMOD_label
thisOutput => constitutive_titanmod_output thisOutput => constitutive_titanmod_output
@ -853,7 +853,6 @@ subroutine constitutive_collectDotState(Tstar_v, FeArray, FpArray, Temperature,
case (PLASTICITY_J2_ID) case (PLASTICITY_J2_ID)
#ifdef NEWSTATE #ifdef NEWSTATE
write(6,*) plasticState(mappingConstitutive(2,ipc,ip,el))%dotState(:,mappingConstitutive(1,ipc,ip,el)); flush(6)
plasticState(mappingConstitutive(2,ipc,ip,el))%dotState(:,mappingConstitutive(1,ipc,ip,el)) & plasticState(mappingConstitutive(2,ipc,ip,el))%dotState(:,mappingConstitutive(1,ipc,ip,el)) &
= constitutive_j2_dotState(Tstar_v,plasticState(mappingConstitutive(2,ipc,ip,el))% & = constitutive_j2_dotState(Tstar_v,plasticState(mappingConstitutive(2,ipc,ip,el))% &
state(:,mappingConstitutive(1,ipc,ip,el)), ipc,ip,el) state(:,mappingConstitutive(1,ipc,ip,el)), ipc,ip,el)
@ -870,8 +869,8 @@ subroutine constitutive_collectDotState(Tstar_v, FeArray, FpArray, Temperature,
constitutive_dotState(ipc,ip,el)%p = constitutive_phenopowerlaw_dotState(Tstar_v,& constitutive_dotState(ipc,ip,el)%p = constitutive_phenopowerlaw_dotState(Tstar_v,&
constitutive_state(ipc,ip,el), ipc,ip,el) constitutive_state(ipc,ip,el), ipc,ip,el)
#endif #endif
#ifdef NEWSTATE
case (PLASTICITY_DISLOTWIN_ID) case (PLASTICITY_DISLOTWIN_ID)
#ifdef NEWSTATE
plasticState(mappingConstitutive(2,ipc,ip,el))%dotState(:,mappingConstitutive(1,ipc,ip,el)) & plasticState(mappingConstitutive(2,ipc,ip,el))%dotState(:,mappingConstitutive(1,ipc,ip,el)) &
= constitutive_dislotwin_dotState(Tstar_v,Temperature,& = constitutive_dislotwin_dotState(Tstar_v,Temperature,&
plasticState(mappingConstitutive(2,ipc,ip,el))% & plasticState(mappingConstitutive(2,ipc,ip,el))% &