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

use constitutive_xxx_Noutput instead of phase_Noutput as number of outputs for more consistency with constitutive multi physics output

This commit is contained in:
Pratheek Shanthraj 2014-09-26 10:25:26 +00:00
parent 34c33cca13
commit a42fd0608a
8 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/constitutive.f90
View File

@ -139,6 +139,7 @@ subroutine constitutive_init
instance instance
integer(pInt), dimension(:,:), pointer :: thisSize integer(pInt), dimension(:,:), pointer :: thisSize
integer(pInt), dimension(:) , pointer :: thisNoutput
character(len=64), dimension(:,:), pointer :: thisOutput character(len=64), dimension(:,:), pointer :: thisOutput
character(len=32) :: outputName !< name of output, intermediate fix until HDF5 output is ready character(len=32) :: outputName !< name of output, intermediate fix until HDF5 output is ready
logical :: knownPlasticity, knownDamage, knownThermal, nonlocalConstitutionPresent logical :: knownPlasticity, knownDamage, knownThermal, nonlocalConstitutionPresent
@ -190,30 +191,37 @@ subroutine constitutive_init
select case(phase_plasticity(phase)) ! split per constititution select case(phase_plasticity(phase)) ! split per constititution
case (PLASTICITY_NONE_ID) case (PLASTICITY_NONE_ID)
outputName = PLASTICITY_NONE_label outputName = PLASTICITY_NONE_label
thisNoutput => null()
thisOutput => null() ! constitutive_none_output thisOutput => null() ! constitutive_none_output
thisSize => null() ! constitutive_none_sizePostResult thisSize => null() ! constitutive_none_sizePostResult
case (PLASTICITY_J2_ID) case (PLASTICITY_J2_ID)
outputName = PLASTICITY_J2_label outputName = PLASTICITY_J2_label
thisNoutput => constitutive_j2_Noutput
thisOutput => constitutive_j2_output thisOutput => constitutive_j2_output
thisSize => constitutive_j2_sizePostResult thisSize => constitutive_j2_sizePostResult
case (PLASTICITY_PHENOPOWERLAW_ID) case (PLASTICITY_PHENOPOWERLAW_ID)
outputName = PLASTICITY_PHENOPOWERLAW_label outputName = PLASTICITY_PHENOPOWERLAW_label
thisNoutput => constitutive_phenopowerlaw_Noutput
thisOutput => constitutive_phenopowerlaw_output thisOutput => constitutive_phenopowerlaw_output
thisSize => constitutive_phenopowerlaw_sizePostResult thisSize => constitutive_phenopowerlaw_sizePostResult
case (PLASTICITY_DISLOTWIN_ID) case (PLASTICITY_DISLOTWIN_ID)
outputName = PLASTICITY_DISLOTWIN_label outputName = PLASTICITY_DISLOTWIN_label
thisNoutput => constitutive_dislotwin_Noutput
thisOutput => constitutive_dislotwin_output thisOutput => constitutive_dislotwin_output
thisSize => constitutive_dislotwin_sizePostResult thisSize => constitutive_dislotwin_sizePostResult
case (PLASTICITY_DISLOKMC_ID) case (PLASTICITY_DISLOKMC_ID)
outputName = PLASTICITY_DISLOKMC_label outputName = PLASTICITY_DISLOKMC_label
thisNoutput => constitutive_dislokmc_Noutput
thisOutput => constitutive_dislokmc_output thisOutput => constitutive_dislokmc_output
thisSize => constitutive_dislokmc_sizePostResult thisSize => constitutive_dislokmc_sizePostResult
case (PLASTICITY_TITANMOD_ID) case (PLASTICITY_TITANMOD_ID)
outputName = PLASTICITY_TITANMOD_label outputName = PLASTICITY_TITANMOD_label
thisNoutput => constitutive_titanmod_Noutput
thisOutput => constitutive_titanmod_output thisOutput => constitutive_titanmod_output
thisSize => constitutive_titanmod_sizePostResult thisSize => constitutive_titanmod_sizePostResult
case (PLASTICITY_NONLOCAL_ID) case (PLASTICITY_NONLOCAL_ID)
outputName = PLASTICITY_NONLOCAL_label outputName = PLASTICITY_NONLOCAL_label
thisNoutput => constitutive_nonlocal_Noutput
thisOutput => constitutive_nonlocal_output thisOutput => constitutive_nonlocal_output
thisSize => constitutive_nonlocal_sizePostResult thisSize => constitutive_nonlocal_sizePostResult
case default case default
@ -223,7 +231,7 @@ subroutine constitutive_init
if (knownPlasticity) then if (knownPlasticity) then
write(FILEUNIT,'(a)') '(plasticity)'//char(9)//trim(outputName) write(FILEUNIT,'(a)') '(plasticity)'//char(9)//trim(outputName)
if (phase_plasticity(phase) /= PLASTICITY_NONE_ID) then if (phase_plasticity(phase) /= PLASTICITY_NONE_ID) then
do e = 1_pInt,phase_Noutput(phase) do e = 1_pInt,thisNoutput(instance)
write(FILEUNIT,'(a,i4)') trim(thisOutput(e,instance))//char(9),thisSize(e,instance) write(FILEUNIT,'(a,i4)') trim(thisOutput(e,instance))//char(9),thisSize(e,instance)
enddo enddo
endif endif
@ -234,10 +242,12 @@ subroutine constitutive_init
select case(phase_damage(phase)) ! split per constititution select case(phase_damage(phase)) ! split per constititution
case (LOCAL_DAMAGE_none_ID) case (LOCAL_DAMAGE_none_ID)
outputName = LOCAL_DAMAGE_NONE_label outputName = LOCAL_DAMAGE_NONE_label
thisNoutput => null()
thisOutput => null() thisOutput => null()
thisSize => null() thisSize => null()
case (LOCAL_DAMAGE_BRITTLE_ID) case (LOCAL_DAMAGE_BRITTLE_ID)
outputName = LOCAL_DAMAGE_BRITTLE_label outputName = LOCAL_DAMAGE_BRITTLE_label
thisNoutput => damage_brittle_Noutput
thisOutput => damage_brittle_output thisOutput => damage_brittle_output
thisSize => damage_brittle_sizePostResult thisSize => damage_brittle_sizePostResult
case default case default
@ -246,7 +256,7 @@ subroutine constitutive_init
if (knownDamage) then if (knownDamage) then
write(FILEUNIT,'(a)') '(damage)'//char(9)//trim(outputName) write(FILEUNIT,'(a)') '(damage)'//char(9)//trim(outputName)
if (phase_damage(phase) /= LOCAL_DAMAGE_none_ID) then if (phase_damage(phase) /= LOCAL_DAMAGE_none_ID) then
do e = 1_pInt,phase_Noutput(phase) do e = 1_pInt,thisNoutput(instance)
write(FILEUNIT,'(a,i4)') trim(thisOutput(e,instance))//char(9),thisSize(e,instance) write(FILEUNIT,'(a,i4)') trim(thisOutput(e,instance))//char(9),thisSize(e,instance)
enddo enddo
endif endif
@ -256,10 +266,12 @@ subroutine constitutive_init
select case(phase_thermal(phase)) ! split per constititution select case(phase_thermal(phase)) ! split per constititution
case (LOCAL_THERMAL_none_ID) case (LOCAL_THERMAL_none_ID)
outputName = LOCAL_THERMAL_NONE_label outputName = LOCAL_THERMAL_NONE_label
thisNoutput => null()
thisOutput => null() thisOutput => null()
thisSize => null() thisSize => null()
case (LOCAL_THERMAL_heatgen_ID) case (LOCAL_THERMAL_heatgen_ID)
outputName = LOCAL_THERMAL_HEATGEN_label outputName = LOCAL_THERMAL_HEATGEN_label
thisNoutput => null()
thisOutput => null() thisOutput => null()
thisSize => null() thisSize => null()
case default case default
@ -268,7 +280,7 @@ subroutine constitutive_init
if (knownThermal) then if (knownThermal) then
write(FILEUNIT,'(a)') '(thermal)'//char(9)//trim(outputName) write(FILEUNIT,'(a)') '(thermal)'//char(9)//trim(outputName)
if (phase_thermal(phase) /= LOCAL_THERMAL_none_ID) then if (phase_thermal(phase) /= LOCAL_THERMAL_none_ID) then
do e = 1_pInt,phase_Noutput(phase) do e = 1_pInt,thisNoutput(instance)
write(FILEUNIT,'(a,i4)') trim(thisOutput(e,instance))//char(9),thisSize(e,instance) write(FILEUNIT,'(a,i4)') trim(thisOutput(e,instance))//char(9),thisSize(e,instance)
enddo enddo
endif endif

2
code/constitutive_dislokmc.f90
View File

@ -43,7 +43,7 @@ module constitutive_dislokmc
real(pReal), parameter, private :: & real(pReal), parameter, private :: &
kB = 1.38e-23_pReal !< Boltzmann constant in J/Kelvin kB = 1.38e-23_pReal !< Boltzmann constant in J/Kelvin
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, target, public :: &
constitutive_dislokmc_Noutput !< number of outputs per instance of this plasticity constitutive_dislokmc_Noutput !< number of outputs per instance of this plasticity
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, private :: &

2
code/constitutive_dislotwin.f90
View File

@ -45,7 +45,7 @@ module constitutive_dislotwin
real(pReal), parameter, private :: & real(pReal), parameter, private :: &
kB = 1.38e-23_pReal !< Boltzmann constant in J/Kelvin kB = 1.38e-23_pReal !< Boltzmann constant in J/Kelvin
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, target, public :: &
constitutive_dislotwin_Noutput !< number of outputs per instance of this plasticity constitutive_dislotwin_Noutput !< number of outputs per instance of this plasticity
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, private :: &

2
code/constitutive_j2.f90
View File

@ -29,7 +29,7 @@ module constitutive_j2
character(len=64), dimension(:,:), allocatable, target, public :: & character(len=64), dimension(:,:), allocatable, target, public :: &
constitutive_j2_output !< name of each post result output constitutive_j2_output !< name of each post result output
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, target, public :: &
constitutive_j2_Noutput !< number of outputs per instance constitutive_j2_Noutput !< number of outputs per instance
real(pReal), dimension(:), allocatable, private :: & real(pReal), dimension(:), allocatable, private :: &
constitutive_j2_fTaylor, & !< Taylor factor constitutive_j2_fTaylor, & !< Taylor factor

2
code/constitutive_nonlocal.f90
View File

@ -55,7 +55,7 @@ module constitutive_nonlocal
character(len=64), dimension(:,:), allocatable, target, public :: & character(len=64), dimension(:,:), allocatable, target, public :: &
constitutive_nonlocal_output !< name of each post result output constitutive_nonlocal_output !< name of each post result output
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, target, public :: &
constitutive_nonlocal_Noutput !< number of outputs per instance of this plasticity constitutive_nonlocal_Noutput !< number of outputs per instance of this plasticity
integer(pInt), dimension(:,:), allocatable, private :: & integer(pInt), dimension(:,:), allocatable, private :: &

4
code/constitutive_phenopowerlaw.f90
View File

@ -22,8 +22,10 @@ module constitutive_phenopowerlaw
character(len=64), dimension(:,:), allocatable, target, public :: & character(len=64), dimension(:,:), allocatable, target, public :: &
constitutive_phenopowerlaw_output !< name of each post result output constitutive_phenopowerlaw_output !< name of each post result output
integer(pInt), dimension(:), allocatable, target, public :: &
constitutive_phenopowerlaw_Noutput !< number of outputs per instance of this constitution
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, private :: &
constitutive_phenopowerlaw_Noutput, & !< number of outputs per instance of this constitution
constitutive_phenopowerlaw_totalNslip, & !< no. of slip system used in simulation constitutive_phenopowerlaw_totalNslip, & !< no. of slip system used in simulation
constitutive_phenopowerlaw_totalNtwin !< no. of twin system used in simulation constitutive_phenopowerlaw_totalNtwin !< no. of twin system used in simulation

2
code/constitutive_titanmod.f90
View File

@ -42,7 +42,7 @@ module constitutive_titanmod
character(len=64), dimension(:,:), allocatable, target, public :: & character(len=64), dimension(:,:), allocatable, target, public :: &
constitutive_titanmod_output !< name of each post result output constitutive_titanmod_output !< name of each post result output
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, target, public :: &
constitutive_titanmod_Noutput !< number of outputs per instance of this plasticity !< ID of the lattice structure constitutive_titanmod_Noutput !< number of outputs per instance of this plasticity !< ID of the lattice structure
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, private :: &

2
code/damage_brittle.f90
View File

@ -22,7 +22,7 @@ module damage_brittle
character(len=64), dimension(:,:), allocatable, target, public :: & character(len=64), dimension(:,:), allocatable, target, public :: &
damage_brittle_output !< name of each post result output damage_brittle_output !< name of each post result output
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, target, public :: &
damage_brittle_Noutput !< number of outputs per instance of this damage damage_brittle_Noutput !< number of outputs per instance of this damage
real(pReal), dimension(:), allocatable, private :: & real(pReal), dimension(:), allocatable, private :: &