From 1f625e141e14cf2f60c977b798b6498e91883cfc Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 26 Jan 2021 11:41:19 +0100 Subject: [PATCH] hierarchical naming --- src/homogenization_mechanics.f90 | 4 ++-- src/homogenization_mechanics_RGC.f90 | 4 ++-- src/homogenization_mechanics_isostrain.f90 | 4 ++-- src/homogenization_mechanics_none.f90 | 4 ++-- src/phase_mechanics.f90 | 8 ++++---- src/phase_mechanics_plastic.f90 | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/homogenization_mechanics.f90 b/src/homogenization_mechanics.f90 index dd3e47c59..3d889e298 100644 --- a/src/homogenization_mechanics.f90 +++ b/src/homogenization_mechanics.f90 @@ -2,7 +2,7 @@ !> @author Martin Diehl, KU Leuven !> @brief Partition F and homogenize P/dPdF !-------------------------------------------------------------------------------------------------- -submodule(homogenization) homogenization_mech +submodule(homogenization) mechanics interface @@ -253,4 +253,4 @@ module subroutine mech_results(group_base,h) end subroutine mech_results -end submodule homogenization_mech +end submodule mechanics diff --git a/src/homogenization_mechanics_RGC.f90 b/src/homogenization_mechanics_RGC.f90 index 2c7a5a8cb..6f76fe788 100644 --- a/src/homogenization_mechanics_RGC.f90 +++ b/src/homogenization_mechanics_RGC.f90 @@ -6,7 +6,7 @@ !> @brief Relaxed grain cluster (RGC) homogenization scheme !> N_constituents is defined as p x q x r (cluster) !-------------------------------------------------------------------------------------------------- -submodule(homogenization:homogenization_mech) homogenization_mech_RGC +submodule(homogenization:mechanics) RGC use rotations use lattice @@ -947,4 +947,4 @@ pure function interface1to4(iFace1D, nGDim) end function interface1to4 -end submodule homogenization_mech_RGC +end submodule RGC diff --git a/src/homogenization_mechanics_isostrain.f90 b/src/homogenization_mechanics_isostrain.f90 index df8f5fc9d..699000cc8 100644 --- a/src/homogenization_mechanics_isostrain.f90 +++ b/src/homogenization_mechanics_isostrain.f90 @@ -4,7 +4,7 @@ !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH !> @brief Isostrain (full constraint Taylor assuption) homogenization scheme !-------------------------------------------------------------------------------------------------- -submodule(homogenization:homogenization_mech) homogenization_mech_isostrain +submodule(homogenization:mechanics) isostrain enum, bind(c); enumerator :: & parallel_ID, & @@ -114,4 +114,4 @@ module subroutine mech_isostrain_averageStressAndItsTangent(avgP,dAvgPdAvgF,P,dP end subroutine mech_isostrain_averageStressAndItsTangent -end submodule homogenization_mech_isostrain +end submodule isostrain diff --git a/src/homogenization_mechanics_none.f90 b/src/homogenization_mechanics_none.f90 index 767dbf557..195e388f9 100644 --- a/src/homogenization_mechanics_none.f90 +++ b/src/homogenization_mechanics_none.f90 @@ -4,7 +4,7 @@ !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH !> @brief dummy homogenization homogenization scheme for 1 constituent per material point !-------------------------------------------------------------------------------------------------- -submodule(homogenization:homogenization_mech) homogenization_mech_none +submodule(homogenization:mechanics) none contains @@ -38,4 +38,4 @@ module subroutine mech_none_init end subroutine mech_none_init -end submodule homogenization_mech_none +end submodule none diff --git a/src/phase_mechanics.f90 b/src/phase_mechanics.f90 index edf2fb4ad..c880b5e17 100644 --- a/src/phase_mechanics.f90 +++ b/src/phase_mechanics.f90 @@ -181,7 +181,7 @@ submodule(constitutive) constitutive_mech el end subroutine plastic_nonlocal_deltaState - module subroutine constitutive_plastic_LpAndItsTangents(Lp, dLp_dS, dLp_dFi, & + module subroutine plastic_LpAndItsTangents(Lp, dLp_dS, dLp_dFi, & S, Fi, co, ip, el) integer, intent(in) :: & co, & !< component-ID of integration point @@ -196,7 +196,7 @@ submodule(constitutive) constitutive_mech dLp_dS, & dLp_dFi !< derivative of Lp with respect to Fi - end subroutine constitutive_plastic_LpAndItsTangents + end subroutine plastic_LpAndItsTangents module function kinematics_cleavage_opening_init(kinematics_length) result(myKinematics) integer, intent(in) :: kinematics_length @@ -806,7 +806,7 @@ function integrateStress(F,subFp0,subFi0,Delta_t,co,ip,el) result(broken) call constitutive_hooke_SandItsTangents(S, dS_dFe, dS_dFi, & Fe, Fi_new, co, ip, el) - call constitutive_plastic_LpAndItsTangents(Lp_constitutive, dLp_dS, dLp_dFi, & + call plastic_LpAndItsTangents(Lp_constitutive, dLp_dS, dLp_dFi, & S, Fi_new, co, ip, el) !* update current residuum and check for convergence of loop @@ -1599,7 +1599,7 @@ module function constitutive_mech_dPdF(dt,co,ip,el) result(dPdF) dLidS = math_mul3333xx3333(dLidFi,dFidS) + dLidS endif - call constitutive_plastic_LpAndItsTangents(devNull,dLpdS,dLpdFi, & + call plastic_LpAndItsTangents(devNull,dLpdS,dLpdFi, & constitutive_mech_S(ph)%data(1:3,1:3,me), & constitutive_mech_Fi(ph)%data(1:3,1:3,me),co,ip,el) dLpdS = math_mul3333xx3333(dLpdFi,dFidS) + dLpdS diff --git a/src/phase_mechanics_plastic.f90 b/src/phase_mechanics_plastic.f90 index ea04a18fd..542a79fcb 100644 --- a/src/phase_mechanics_plastic.f90 +++ b/src/phase_mechanics_plastic.f90 @@ -95,7 +95,7 @@ contains ! ToDo: Discuss whether it makes sense if crystallite handles the configuration conversion, i.e. ! Mp in, dLp_dMp out !-------------------------------------------------------------------------------------------------- -module subroutine constitutive_plastic_LpAndItsTangents(Lp, dLp_dS, dLp_dFi, & +module subroutine plastic_LpAndItsTangents(Lp, dLp_dS, dLp_dFi, & S, Fi, co, ip, el) integer, intent(in) :: & co, & !< component-ID of integration point @@ -155,6 +155,6 @@ module subroutine constitutive_plastic_LpAndItsTangents(Lp, dLp_dS, dLp_dFi, & dLp_dS(i,j,1:3,1:3) = matmul(matmul(transpose(Fi),Fi),dLp_dMp(i,j,1:3,1:3)) ! ToDo: @PS: why not: dLp_dMp:(FiT Fi) enddo; enddo -end subroutine constitutive_plastic_LpAndItsTangents +end subroutine plastic_LpAndItsTangents end submodule plastic