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

for consistency, pushed assignment of sizePostResults from aggregators to individual thermal/damage label. Also fixed wrong index while use of mapping

This commit is contained in:
Luv Sharma 2014-07-04 09:22:57 +00:00
parent ad15912ddd
commit a1468b2693
8 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/constitutive.f90
View File

@ -704,7 +704,7 @@ function constitutive_postResults(Tstar_v, FeArray, temperature, ipc, ip, el)
ipc, & !< grain number
ip, & !< integration point number
el !< element number
real(pReal), dimension(plasticState(mappingConstitutive(1,ipc,ip,el))%sizePostResults) :: &
real(pReal), dimension(plasticState(mappingConstitutive(2,ipc,ip,el))%sizePostResults) :: &
constitutive_postResults
real(pReal), intent(in) :: &
temperature

9
code/constitutive_damage.f90
View File

@ -120,15 +120,6 @@ use damage_gradient
constitutive_damage_maxSizePostResults = 0_pInt
constitutive_damage_maxSizeDotState = 0_pInt
PhaseLoop:do ph = 1_pInt,material_Nphase ! loop over phases
instance = phase_damageInstance(ph)
select case(phase_damage(ph))
case (DAMAGE_none_ID)
damageState(ph)%sizePostResults = damage_none_sizePostResults(instance)
case (DAMAGE_gradient_ID)
damageState(ph)%sizePostResults = damage_gradient_sizePostResults(instance)
end select
constitutive_damage_maxSizeDotState = max(constitutive_damage_maxSizeDotState, damageState(ph)%sizeDotState)
constitutive_damage_maxSizePostResults = max(constitutive_damage_maxSizePostResults, damageState(ph)%sizePostResults)
enddo PhaseLoop

10
code/constitutive_thermal.f90
View File

@ -119,16 +119,8 @@ subroutine constitutive_thermal_init
! allocation of states
constitutive_thermal_maxSizePostResults = 0_pInt
constitutive_thermal_maxSizeDotState = 0_pInt
PhaseLoop:do ph = 1_pInt,material_Nphase ! loop over phases
instance = phase_thermalInstance(ph)
select case(phase_thermal(ph))
case (THERMAL_none_ID)
thermalState(ph)%sizePostResults = thermal_none_sizePostResults(instance)
case (THERMAL_conduction_ID)
thermalState(ph)%sizePostResults = thermal_conduction_sizePostResults(instance)
end select
PhaseLoop:do ph = 1_pInt,material_Nphase ! loop over phases
constitutive_thermal_maxSizeDotState = max(constitutive_thermal_maxSizeDotState, thermalState(ph)%sizeDotState)
constitutive_thermal_maxSizePostResults = max(constitutive_thermal_maxSizePostResults, thermalState(ph)%sizePostResults)
enddo PhaseLoop

1
code/damage_gradient.f90
View File

@ -186,6 +186,7 @@ subroutine damage_gradient_init(fileUnit)
damageState(phase)%sizeState = sizeState
damageState(phase)%sizeDotState = sizeDotState
damageState(phase)%sizePostResults = damage_gradient_sizePostResults(instance)
allocate(damageState(phase)%aTolState (sizeState), source=0.0_pReal)
allocate(damageState(phase)%state0 (sizeState,NofMyPhase), source=0.0_pReal)
allocate(damageState(phase)%partionedState0 (sizeState,NofMyPhase), source=0.0_pReal)

1
code/damage_none.f90
View File

@ -74,6 +74,7 @@ subroutine damage_none_init(fileUnit)
damageState(phase)%sizeState = sizeState
sizeDotState = sizeState
damageState(phase)%sizeDotState = sizeDotState
damageState(phase)%sizePostResults = 0_pInt
allocate(damageState(phase)%state0 (sizeState,NofMyPhase))
allocate(damageState(phase)%partionedState0(sizeState,NofMyPhase))
allocate(damageState(phase)%subState0 (sizeState,NofMyPhase))

1
code/thermal_adiabatic.f90
View File

@ -180,6 +180,7 @@ subroutine thermal_adiabatic_init(fileUnit)
sizeState = 1_pInt
thermalState(phase)%sizeState = sizeState
thermalState(phase)%sizeDotState = sizeDotState
thermalState(phase)%sizePostResults = thermal_adiabatic_sizePostResults(instance)
allocate(thermalState(phase)%aTolState (sizeState), source=0.0_pReal)
allocate(thermalState(phase)%state0 (sizeState,NofMyPhase), source=0.0_pReal)
allocate(thermalState(phase)%partionedState0 (sizeState,NofMyPhase), source=0.0_pReal)

1
code/thermal_conduction.f90
View File

@ -181,6 +181,7 @@ subroutine thermal_conduction_init(fileUnit)
thermalState(phase)%sizeState = sizeState
thermalState(phase)%sizeDotState = sizeDotState
thermalState(phase)%sizePostResults = thermal_conduction_sizePostResults(instance)
allocate(thermalState(phase)%aTolState (sizeState), source=0.0_pReal)
allocate(thermalState(phase)%state0 (sizeState,NofMyPhase), source=0.0_pReal)
allocate(thermalState(phase)%partionedState0 (sizeState,NofMyPhase), source=0.0_pReal)

1
code/thermal_none.f90
View File

@ -74,6 +74,7 @@ subroutine thermal_none_init(fileUnit)
thermalState(phase)%sizeState = sizeState
sizeDotState = sizeState
thermalState(phase)%sizeDotState = sizeDotState
thermalState(phase)%sizePostResults = 0_pInt
allocate(thermalState(phase)%state0 (sizeState,NofMyPhase))
allocate(thermalState(phase)%partionedState0(sizeState,NofMyPhase))
allocate(thermalState(phase)%subState0 (sizeState,NofMyPhase))