From 2497a5fb4af9879a19dbc2b70d8f2a7a46b94e84 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 26 Jan 2021 20:43:30 +0100 Subject: [PATCH] systematic naming --- src/commercialFEM_fileList.f90 | 2 ++ src/phase_mechanics.f90 | 4 ++-- src/phase_mechanics_eigendeformation.f90 | 2 ++ src/phase_mechanics_eigendeformation_cleavageopening.f90 | 4 ++-- src/phase_mechanics_eigendeformation_slipplaneopening.f90 | 4 ++-- src/phase_mechanics_plastic.f90 | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 src/phase_mechanics_eigendeformation.f90 diff --git a/src/commercialFEM_fileList.f90 b/src/commercialFEM_fileList.f90 index 3e11923ed..311129d61 100644 --- a/src/commercialFEM_fileList.f90 +++ b/src/commercialFEM_fileList.f90 @@ -21,6 +21,7 @@ #include "lattice.f90" #include "phase.f90" #include "phase_mechanics.f90" +#include "phase_mechanics_plastic.f90" #include "phase_mechanics_plastic_none.f90" #include "phase_mechanics_plastic_isotropic.f90" #include "phase_mechanics_plastic_phenopowerlaw.f90" @@ -28,6 +29,7 @@ #include "phase_mechanics_plastic_dislotwin.f90" #include "phase_mechanics_plastic_dislotungsten.f90" #include "phase_mechanics_plastic_nonlocal.f90" +#include "phase_mechanics_eigendeformation.f90" #include "phase_mechanics_eigendeformation_cleavageopening.f90" #include "phase_mechanics_eigendeformation_slipplaneopening.f90" #include "phase_thermal.f90" diff --git a/src/phase_mechanics.f90 b/src/phase_mechanics.f90 index e37712e40..1d9248dd6 100644 --- a/src/phase_mechanics.f90 +++ b/src/phase_mechanics.f90 @@ -1,7 +1,7 @@ !---------------------------------------------------------------------------------------------------- !> @brief internal microstructure state for all plasticity constitutive models !---------------------------------------------------------------------------------------------------- -submodule(constitutive) constitutive_mech +submodule(constitutive) mechanics enum, bind(c); enumerator :: & ELASTICITY_UNDEFINED_ID, & @@ -1637,5 +1637,5 @@ subroutine constitutive_LiAndItsTangents(Li, dLi_dS, dLi_dFi, & end subroutine constitutive_LiAndItsTangents -end submodule constitutive_mech +end submodule mechanics diff --git a/src/phase_mechanics_eigendeformation.f90 b/src/phase_mechanics_eigendeformation.f90 new file mode 100644 index 000000000..ddae8ec06 --- /dev/null +++ b/src/phase_mechanics_eigendeformation.f90 @@ -0,0 +1,2 @@ +submodule(constitutive:mechanics) eigendeformation +end submodule eigendeformation diff --git a/src/phase_mechanics_eigendeformation_cleavageopening.f90 b/src/phase_mechanics_eigendeformation_cleavageopening.f90 index 01fbf0cb9..b0ea2be87 100644 --- a/src/phase_mechanics_eigendeformation_cleavageopening.f90 +++ b/src/phase_mechanics_eigendeformation_cleavageopening.f90 @@ -4,7 +4,7 @@ !> @brief material subroutine incorporating kinematics resulting from opening of cleavage planes !> @details to be done !-------------------------------------------------------------------------------------------------- -submodule(constitutive:constitutive_mech) kinematics_cleavage_opening +submodule(constitutive:eigendeformation) cleavageopening integer, dimension(:), allocatable :: kinematics_cleavage_opening_instance @@ -162,4 +162,4 @@ module subroutine kinematics_cleavage_opening_LiAndItsTangent(Ld, dLd_dTstar, S, end subroutine kinematics_cleavage_opening_LiAndItsTangent -end submodule kinematics_cleavage_opening +end submodule cleavageopening diff --git a/src/phase_mechanics_eigendeformation_slipplaneopening.f90 b/src/phase_mechanics_eigendeformation_slipplaneopening.f90 index c15608dea..1cab5e731 100644 --- a/src/phase_mechanics_eigendeformation_slipplaneopening.f90 +++ b/src/phase_mechanics_eigendeformation_slipplaneopening.f90 @@ -4,7 +4,7 @@ !> @brief material subroutine incorporating kinematics resulting from opening of slip planes !> @details to be done !-------------------------------------------------------------------------------------------------- -submodule(constitutive:constitutive_mech) kinematics_slipplane_opening +submodule(constitutive:eigendeformation) slipplaneopening integer, dimension(:), allocatable :: kinematics_slipplane_opening_instance @@ -193,4 +193,4 @@ module subroutine kinematics_slipplane_opening_LiAndItsTangent(Ld, dLd_dTstar, S end subroutine kinematics_slipplane_opening_LiAndItsTangent -end submodule kinematics_slipplane_opening +end submodule slipplaneopening diff --git a/src/phase_mechanics_plastic.f90 b/src/phase_mechanics_plastic.f90 index a8ebe9ea2..271c73391 100644 --- a/src/phase_mechanics_plastic.f90 +++ b/src/phase_mechanics_plastic.f90 @@ -1,4 +1,4 @@ -submodule(constitutive:constitutive_mech) plastic +submodule(constitutive:mechanics) plastic interface