From 75d8cacfbc2b9b26e1905cd104e7126ec46d7bf2 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 13 Oct 2014 12:31:04 +0000 Subject: [PATCH] removed old state pointer (p_vec) --- code/constitutive_dislokmc.f90 | 7 ------- code/constitutive_dislotwin.f90 | 7 ------- code/constitutive_nonlocal.f90 | 3 +-- code/constitutive_phenopowerlaw.f90 | 6 +----- code/constitutive_titanmod.f90 | 8 -------- code/prec.f90 | 4 ---- 6 files changed, 2 insertions(+), 33 deletions(-) diff --git a/code/constitutive_dislokmc.f90 b/code/constitutive_dislokmc.f90 index e5fd19048..9f0829c77 100644 --- a/code/constitutive_dislokmc.f90 +++ b/code/constitutive_dislokmc.f90 @@ -997,8 +997,6 @@ end subroutine constitutive_dislokmc_aTolState !> @brief returns the homogenized elasticity matrix !-------------------------------------------------------------------------------------------------- function constitutive_dislokmc_homogenizedC(ipc,ip,el) - use prec, only: & - p_vec use mesh, only: & mesh_NcpElems, & mesh_maxNips @@ -1046,8 +1044,6 @@ function constitutive_dislokmc_homogenizedC(ipc,ip,el) !> @brief calculates derived quantities from state !-------------------------------------------------------------------------------------------------- subroutine constitutive_dislokmc_microstructure(temperature,ipc,ip,el) - use prec, only: & - p_vec use math, only: & pi use mesh, only: & @@ -1193,7 +1189,6 @@ end subroutine constitutive_dislokmc_microstructure !-------------------------------------------------------------------------------------------------- subroutine constitutive_dislokmc_LpAndItsTangent(Lp,dLp_dTstar,Tstar_v,Temperature,ipc,ip,el) use prec, only: & - p_vec, & tol_math_check use math, only: & math_Plain3333to99, & @@ -1473,7 +1468,6 @@ end subroutine constitutive_dislokmc_LpAndItsTangent !-------------------------------------------------------------------------------------------------- subroutine constitutive_dislokmc_dotState(Tstar_v,Temperature,ipc,ip,el) use prec, only: & - p_vec, & tol_math_check use math, only: & pi @@ -1772,7 +1766,6 @@ end subroutine constitutive_dislokmc_getSlipRate !-------------------------------------------------------------------------------------------------- function constitutive_dislokmc_postResults(Tstar_v,Temperature,ipc,ip,el) use prec, only: & - p_vec, & tol_math_check use math, only: & pi, & diff --git a/code/constitutive_dislotwin.f90 b/code/constitutive_dislotwin.f90 index df5bdbd7b..daa1d316e 100644 --- a/code/constitutive_dislotwin.f90 +++ b/code/constitutive_dislotwin.f90 @@ -1101,8 +1101,6 @@ end subroutine constitutive_dislotwin_aTolState !> @brief returns the homogenized elasticity matrix !-------------------------------------------------------------------------------------------------- function constitutive_dislotwin_homogenizedC(ipc,ip,el) - use prec, only: & - p_vec use mesh, only: & mesh_NcpElems, & mesh_maxNips @@ -1161,8 +1159,6 @@ function constitutive_dislotwin_homogenizedC(ipc,ip,el) !> @brief calculates derived quantities from state !-------------------------------------------------------------------------------------------------- subroutine constitutive_dislotwin_microstructure(temperature,ipc,ip,el) - use prec, only: & - p_vec use math, only: & pi use mesh, only: & @@ -1321,7 +1317,6 @@ end subroutine constitutive_dislotwin_microstructure !-------------------------------------------------------------------------------------------------- subroutine constitutive_dislotwin_LpAndItsTangent(Lp,dLp_dTstar,Tstar_v,Temperature,ipc,ip,el) use prec, only: & - p_vec, & tol_math_check use math, only: & math_Plain3333to99, & @@ -1628,7 +1623,6 @@ end subroutine constitutive_dislotwin_LpAndItsTangent !-------------------------------------------------------------------------------------------------- subroutine constitutive_dislotwin_dotState(Tstar_v,Temperature,ipc,ip,el) use prec, only: & - p_vec, & tol_math_check use math, only: & pi @@ -1994,7 +1988,6 @@ end subroutine constitutive_dislotwin_getSlipRate !-------------------------------------------------------------------------------------------------- function constitutive_dislotwin_postResults(Tstar_v,Temperature,ipc,ip,el) use prec, only: & - p_vec, & tol_math_check use math, only: & pi, & diff --git a/code/constitutive_nonlocal.f90 b/code/constitutive_nonlocal.f90 index f753f0ae4..ca0cf1cca 100644 --- a/code/constitutive_nonlocal.f90 +++ b/code/constitutive_nonlocal.f90 @@ -9,8 +9,7 @@ module constitutive_nonlocal use prec, only: & pReal, & - pInt, & - p_vec + pInt implicit none private diff --git a/code/constitutive_phenopowerlaw.f90 b/code/constitutive_phenopowerlaw.f90 index 5786859d0..27e9feb49 100644 --- a/code/constitutive_phenopowerlaw.f90 +++ b/code/constitutive_phenopowerlaw.f90 @@ -670,8 +670,6 @@ end subroutine constitutive_phenopowerlaw_aTolState !> @brief calculates plastic velocity gradient and its tangent !-------------------------------------------------------------------------------------------------- subroutine constitutive_phenopowerlaw_LpAndItsTangent(Lp,dLp_dTstar99,Tstar_v,ipc,ip,el) - use prec, only: & - p_vec use math, only: & math_Plain3333to99, & math_Mandel6to33 @@ -1051,7 +1049,7 @@ subroutine constitutive_phenopowerlaw_getSlipRate(nSlip,slipRate,ipc, ip, el) plasticState, & phase_plasticityInstance - implicit none + implicit none real(pReal), dimension(:), allocatable :: & slipRate @@ -1092,8 +1090,6 @@ end subroutine constitutive_phenopowerlaw_getSlipRate !> @brief return array of constitutive results !-------------------------------------------------------------------------------------------------- function constitutive_phenopowerlaw_postResults(Tstar_v,ipc,ip,el) - use prec, only: & - p_vec use mesh, only: & mesh_NcpElems, & mesh_maxNips diff --git a/code/constitutive_titanmod.f90 b/code/constitutive_titanmod.f90 index 755da582c..d0dacccf6 100644 --- a/code/constitutive_titanmod.f90 +++ b/code/constitutive_titanmod.f90 @@ -1161,8 +1161,6 @@ end subroutine constitutive_titanmod_stateInit !> @brief returns the homogenized elasticity matrix !-------------------------------------------------------------------------------------------------- function constitutive_titanmod_homogenizedC(ipc,ip,el) - use prec, only: & - p_vec use mesh, only: & mesh_NcpElems, & mesh_maxNips @@ -1329,8 +1327,6 @@ end subroutine constitutive_titanmod_microstructure !> @brief calculates plastic velocity gradient and its tangent !-------------------------------------------------------------------------------------------------- subroutine constitutive_titanmod_LpAndItsTangent(Lp,dLp_dTstar99,Tstar_v,temperature,ipc,ip,el) - use prec, only: & - p_vec use math, only: & math_Plain3333to99, & math_Mandel6to33 @@ -1654,8 +1650,6 @@ end subroutine constitutive_titanmod_LpAndItsTangent !> @brief calculates the rate of change of microstructure !-------------------------------------------------------------------------------------------------- subroutine constitutive_titanmod_dotState(Tstar_v,temperature,ipc,ip,el) - use prec, only: & - p_vec use lattice, only: & lattice_Stwin_v, & lattice_maxNslipFamily, & @@ -1873,8 +1867,6 @@ end subroutine constitutive_titanmod_getSlipRate !> @brief return array of constitutive results !-------------------------------------------------------------------------------------------------- function constitutive_titanmod_postResults(ipc,ip,el) - use prec, only: & - p_vec use mesh, only: & mesh_NcpElems, & mesh_maxNips diff --git a/code/prec.f90 b/code/prec.f90 index 052a7e765..9f571c9e3 100644 --- a/code/prec.f90 +++ b/code/prec.f90 @@ -49,10 +49,6 @@ module prec integer, parameter, public :: pLongInt = 8 !< integer representation 64 bit (was selected_int_kind(12), number with at least up to +- 1e12) real(pReal), parameter, public :: tol_math_check = 1.0e-8_pReal !< tolerance for internal math self-checks (rotation) - type, public :: p_vec !< variable length datatype used for storage of state - real(pReal), dimension(:), allocatable :: p - end type p_vec - type, public :: p_intvec integer(pInt), dimension(:), allocatable :: p end type p_intvec