diff --git a/src/phase_damage_anisobrittle.f90 b/src/phase_damage_anisobrittle.f90 index e2ec9922c..fc3fbf5a2 100644 --- a/src/phase_damage_anisobrittle.f90 +++ b/src/phase_damage_anisobrittle.f90 @@ -50,7 +50,7 @@ module function anisobrittle_init() result(mySources) if (count(mySources) == 0) return print'(/,1x,a)', '<<<+- phase:damage:anisobrittle init -+>>>' - print'(/,a,i0)', ' # phases: ',count(mySources); flush(IO_STDOUT) + print'(/,1x,a,1x,i0)', '# phases:',count(mySources); flush(IO_STDOUT) phases => config_material%get_dict('phase') @@ -64,7 +64,7 @@ module function anisobrittle_init() result(mySources) associate(prm => param(ph)) - print'(/,1x,a,i0,a)', 'phase ',ph,': '//phases%key(ph) + print'(/,1x,a,1x,i0,a)', 'phase',ph,': '//phases%key(ph) refs = config_listReferences(src,indent=3) if (len(refs) > 0) print'(/,1x,a)', refs diff --git a/src/phase_damage_isobrittle.f90 b/src/phase_damage_isobrittle.f90 index 2efff9f7d..39bb762cf 100644 --- a/src/phase_damage_isobrittle.f90 +++ b/src/phase_damage_isobrittle.f90 @@ -48,7 +48,7 @@ module function isobrittle_init() result(mySources) if (count(mySources) == 0) return print'(/,1x,a)', '<<<+- phase:damage:isobrittle init -+>>>' - print'(/,a,i0)', ' # phases: ',count(mySources); flush(IO_STDOUT) + print'(/,1x,a,1x,i0)', '# phases:',count(mySources); flush(IO_STDOUT) phases => config_material%get_dict('phase') @@ -66,7 +66,7 @@ module function isobrittle_init() result(mySources) prm%W_crit = src%get_asReal('G_crit')/src%get_asReal('l_c') - print'(/,1x,a,i0,a)', 'phase ',ph,': '//phases%key(ph) + print'(/,1x,a,1x,i0,a)', 'phase',ph,': '//phases%key(ph) refs = config_listReferences(src,indent=3) if (len(refs) > 0) print'(/,1x,a)', refs diff --git a/src/phase_mechanical_eigen_thermalexpansion.f90 b/src/phase_mechanical_eigen_thermalexpansion.f90 index 027f71c81..5bc64bb49 100644 --- a/src/phase_mechanical_eigen_thermalexpansion.f90 +++ b/src/phase_mechanical_eigen_thermalexpansion.f90 @@ -27,7 +27,7 @@ module function thermalexpansion_init(kinematics_length) result(myKinematics) integer, intent(in) :: kinematics_length logical, dimension(:,:), allocatable :: myKinematics - integer :: Ninstances, p, k + integer :: p, k type(tList), pointer :: & kinematics type(tDict), pointer :: & @@ -37,15 +37,13 @@ module function thermalexpansion_init(kinematics_length) result(myKinematics) myKinematics = kinematics_active('thermalexpansion',kinematics_length) - Ninstances = count(myKinematics) - print'(/,a,i2)', ' # phases: ',Ninstances; flush(IO_STDOUT) - if (Ninstances == 0) return + if (count(myKinematics) == 0) return print'(/,1x,a)', '<<<+- phase:mechanical:eigen:thermalexpansion init -+>>>' - + print'(/,1x,a,1x,i0)', '# phases:',count(myKinematics); flush(IO_STDOUT) phases => config_material%get_dict('phase') - allocate(param(Ninstances)) + allocate(param(count(myKinematics))) allocate(kinematics_thermal_expansion_instance(phases%length), source=0) do p = 1, phases%length diff --git a/src/phase_mechanical_elastic.f90 b/src/phase_mechanical_elastic.f90 index 89b5027ac..40b5e4cf1 100644 --- a/src/phase_mechanical_elastic.f90 +++ b/src/phase_mechanical_elastic.f90 @@ -34,7 +34,7 @@ module subroutine elastic_init(phases) print'(/,1x,a)', '<<<+- phase:mechanical:elastic init -+>>>' print'(/,1x,a)', '<<<+- phase:mechanical:elastic:Hooke init -+>>>' - print'(/,a,i0)', ' # phases: ',phases%length; flush(IO_STDOUT) + print'(/,1x,a,1x,i0)', '# phases:',phases%length; flush(IO_STDOUT) allocate(param(phases%length)) @@ -43,7 +43,7 @@ module subroutine elastic_init(phases) phase => phases%get_dict(ph) mech => phase%get_dict('mechanical') elastic => mech%get_dict('elastic') - print'(/,1x,a,i0,a)', 'phase ',ph,': '//phases%key(ph) + print'(/,1x,a,1x,i0,a)', 'phase',ph,': '//phases%key(ph) refs = config_listReferences(elastic,indent=3) if (len(refs) > 0) print'(/,1x,a)', refs if (elastic%get_asStr('type') /= 'Hooke') call IO_error(200,ext_msg=elastic%get_asStr('type')) diff --git a/src/phase_mechanical_plastic_dislotungsten.f90 b/src/phase_mechanical_plastic_dislotungsten.f90 index 08dd3decd..a3567efe4 100644 --- a/src/phase_mechanical_plastic_dislotungsten.f90 +++ b/src/phase_mechanical_plastic_dislotungsten.f90 @@ -108,11 +108,11 @@ module function plastic_dislotungsten_init() result(myPlasticity) if (count(myPlasticity) == 0) return print'(/,1x,a)', '<<<+- phase:mechanical:plastic:dislotungsten init -+>>>' - print'(/,a,i0)', ' # phases: ',count(myPlasticity); flush(IO_STDOUT) 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' + print'(/,1x,a,1x,i0)', '# phases:',count(myPlasticity); flush(IO_STDOUT) phases => config_material%get_dict('phase') allocate(param(phases%length)) diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index a1f22baa7..a93c4752a 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -155,7 +155,6 @@ module function plastic_dislotwin_init() result(myPlasticity) if (count(myPlasticity) == 0) return print'(/,1x,a)', '<<<+- phase:mechanical:plastic:dislotwin init -+>>>' - print'(/,a,i0)', ' # phases: ',count(myPlasticity); flush(IO_STDOUT) print'(/,1x,a)', 'A. Ma and F. Roters, Acta Materialia 52(12):3603–3612, 2004' print'( 1x,a)', 'https://doi.org/10.1016/j.actamat.2004.04.012' @@ -166,6 +165,7 @@ module function plastic_dislotwin_init() result(myPlasticity) print'(/,1x,a)', 'S.L. Wong et al., Acta Materialia 118:140–151, 2016' print'( 1x,a)', 'https://doi.org/10.1016/j.actamat.2016.07.032' + print'(/,1x,a,1x,i0)', '# phases:',count(myPlasticity); flush(IO_STDOUT) phases => config_material%get_dict('phase') allocate(param(phases%length)) diff --git a/src/phase_mechanical_plastic_isotropic.f90 b/src/phase_mechanical_plastic_isotropic.f90 index be859dddb..e7935ddf1 100644 --- a/src/phase_mechanical_plastic_isotropic.f90 +++ b/src/phase_mechanical_plastic_isotropic.f90 @@ -68,11 +68,11 @@ module function plastic_isotropic_init() result(myPlasticity) if (count(myPlasticity) == 0) return print'(/,1x,a)', '<<<+- phase:mechanical:plastic:isotropic init -+>>>' - print'(/,a,i0)', ' # phases: ',count(myPlasticity); flush(IO_STDOUT) 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' + print'(/,1x,a,1x,i0)', '# phases:',count(myPlasticity); flush(IO_STDOUT) phases => config_material%get_dict('phase') allocate(param(phases%length)) diff --git a/src/phase_mechanical_plastic_kinehardening.f90 b/src/phase_mechanical_plastic_kinehardening.f90 index 2ce34cd95..81fa188c8 100644 --- a/src/phase_mechanical_plastic_kinehardening.f90 +++ b/src/phase_mechanical_plastic_kinehardening.f90 @@ -100,11 +100,11 @@ module function plastic_kinehardening_init() result(myPlasticity) if (count(myPlasticity) == 0) return print'(/,1x,a)', '<<<+- phase:mechanical:plastic:kinehardening init -+>>>' - print'(/,a,i0)', ' # phases: ',count(myPlasticity); flush(IO_STDOUT) 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' + print'(/,1x,a,1x,i0)', '# phases:',count(myPlasticity); flush(IO_STDOUT) phases => config_material%get_dict('phase') allocate(param(phases%length)) diff --git a/src/phase_mechanical_plastic_none.f90 b/src/phase_mechanical_plastic_none.f90 index 748e0579b..b42c0513c 100644 --- a/src/phase_mechanical_plastic_none.f90 +++ b/src/phase_mechanical_plastic_none.f90 @@ -25,7 +25,7 @@ module function plastic_none_init() result(myPlasticity) if (count(myPlasticity) == 0) return print'(/,1x,a)', '<<<+- phase:mechanical:plastic:none init -+>>>' - print'(/,a,i0)', ' # phases: ',count(myPlasticity); flush(IO_STDOUT) + print'(/,1x,a,1x,i0)', '# phases:',count(myPlasticity); flush(IO_STDOUT) phases => config_material%get_dict('phase') diff --git a/src/phase_mechanical_plastic_nonlocal.f90 b/src/phase_mechanical_plastic_nonlocal.f90 index 3e34256f1..e90dcae3c 100644 --- a/src/phase_mechanical_plastic_nonlocal.f90 +++ b/src/phase_mechanical_plastic_nonlocal.f90 @@ -203,7 +203,6 @@ module function plastic_nonlocal_init() result(myPlasticity) end if print'(/,1x,a)', '<<<+- phase:mechanical:plastic:nonlocal init -+>>>' - print'(/,a,i0)', ' # phases: ',Ninstances; flush(IO_STDOUT) print'(/,1x,a)', 'C. Reuber et al., Acta Materialia 71:333–348, 2014' print'( 1x,a)', 'https://doi.org/10.1016/j.actamat.2014.03.012' @@ -211,6 +210,7 @@ module function plastic_nonlocal_init() result(myPlasticity) print'(/,1x,a)', 'C. Kords, Dissertation RWTH Aachen, 2014' print'( 1x,a)', 'http://publications.rwth-aachen.de/record/229993' + print'(/,1x,a,1x,i0)', '# phases:',Ninstances; flush(IO_STDOUT) phases => config_material%get_dict('phase') allocate(geom(phases%length)) diff --git a/src/phase_mechanical_plastic_phenopowerlaw.f90 b/src/phase_mechanical_plastic_phenopowerlaw.f90 index 8a8018892..4091e0f76 100644 --- a/src/phase_mechanical_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanical_plastic_phenopowerlaw.f90 @@ -105,7 +105,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) if (count(myPlasticity) == 0) return print'(/,1x,a)', '<<<+- phase:mechanical:plastic:phenopowerlaw init -+>>>' - print'(/,a,i0)', ' # phases: ',count(myPlasticity); flush(IO_STDOUT) + print'(/,1x,a,1x,i0)', '# phases:',count(myPlasticity); flush(IO_STDOUT) phases => config_material%get_dict('phase') @@ -124,7 +124,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) mech => phase%get_dict('mechanical') pl => mech%get_dict('plastic') - print'(/,1x,a,i0,a)', 'phase ',ph,': '//phases%key(ph) + print'(/,1x,a,1x,i0,a)', 'phase',ph,': '//phases%key(ph) refs = config_listReferences(pl,indent=3) if (len(refs) > 0) print'(/,1x,a)', refs diff --git a/src/phase_thermal_source_dissipation.f90 b/src/phase_thermal_source_dissipation.f90 index 760259286..f0e75b10a 100644 --- a/src/phase_thermal_source_dissipation.f90 +++ b/src/phase_thermal_source_dissipation.f90 @@ -42,7 +42,7 @@ module function source_dissipation_init(maxNsources) result(isMySource) if (count(isMySource) == 0) return print'(/,1x,a)', '<<<+- phase:thermal:source_dissipation init -+>>>' - print'(/,a,i2)', ' # phases: ',count(isMySource); flush(IO_STDOUT) + print'(/,1x,a,1x,i0)', '# phases:',count(isMySource); flush(IO_STDOUT) phases => config_material%get_dict('phase') @@ -60,7 +60,7 @@ module function source_dissipation_init(maxNsources) result(isMySource) if (isMySource(so,ph)) then associate(prm => param(ph)) src => sources%get_dict(so) - print'(1x,a,i0,a,i0)', 'phase ',ph,' source ',so + print'(/,1x,a,1x,i0,1x,a,1x,a,1x,i0)', 'phase',ph,'('//phases%key(ph)//')','source',so refs = config_listReferences(src,indent=3) if (len(refs) > 0) print'(/,1x,a)', refs diff --git a/src/phase_thermal_source_externalheat.f90 b/src/phase_thermal_source_externalheat.f90 index 1a803549c..bd642af48 100644 --- a/src/phase_thermal_source_externalheat.f90 +++ b/src/phase_thermal_source_externalheat.f90 @@ -44,7 +44,7 @@ module function source_externalheat_init(maxNsources) result(isMySource) if (count(isMySource) == 0) return print'(/,1x,a)', '<<<+- phase:thermal:source_externalheat init -+>>>' - print'(/,a,i2)', ' # phases: ',count(isMySource); flush(IO_STDOUT) + print'(/,1x,a,1x,i0)', '# phases:',count(isMySource); flush(IO_STDOUT) phases => config_material%get_dict('phase') @@ -64,7 +64,7 @@ module function source_externalheat_init(maxNsources) result(isMySource) source_ID(ph) = so associate(prm => param(ph)) src => sources%get_dict(so) - print'(1x,a,i0,a,i0)', 'phase ',ph,' source ',so + print'(/,1x,a,1x,i0,1x,a,1x,a,1x,i0)', 'phase',ph,'('//phases%key(ph)//')','source',so refs = config_listReferences(src,indent=3) if (len(refs) > 0) print'(/,1x,a)', refs