From 0d3b9b9f2a83c9e5439fd17f90f6b92599438cf9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 27 Jan 2021 10:44:03 +0100 Subject: [PATCH] correct reporting --- src/homogenization_damage.f90 | 4 ++-- src/homogenization_mechanics.f90 | 2 +- src/homogenization_mechanics_RGC.f90 | 2 +- src/homogenization_mechanics_isostrain.f90 | 2 +- src/homogenization_mechanics_none.f90 | 2 +- src/homogenization_thermal.f90 | 4 +++- src/phase.f90 | 2 +- src/phase_damage.f90 | 3 +++ src/phase_damage_anisobrittle.f90 | 2 +- src/phase_damage_anisoductile.f90 | 2 +- src/phase_damage_isobrittle.f90 | 2 +- src/phase_damage_isoductile.f90 | 2 +- src/phase_mechanics.f90 | 2 +- src/phase_mechanics_eigendeformation.f90 | 2 +- src/phase_mechanics_eigendeformation_cleavageopening.f90 | 2 +- src/phase_mechanics_eigendeformation_slipplaneopening.f90 | 2 +- src/phase_mechanics_eigendeformation_thermalexpansion.f90 | 2 +- src/phase_mechanics_plastic.f90 | 3 +++ src/phase_mechanics_plastic_dislotungsten.f90 | 2 +- src/phase_mechanics_plastic_dislotwin.f90 | 2 +- src/phase_mechanics_plastic_isotropic.f90 | 2 +- src/phase_mechanics_plastic_kinehardening.f90 | 2 +- src/phase_mechanics_plastic_none.f90 | 2 +- src/phase_mechanics_plastic_nonlocal.f90 | 2 +- src/phase_mechanics_plastic_phenopowerlaw.f90 | 2 +- src/phase_thermal.f90 | 2 +- src/phase_thermal_dissipation.f90 | 2 +- src/phase_thermal_externalheat.f90 | 2 +- 28 files changed, 35 insertions(+), 27 deletions(-) diff --git a/src/homogenization_damage.f90 b/src/homogenization_damage.f90 index 3115e6a6f..ba021a0e0 100644 --- a/src/homogenization_damage.f90 +++ b/src/homogenization_damage.f90 @@ -34,8 +34,8 @@ module subroutine damage_init() integer :: ho - print'(/,a)', ' <<<+- homogenization_damage init -+>>>' - + print'(/,a)', ' <<<+- homogenization:damage init -+>>>' + print'(/,a)', ' <<<+- homogenization:damage:isodamage init -+>>>' configHomogenizations => config_material%get('homogenization') allocate(param(configHomogenizations%length)) diff --git a/src/homogenization_mechanics.f90 b/src/homogenization_mechanics.f90 index 3d889e298..4eae859ee 100644 --- a/src/homogenization_mechanics.f90 +++ b/src/homogenization_mechanics.f90 @@ -86,7 +86,7 @@ module subroutine mech_init(num_homog) class(tNode), pointer :: & num_homogMech - print'(/,a)', ' <<<+- homogenization_mech init -+>>>' + print'(/,a)', ' <<<+- homogenization:mechanics init -+>>>' allocate(homogenization_dPdF(3,3,3,3,discretization_nIPs*discretization_Nelems), source=0.0_pReal) homogenization_F0 = spread(math_I3,3,discretization_nIPs*discretization_Nelems) ! initialize to identity diff --git a/src/homogenization_mechanics_RGC.f90 b/src/homogenization_mechanics_RGC.f90 index 6f76fe788..89a84314b 100644 --- a/src/homogenization_mechanics_RGC.f90 +++ b/src/homogenization_mechanics_RGC.f90 @@ -88,7 +88,7 @@ module subroutine mech_RGC_init(num_homogMech) homog, & homogMech - print'(/,a)', ' <<<+- homogenization_mech_rgc init -+>>>' + print'(/,a)', ' <<<+- homogenization:mechanics:RGC init -+>>>' Ninstances = count(homogenization_type == HOMOGENIZATION_RGC_ID) print'(a,i2)', ' # instances: ',Ninstances; flush(IO_STDOUT) diff --git a/src/homogenization_mechanics_isostrain.f90 b/src/homogenization_mechanics_isostrain.f90 index 699000cc8..9634b2a38 100644 --- a/src/homogenization_mechanics_isostrain.f90 +++ b/src/homogenization_mechanics_isostrain.f90 @@ -37,7 +37,7 @@ module subroutine mech_isostrain_init homog, & homogMech - print'(/,a)', ' <<<+- homogenization_mech_isostrain init -+>>>' + print'(/,a)', ' <<<+- homogenization:mechanics:isostrain init -+>>>' Ninstances = count(homogenization_type == HOMOGENIZATION_ISOSTRAIN_ID) print'(a,i2)', ' # instances: ',Ninstances; flush(IO_STDOUT) diff --git a/src/homogenization_mechanics_none.f90 b/src/homogenization_mechanics_none.f90 index 195e388f9..ebe2ea8f1 100644 --- a/src/homogenization_mechanics_none.f90 +++ b/src/homogenization_mechanics_none.f90 @@ -18,7 +18,7 @@ module subroutine mech_none_init h, & Nmaterialpoints - print'(/,a)', ' <<<+- homogenization_mech_none init -+>>>' + print'(/,a)', ' <<<+- homogenization:mechanics:none init -+>>>' Ninstances = count(homogenization_type == HOMOGENIZATION_NONE_ID) print'(a,i2)', ' # instances: ',Ninstances; flush(IO_STDOUT) diff --git a/src/homogenization_thermal.f90 b/src/homogenization_thermal.f90 index dc5182dbf..b7170e6ec 100644 --- a/src/homogenization_thermal.f90 +++ b/src/homogenization_thermal.f90 @@ -34,7 +34,9 @@ module subroutine thermal_init() integer :: ho - print'(/,a)', ' <<<+- homogenization_thermal init -+>>>' + print'(/,a)', ' <<<+- homogenization:thermal init -+>>>' + print'(/,a)', ' <<<+- homogenization:thermal:isotemperature init -+>>>' + configHomogenizations => config_material%get('homogenization') diff --git a/src/phase.f90 b/src/phase.f90 index af7f577af..dd14e0831 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -323,7 +323,7 @@ subroutine constitutive_init phases - print'(/,a)', ' <<<+- constitutive init -+>>>'; flush(IO_STDOUT) + print'(/,a)', ' <<<+- phase init -+>>>'; flush(IO_STDOUT) debug_constitutive => config_debug%get('constitutive', defaultVal=emptyList) debugConstitutive%basic = debug_constitutive%contains('basic') diff --git a/src/phase_damage.f90 b/src/phase_damage.f90 index 6c1a0b8d0..014347c1a 100644 --- a/src/phase_damage.f90 +++ b/src/phase_damage.f90 @@ -157,6 +157,9 @@ module subroutine damage_init phase, & sources + + print'(/,a)', ' <<<+- phase:damage init -+>>>' + phases => config_material%get('phase') allocate(current(phases%length)) diff --git a/src/phase_damage_anisobrittle.f90 b/src/phase_damage_anisobrittle.f90 index f78a0ec99..2ae5ca951 100644 --- a/src/phase_damage_anisobrittle.f90 +++ b/src/phase_damage_anisobrittle.f90 @@ -49,7 +49,7 @@ module function anisobrittle_init(source_length) result(mySources) integer, dimension(:), allocatable :: N_cl character(len=pStringLen) :: extmsg = '' - print'(/,a)', ' <<<+- source_damage_anisoBrittle init -+>>>' + print'(/,a)', ' <<<+- phase:damage:anisobrittle init -+>>>' mySources = source_active('damage_anisoBrittle',source_length) Ninstances = count(mySources) diff --git a/src/phase_damage_anisoductile.f90 b/src/phase_damage_anisoductile.f90 index f5e8d3795..8d5904e6b 100644 --- a/src/phase_damage_anisoductile.f90 +++ b/src/phase_damage_anisoductile.f90 @@ -44,7 +44,7 @@ module function anisoductile_init(source_length) result(mySources) integer, dimension(:), allocatable :: N_sl character(len=pStringLen) :: extmsg = '' - print'(/,a)', ' <<<+- source_damage_anisoDuctile init -+>>>' + print'(/,a)', ' <<<+- phase:damage:anisoductile init -+>>>' mySources = source_active('damage_anisoDuctile',source_length) Ninstances = count(mySources) diff --git a/src/phase_damage_isobrittle.f90 b/src/phase_damage_isobrittle.f90 index 5a01a425d..091377171 100644 --- a/src/phase_damage_isobrittle.f90 +++ b/src/phase_damage_isobrittle.f90 @@ -39,7 +39,7 @@ module function isobrittle_init(source_length) result(mySources) integer :: Ninstances,sourceOffset,Nconstituents,p character(len=pStringLen) :: extmsg = '' - print'(/,a)', ' <<<+- source_damage_isoBrittle init -+>>>' + print'(/,a)', ' <<<+- phase:damage:isobrittle init -+>>>' mySources = source_active('damage_isoBrittle',source_length) Ninstances = count(mySources) diff --git a/src/phase_damage_isoductile.f90 b/src/phase_damage_isoductile.f90 index fe5ca93ed..6f0a2d0fb 100644 --- a/src/phase_damage_isoductile.f90 +++ b/src/phase_damage_isoductile.f90 @@ -41,7 +41,7 @@ module function isoductile_init(source_length) result(mySources) integer :: Ninstances,sourceOffset,Nconstituents,p character(len=pStringLen) :: extmsg = '' - print'(/,a)', ' <<<+- source_damage_isoDuctile init -+>>>' + print'(/,a)', ' <<<+- phase:damage:isoductile init -+>>>' mySources = source_active('damage_isoDuctile',source_length) Ninstances = count(mySources) diff --git a/src/phase_mechanics.f90 b/src/phase_mechanics.f90 index 0408f91d0..a84c1a385 100644 --- a/src/phase_mechanics.f90 +++ b/src/phase_mechanics.f90 @@ -206,7 +206,7 @@ module subroutine mech_init(phases) elastic, & stiffDegradation - print'(/,a)', ' <<<+- constitutive_mech init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics init -+>>>' !------------------------------------------------------------------------------------------------- ! initialize elasticity (hooke) !ToDO: Maybe move to elastic submodule along with function homogenizedC? diff --git a/src/phase_mechanics_eigendeformation.f90 b/src/phase_mechanics_eigendeformation.f90 index d1f581d5a..45cfd82d3 100644 --- a/src/phase_mechanics_eigendeformation.f90 +++ b/src/phase_mechanics_eigendeformation.f90 @@ -68,7 +68,7 @@ module subroutine eigendeformation_init(phases) phase, & kinematics - print'(/,a)', ' <<<+- phase_mechanics_eigendeformation init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:eigendeformation init -+>>>' !-------------------------------------------------------------------------------------------------- ! initialize kinematic mechanisms diff --git a/src/phase_mechanics_eigendeformation_cleavageopening.f90 b/src/phase_mechanics_eigendeformation_cleavageopening.f90 index 185aee520..59be7837a 100644 --- a/src/phase_mechanics_eigendeformation_cleavageopening.f90 +++ b/src/phase_mechanics_eigendeformation_cleavageopening.f90 @@ -44,7 +44,7 @@ module function kinematics_cleavage_opening_init(kinematics_length) result(myKin kinematics, & kinematic_type - print'(/,a)', ' <<<+- kinematics_cleavage_opening init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:eigendeformation:cleavageopening init -+>>>' myKinematics = kinematics_active('cleavage_opening',kinematics_length) Ninstances = count(myKinematics) diff --git a/src/phase_mechanics_eigendeformation_slipplaneopening.f90 b/src/phase_mechanics_eigendeformation_slipplaneopening.f90 index 8b8b1dd29..a144d39a6 100644 --- a/src/phase_mechanics_eigendeformation_slipplaneopening.f90 +++ b/src/phase_mechanics_eigendeformation_slipplaneopening.f90 @@ -49,7 +49,7 @@ module function kinematics_slipplane_opening_init(kinematics_length) result(myKi kinematics, & kinematic_type - print'(/,a)', ' <<<+- kinematics_slipplane init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:eigendeformation:slipplaneopening init -+>>>' myKinematics = kinematics_active('slipplane_opening',kinematics_length) Ninstances = count(myKinematics) diff --git a/src/phase_mechanics_eigendeformation_thermalexpansion.f90 b/src/phase_mechanics_eigendeformation_thermalexpansion.f90 index 7a6a7daa3..6630f0eb7 100644 --- a/src/phase_mechanics_eigendeformation_thermalexpansion.f90 +++ b/src/phase_mechanics_eigendeformation_thermalexpansion.f90 @@ -36,7 +36,7 @@ module function kinematics_thermal_expansion_init(kinematics_length) result(myKi kinematics, & kinematic_type - print'(/,a)', ' <<<+- kinematics_thermal_expansion init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:eigendeformation:thermalexpansion init -+>>>' myKinematics = kinematics_active('thermal_expansion',kinematics_length) Ninstances = count(myKinematics) diff --git a/src/phase_mechanics_plastic.f90 b/src/phase_mechanics_plastic.f90 index 95bcbb650..fff1fbdcf 100644 --- a/src/phase_mechanics_plastic.f90 +++ b/src/phase_mechanics_plastic.f90 @@ -225,6 +225,9 @@ contains module subroutine plastic_init + + print'(/,a)', ' <<<+- phase:mechanics:plastic init -+>>>' + where(plastic_none_init()) phase_plasticity = PLASTICITY_NONE_ID where(plastic_isotropic_init()) phase_plasticity = PLASTICITY_ISOTROPIC_ID where(plastic_phenopowerlaw_init()) phase_plasticity = PLASTICITY_PHENOPOWERLAW_ID diff --git a/src/phase_mechanics_plastic_dislotungsten.f90 b/src/phase_mechanics_plastic_dislotungsten.f90 index ee0dfa9da..a47132c63 100644 --- a/src/phase_mechanics_plastic_dislotungsten.f90 +++ b/src/phase_mechanics_plastic_dislotungsten.f90 @@ -97,7 +97,7 @@ module function plastic_dislotungsten_init() result(myPlasticity) mech, & pl - print'(/,a)', ' <<<+- plastic_dislotungsten init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:plastic:dislotungsten init -+>>>' myPlasticity = plastic_active('dislotungsten') Ninstances = count(myPlasticity) diff --git a/src/phase_mechanics_plastic_dislotwin.f90 b/src/phase_mechanics_plastic_dislotwin.f90 index 1ad1957ec..9f7464323 100644 --- a/src/phase_mechanics_plastic_dislotwin.f90 +++ b/src/phase_mechanics_plastic_dislotwin.f90 @@ -144,7 +144,7 @@ module function plastic_dislotwin_init() result(myPlasticity) mech, & pl - print'(/,a)', ' <<<+- plastic_dislotwin init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:plastic:dislotwin init -+>>>' myPlasticity = plastic_active('dislotwin') Ninstances = count(myPlasticity) diff --git a/src/phase_mechanics_plastic_isotropic.f90 b/src/phase_mechanics_plastic_isotropic.f90 index e7b72fcd2..6789e74b4 100644 --- a/src/phase_mechanics_plastic_isotropic.f90 +++ b/src/phase_mechanics_plastic_isotropic.f90 @@ -68,7 +68,7 @@ module function plastic_isotropic_init() result(myPlasticity) mech, & pl - print'(/,a)', ' <<<+- plastic_isotropic init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:plastic:isotropic init -+>>>' myPlasticity = plastic_active('isotropic') Ninstances = count(myPlasticity) diff --git a/src/phase_mechanics_plastic_kinehardening.f90 b/src/phase_mechanics_plastic_kinehardening.f90 index 034e5fd32..919302bc1 100644 --- a/src/phase_mechanics_plastic_kinehardening.f90 +++ b/src/phase_mechanics_plastic_kinehardening.f90 @@ -80,7 +80,7 @@ module function plastic_kinehardening_init() result(myPlasticity) mech, & pl - print'(/,a)', ' <<<+- plastic_kinehardening init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:plastic:kinehardening init -+>>>' myPlasticity = plastic_active('kinehardening') Ninstances = count(myPlasticity) diff --git a/src/phase_mechanics_plastic_none.f90 b/src/phase_mechanics_plastic_none.f90 index 5c79c1b1e..b8d1678eb 100644 --- a/src/phase_mechanics_plastic_none.f90 +++ b/src/phase_mechanics_plastic_none.f90 @@ -25,7 +25,7 @@ module function plastic_none_init() result(myPlasticity) mech, & pl - print'(/,a)', ' <<<+- plastic_none init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:plastic:none init -+>>>' phases => config_material%get('phase') allocate(myPlasticity(phases%length), source = .false.) diff --git a/src/phase_mechanics_plastic_nonlocal.f90 b/src/phase_mechanics_plastic_nonlocal.f90 index 2f566c515..693ffcf93 100644 --- a/src/phase_mechanics_plastic_nonlocal.f90 +++ b/src/phase_mechanics_plastic_nonlocal.f90 @@ -187,7 +187,7 @@ module function plastic_nonlocal_init() result(myPlasticity) mech, & pl - print'(/,a)', ' <<<+- plastic_nonlocal init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:plastic:nonlocal init -+>>>' myPlasticity = plastic_active('nonlocal') Ninstances = count(myPlasticity) diff --git a/src/phase_mechanics_plastic_phenopowerlaw.f90 b/src/phase_mechanics_plastic_phenopowerlaw.f90 index 1d91a97fb..ea2f53100 100644 --- a/src/phase_mechanics_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanics_plastic_phenopowerlaw.f90 @@ -89,7 +89,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) mech, & pl - print'(/,a)', ' <<<+- plastic_phenopowerlaw init -+>>>' + print'(/,a)', ' <<<+- phase:mechanics:plastic:phenopowerlaw init -+>>>' myPlasticity = plastic_active('phenopowerlaw') Ninstances = count(myPlasticity) diff --git a/src/phase_thermal.f90 b/src/phase_thermal.f90 index 04c35a311..d5d52b010 100644 --- a/src/phase_thermal.f90 +++ b/src/phase_thermal.f90 @@ -77,7 +77,7 @@ module subroutine thermal_init(phases) Nconstituents - print'(/,a)', ' <<<+- constitutive_thermal init -+>>>' + print'(/,a)', ' <<<+- phase:thermal init -+>>>' allocate(current(phases%length)) diff --git a/src/phase_thermal_dissipation.f90 b/src/phase_thermal_dissipation.f90 index 2ac444f4a..7a043308d 100644 --- a/src/phase_thermal_dissipation.f90 +++ b/src/phase_thermal_dissipation.f90 @@ -33,7 +33,7 @@ module function dissipation_init(source_length) result(mySources) src integer :: Ninstances,so,Nconstituents,ph - print'(/,a)', ' <<<+- thermal_dissipation init -+>>>' + print'(/,a)', ' <<<+- phase:thermal:dissipation init -+>>>' mySources = thermal_active('dissipation',source_length) diff --git a/src/phase_thermal_externalheat.f90 b/src/phase_thermal_externalheat.f90 index 60a4c3964..ddae6763b 100644 --- a/src/phase_thermal_externalheat.f90 +++ b/src/phase_thermal_externalheat.f90 @@ -40,7 +40,7 @@ module function externalheat_init(source_length) result(mySources) src integer :: Ninstances,so,Nconstituents,ph - print'(/,a)', ' <<<+- thermal_externalheat init -+>>>' + print'(/,a)', ' <<<+- phase:thermal:externalheat init -+>>>' mySources = thermal_active('externalheat',source_length)