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

Merge branch 'allocatable-strings' into 'development' 

string length is not known, avoid overflow

See merge request damask/DAMASK!701
This commit is contained in:
Franz Roters 2023-01-19 08:06:00 +00:00
parent 19f27e51cc 923ce05802
commit 6ee31e2ab3
18 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/phase.f90
View File

@ -406,7 +406,6 @@ subroutine phase_init
phases => config_material%get_dict('phase')
allocate(phase_lattice(phases%length))
allocate(phase_cOverA(phases%length),source=-1.0_pReal)
allocate(phase_rho(phases%length))
@ -549,8 +548,8 @@ subroutine crystallite_init()
type(tDict), pointer :: &
num_crystallite, &
phases
character(len=pStringLen) :: &
extmsg = ''
character(len=:), allocatable :: extmsg
num_crystallite => config_numerics%get_dict('crystallite',defaultVal=emptyDict)
@ -566,6 +565,7 @@ subroutine crystallite_init()
num%nState = num_crystallite%get_asInt ('nState', defaultVal=20)
num%nStress = num_crystallite%get_asInt ('nStress', defaultVal=40)
extmsg = ''
if (num%subStepMinCryst <= 0.0_pReal) extmsg = trim(extmsg)//' subStepMinCryst'
if (num%subStepSizeCryst <= 0.0_pReal) extmsg = trim(extmsg)//' subStepSizeCryst'
if (num%stepIncreaseCryst <= 0.0_pReal) extmsg = trim(extmsg)//' stepIncreaseCryst'

3
src/phase_damage.f90
View File

@ -84,10 +84,11 @@ module subroutine damage_init()
source
logical:: damage_active
print'(/,1x,a)', '<<<+- phase:damage init -+>>>'
phases => config_material%get_dict('phase')
phases => config_material%get_dict('phase')
allocate(current(phases%length))
allocate(damageState(phases%length))
allocate(param(phases%length))

6
src/phase_damage_anisobrittle.f90
View File

@ -41,7 +41,7 @@ module function anisobrittle_init() result(mySources)
src
integer :: Nmembers,ph
integer, dimension(:), allocatable :: N_cl
character(len=pStringLen) :: extmsg = ''
character(len=:), allocatable :: extmsg
mySources = source_active('anisobrittle')
@ -53,7 +53,7 @@ module function anisobrittle_init() result(mySources)
phases => config_material%get_dict('phase')
allocate(param(phases%length))
extmsg = ''
do ph = 1, phases%length
if (mySources(ph)) then
@ -83,7 +83,7 @@ module function anisobrittle_init() result(mySources)
prm%output = src%get_as1dString('output',defaultVal=emptyStringArray)
#endif
! sanity checks
! sanity checks
if (prm%q <= 0.0_pReal) extmsg = trim(extmsg)//' q'
if (prm%dot_o <= 0.0_pReal) extmsg = trim(extmsg)//' dot_o'
if (any(prm%g_crit < 0.0_pReal)) extmsg = trim(extmsg)//' g_crit'

3
src/phase_damage_isobrittle.f90
View File

@ -39,7 +39,7 @@ module function isobrittle_init() result(mySources)
phase, &
src
integer :: Nmembers,ph
character(len=pStringLen) :: extmsg = ''
character(len=:), allocatable :: extmsg
mySources = source_active('isobrittle')
@ -53,6 +53,7 @@ module function isobrittle_init() result(mySources)
allocate(param(phases%length))
allocate(state(phases%length))
allocate(deltaState(phases%length))
extmsg = ''
do ph = 1, phases%length
if (mySources(ph)) then

1
src/phase_mechanical.f90
View File

@ -215,6 +215,7 @@ module subroutine mechanical_init(phases)
phase, &
mech
print'(/,1x,a)', '<<<+- phase:mechanical init -+>>>'
!-------------------------------------------------------------------------------------------------

2
src/phase_mechanical_eigen.f90
View File

@ -45,8 +45,10 @@ module subroutine eigen_init(phases)
type(tList), pointer :: &
kinematics
print'(/,1x,a)', '<<<+- phase:mechanical:eigen init -+>>>'
!--------------------------------------------------------------------------------------------------
! explicit eigen mechanisms
allocate(Nmodels(phases%length),source = 0)

5
src/phase_mechanical_eigen_thermalexpansion.f90
View File

@ -36,13 +36,14 @@ module function thermalexpansion_init(kinematics_length) result(myKinematics)
mech
print'(/,1x,a)', '<<<+- phase:mechanical:eigen:thermalexpansion init -+>>>'
myKinematics = kinematics_active('thermalexpansion',kinematics_length)
Ninstances = count(myKinematics)
print'(/,a,i2)', ' # phases: ',Ninstances; flush(IO_STDOUT)
if (Ninstances == 0) return
print'(/,1x,a)', '<<<+- phase:mechanical:eigen:thermalexpansion init -+>>>'
phases => config_material%get_dict('phase')
allocate(param(Ninstances))
allocate(kinematics_thermal_expansion_instance(phases%length), source=0)

1
src/phase_mechanical_elastic.f90
View File

@ -35,6 +35,7 @@ module subroutine elastic_init(phases)
print'(/,a,i0)', ' # phases: ',phases%length; flush(IO_STDOUT)
allocate(param(phases%length))
do ph = 1, phases%length

5
src/phase_mechanical_plastic_dislotungsten.f90
View File

@ -93,8 +93,7 @@ module function plastic_dislotungsten_init() result(myPlasticity)
rho_mob_0, & !< initial dislocation density
rho_dip_0, & !< initial dipole density
a !< non-Schmid coefficients
character(len=pStringLen) :: &
extmsg = ''
character(len=:), allocatable :: extmsg
type(tDict), pointer :: &
phases, &
phase, &
@ -111,11 +110,13 @@ module function plastic_dislotungsten_init() result(myPlasticity)
print'(/,1x,a)', 'D. Cereceda et al., International Journal of Plasticity 78:242–256, 2016'
print'( 1x,a)', 'https://doi.org/10.1016/j.ijplas.2015.09.002'
phases => config_material%get_dict('phase')
allocate(param(phases%length))
allocate(indexDotState(phases%length))
allocate(state(phases%length))
allocate(dependentState(phases%length))
extmsg = ''
do ph = 1, phases%length
if (.not. myPlasticity(ph)) cycle

4
src/phase_mechanical_plastic_dislotwin.f90
View File

@ -140,8 +140,7 @@ module function plastic_dislotwin_init() result(myPlasticity)
real(pReal), allocatable, dimension(:) :: &
rho_mob_0, & !< initial unipolar dislocation density per slip system
rho_dip_0 !< initial dipole dislocation density per slip system
character(len=pStringLen) :: &
extmsg = ''
character(len=:), allocatable :: extmsg
type(tDict), pointer :: &
phases, &
phase, &
@ -170,6 +169,7 @@ module function plastic_dislotwin_init() result(myPlasticity)
allocate(indexDotState(phases%length))
allocate(state(phases%length))
allocate(dependentState(phases%length))
extmsg = ''
do ph = 1, phases%length
if (.not. myPlasticity(ph)) cycle

5
src/phase_mechanical_plastic_isotropic.f90
View File

@ -54,8 +54,7 @@ module function plastic_isotropic_init() result(myPlasticity)
sizeState, sizeDotState
real(pReal) :: &
xi_0 !< initial critical stress
character(len=pStringLen) :: &
extmsg = ''
character(len=:), allocatable :: extmsg
type(tDict), pointer :: &
phases, &
phase, &
@ -72,9 +71,11 @@ module function plastic_isotropic_init() result(myPlasticity)
print'(/,1x,a)', 'T. Maiti and P. Eisenlohr, Scripta Materialia 145:37–40, 2018'
print'( 1x,a)', 'https://doi.org/10.1016/j.scriptamat.2017.09.047'
phases => config_material%get_dict('phase')
allocate(param(phases%length))
allocate(state(phases%length))
extmsg = ''
do ph = 1, phases%length
if (.not. myPlasticity(ph)) cycle

6
src/phase_mechanical_plastic_kinehardening.f90
View File

@ -77,8 +77,7 @@ module function plastic_kinehardening_init() result(myPlasticity)
real(pReal), dimension(:), allocatable :: &
xi_0, & !< initial resistance against plastic flow
a !< non-Schmid coefficients
character(len=pStringLen) :: &
extmsg = ''
character(len=:), allocatable :: extmsg
type(tDict), pointer :: &
phases, &
phase, &
@ -94,12 +93,13 @@ module function plastic_kinehardening_init() result(myPlasticity)
print'(/,1x,a)', 'J.A. Wollmershauser et al., International Journal of Fatigue 36:181–193, 2012'
print'( 1x,a)', 'https://doi.org/10.1016/j.ijfatigue.2011.07.008'
phases => config_material%get_dict('phase')
allocate(param(phases%length))
allocate(indexDotState(phases%length))
allocate(state(phases%length))
allocate(deltaState(phases%length))
extmsg = ''
do ph = 1, phases%length
if (.not. myPlasticity(ph)) cycle

1
src/phase_mechanical_plastic_none.f90
View File

@ -27,6 +27,7 @@ module function plastic_none_init() result(myPlasticity)
print'(/,1x,a)', '<<<+- phase:mechanical:plastic:none init -+>>>'
print'(/,a,i0)', ' # phases: ',count(myPlasticity); flush(IO_STDOUT)
phases => config_material%get_dict('phase')
do ph = 1, phases%length
if (.not. myPlasticity(ph)) cycle

6
src/phase_mechanical_plastic_nonlocal.f90
View File

@ -188,8 +188,7 @@ module function plastic_nonlocal_init() result(myPlasticity)
s, t, l
real(pReal), dimension(:), allocatable :: &
a
character(len=pStringLen) :: &
extmsg = ''
character(len=:), allocatable :: extmsg
type(tInitialParameters) :: &
ini
type(tDict), pointer :: &
@ -216,15 +215,14 @@ module function plastic_nonlocal_init() result(myPlasticity)
phases => config_material%get_dict('phase')
allocate(geom(phases%length))
allocate(param(phases%length))
allocate(state(phases%length))
allocate(state0(phases%length))
allocate(dotState(phases%length))
allocate(deltaState(phases%length))
allocate(dependentState(phases%length))
extmsg = ''
do ph = 1, phases%length
if (.not. myPlasticity(ph)) cycle

4
src/phase_mechanical_plastic_phenopowerlaw.f90
View File

@ -90,8 +90,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity)
xi_0_sl, & !< initial critical shear stress for slip
xi_0_tw, & !< initial critical shear stress for twin
a !< non-Schmid coefficients
character(len=pStringLen) :: &
extmsg = ''
character(len=:), allocatable :: extmsg
type(tDict), pointer :: &
phases, &
phase, &
@ -110,6 +109,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity)
allocate(param(phases%length))
allocate(indexDotState(phases%length))
allocate(state(phases%length))
extmsg = ''
do ph = 1, phases%length
if (.not. myPlasticity(ph)) cycle

2
src/phase_thermal.f90
View File

@ -92,8 +92,8 @@ module subroutine thermal_init(phases)
print'(/,1x,a)', '<<<+- phase:thermal init -+>>>'
allocate(current(phases%length))
allocate(current(phases%length))
allocate(thermalState(phases%length))
allocate(thermal_Nsources(phases%length),source = 0)
allocate(param(phases%length))

1
src/phase_thermal_dissipation.f90
View File

@ -38,6 +38,7 @@ module function dissipation_init(source_length) result(mySources)
mySources = thermal_active('dissipation',source_length)
if (count(mySources) == 0) return
print'(/,1x,a)', '<<<+- phase:thermal:dissipation init -+>>>'
print'(/,a,i2)', ' # phases: ',count(mySources); flush(IO_STDOUT)

1
src/phase_thermal_externalheat.f90
View File

@ -41,6 +41,7 @@ module function externalheat_init(source_length) result(mySources)
mySources = thermal_active('externalheat',source_length)
if (count(mySources) == 0) return
print'(/,1x,a)', '<<<+- phase:thermal:externalheat init -+>>>'
print'(/,a,i2)', ' # phases: ',count(mySources); flush(IO_STDOUT)