From 327992871bcaf7cfecb215826d56ecbc3f3cfa12 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 18 Jan 2023 18:50:01 +0100 Subject: [PATCH] white space and style adjustments --- src/phase.f90 | 4 +--- src/phase_damage.f90 | 3 ++- src/phase_mechanical.f90 | 1 + src/phase_mechanical_eigen.f90 | 2 ++ src/phase_mechanical_eigen_thermalexpansion.f90 | 5 +++-- src/phase_mechanical_elastic.f90 | 1 + src/phase_mechanical_plastic_dislotungsten.f90 | 4 ++-- src/phase_mechanical_plastic_dislotwin.f90 | 3 +-- src/phase_mechanical_plastic_isotropic.f90 | 4 ++-- src/phase_mechanical_plastic_kinehardening.f90 | 4 ++-- src/phase_mechanical_plastic_none.f90 | 1 + src/phase_mechanical_plastic_nonlocal.f90 | 5 +---- src/phase_mechanical_plastic_phenopowerlaw.f90 | 3 +-- src/phase_thermal.f90 | 2 +- src/phase_thermal_dissipation.f90 | 1 + src/phase_thermal_externalheat.f90 | 1 + 16 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/phase.f90 b/src/phase.f90 index 7a3e9f508..cf765acf0 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -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,7 @@ subroutine crystallite_init() type(tDict), pointer :: & num_crystallite, & phases - character(len=:), allocatable :: & - extmsg + character(len=:), allocatable :: extmsg num_crystallite => config_numerics%get_dict('crystallite',defaultVal=emptyDict) diff --git a/src/phase_damage.f90 b/src/phase_damage.f90 index ad592a846..011fbcdb3 100644 --- a/src/phase_damage.f90 +++ b/src/phase_damage.f90 @@ -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)) diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90 index 9229abe23..b32d8925e 100644 --- a/src/phase_mechanical.f90 +++ b/src/phase_mechanical.f90 @@ -215,6 +215,7 @@ module subroutine mechanical_init(phases) phase, & mech + print'(/,1x,a)', '<<<+- phase:mechanical init -+>>>' !------------------------------------------------------------------------------------------------- diff --git a/src/phase_mechanical_eigen.f90 b/src/phase_mechanical_eigen.f90 index 1e639b051..a0fad81c5 100644 --- a/src/phase_mechanical_eigen.f90 +++ b/src/phase_mechanical_eigen.f90 @@ -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) diff --git a/src/phase_mechanical_eigen_thermalexpansion.f90 b/src/phase_mechanical_eigen_thermalexpansion.f90 index ddd495687..23c6b0aee 100644 --- a/src/phase_mechanical_eigen_thermalexpansion.f90 +++ b/src/phase_mechanical_eigen_thermalexpansion.f90 @@ -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) diff --git a/src/phase_mechanical_elastic.f90 b/src/phase_mechanical_elastic.f90 index e5cc417aa..d5ad9f916 100644 --- a/src/phase_mechanical_elastic.f90 +++ b/src/phase_mechanical_elastic.f90 @@ -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 diff --git a/src/phase_mechanical_plastic_dislotungsten.f90 b/src/phase_mechanical_plastic_dislotungsten.f90 index fa05d17a8..adb090f0c 100644 --- a/src/phase_mechanical_plastic_dislotungsten.f90 +++ b/src/phase_mechanical_plastic_dislotungsten.f90 @@ -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=:), allocatable :: & - extmsg + character(len=:), allocatable :: extmsg type(tDict), pointer :: & phases, & phase, & @@ -111,6 +110,7 @@ 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)) diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index c03dab288..bdc5424c9 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -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=:), allocatable :: & - extmsg + character(len=:), allocatable :: extmsg type(tDict), pointer :: & phases, & phase, & diff --git a/src/phase_mechanical_plastic_isotropic.f90 b/src/phase_mechanical_plastic_isotropic.f90 index ccd557f13..1a7c6204d 100644 --- a/src/phase_mechanical_plastic_isotropic.f90 +++ b/src/phase_mechanical_plastic_isotropic.f90 @@ -54,8 +54,7 @@ module function plastic_isotropic_init() result(myPlasticity) sizeState, sizeDotState real(pReal) :: & xi_0 !< initial critical stress - character(len=:), allocatable :: & - extmsg + character(len=:), allocatable :: extmsg type(tDict), pointer :: & phases, & phase, & @@ -72,6 +71,7 @@ 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)) diff --git a/src/phase_mechanical_plastic_kinehardening.f90 b/src/phase_mechanical_plastic_kinehardening.f90 index 61f3594f2..fedc4cd5b 100644 --- a/src/phase_mechanical_plastic_kinehardening.f90 +++ b/src/phase_mechanical_plastic_kinehardening.f90 @@ -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=:), allocatable :: & - extmsg + character(len=:), allocatable :: extmsg type(tDict), pointer :: & phases, & phase, & @@ -94,6 +93,7 @@ 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)) diff --git a/src/phase_mechanical_plastic_none.f90 b/src/phase_mechanical_plastic_none.f90 index 711260531..401b52102 100644 --- a/src/phase_mechanical_plastic_none.f90 +++ b/src/phase_mechanical_plastic_none.f90 @@ -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 diff --git a/src/phase_mechanical_plastic_nonlocal.f90 b/src/phase_mechanical_plastic_nonlocal.f90 index 1ad775542..8e61837cc 100644 --- a/src/phase_mechanical_plastic_nonlocal.f90 +++ b/src/phase_mechanical_plastic_nonlocal.f90 @@ -188,8 +188,7 @@ module function plastic_nonlocal_init() result(myPlasticity) s, t, l real(pReal), dimension(:), allocatable :: & a - character(len=:), allocatable :: & - extmsg + character(len=:), allocatable :: extmsg type(tInitialParameters) :: & ini type(tDict), pointer :: & @@ -216,9 +215,7 @@ 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)) diff --git a/src/phase_mechanical_plastic_phenopowerlaw.f90 b/src/phase_mechanical_plastic_phenopowerlaw.f90 index aefa01859..d1650814c 100644 --- a/src/phase_mechanical_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanical_plastic_phenopowerlaw.f90 @@ -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=:), allocatable :: & - extmsg + character(len=:), allocatable :: extmsg type(tDict), pointer :: & phases, & phase, & diff --git a/src/phase_thermal.f90 b/src/phase_thermal.f90 index fd79d3d46..813e20838 100644 --- a/src/phase_thermal.f90 +++ b/src/phase_thermal.f90 @@ -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)) diff --git a/src/phase_thermal_dissipation.f90 b/src/phase_thermal_dissipation.f90 index 5cd2d4d90..711d278de 100644 --- a/src/phase_thermal_dissipation.f90 +++ b/src/phase_thermal_dissipation.f90 @@ -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) diff --git a/src/phase_thermal_externalheat.f90 b/src/phase_thermal_externalheat.f90 index 5970a5894..3dccc5791 100644 --- a/src/phase_thermal_externalheat.f90 +++ b/src/phase_thermal_externalheat.f90 @@ -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)