From 05aa38cc718d4dc8b462e651975f21fb6dde9471 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 1 Dec 2019 15:05:49 +0100 Subject: [PATCH] using short names --- src/math.f90 | 4 ++++ src/plastic_nonlocal.f90 | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/math.f90 b/src/math.f90 index 5a3a5f467..7eba379d2 100644 --- a/src/math.f90 +++ b/src/math.f90 @@ -840,6 +840,7 @@ end function math_Voigt66to3333 !-------------------------------------------------------------------------------------------------- !> @brief action of a quaternion on a vector (rotate vector v with Q) +!> @details deprecated !-------------------------------------------------------------------------------------------------- pure function math_qRot(Q,v) @@ -1329,6 +1330,7 @@ end function math_areaTriangle !-------------------------------------------------------------------------------------------------- !> @brief rotate 33 tensor forward +!> @details deprecated !-------------------------------------------------------------------------------------------------- pure function math_rotate_forward33(tensor,R) @@ -1342,6 +1344,7 @@ end function math_rotate_forward33 !-------------------------------------------------------------------------------------------------- !> @brief rotate 33 tensor backward +!> @details deprecated !-------------------------------------------------------------------------------------------------- pure function math_rotate_backward33(tensor,R) @@ -1355,6 +1358,7 @@ end function math_rotate_backward33 !-------------------------------------------------------------------------------------------------- !> @brief rotate 3333 tensor C'_ijkl=g_im*g_jn*g_ko*g_lp*C_mnop +!> @details deprecated !-------------------------------------------------------------------------------------------------- pure function math_rotate_forward3333(tensor,R) diff --git a/src/plastic_nonlocal.f90 b/src/plastic_nonlocal.f90 index 63ade72db..0f0e3aa3a 100644 --- a/src/plastic_nonlocal.f90 +++ b/src/plastic_nonlocal.f90 @@ -453,31 +453,31 @@ subroutine plastic_nonlocal_init do i=1, size(outputs) outputID = undefined_ID select case(trim(outputs(i))) - case ('rho_sgl_edge_pos_mobile') + case ('rho_sgl_edge_pos_mob') outputID = merge(rho_sgl_mob_edg_pos_ID,undefined_ID,prm%totalNslip>0) - case ('rho_sgl_edge_neg_mobile') + case ('rho_sgl_edge_neg_mob') outputID = merge(rho_sgl_mob_edg_neg_ID,undefined_ID,prm%totalNslip>0) - case ('rho_sgl_screw_pos_mobile') + case ('rho_sgl_screw_pos_mob') outputID = merge(rho_sgl_mob_scr_pos_ID,undefined_ID,prm%totalNslip>0) - case ('rho_sgl_screw_neg_mobile') + case ('rho_sgl_screw_neg_mob') outputID = merge(rho_sgl_mob_scr_neg_ID,undefined_ID,prm%totalNslip>0) - case ('rho_sgl_edge_pos_immobile') + case ('rho_sgl_edge_pos_imm') outputID = merge(rho_sgl_imm_edg_pos_ID,undefined_ID,prm%totalNslip>0) - case ('rho_sgl_edge_neg_immobile') + case ('rho_sgl_edge_neg_imm') outputID = merge(rho_sgl_imm_edg_neg_ID,undefined_ID,prm%totalNslip>0) - case ('rho_sgl_screw_pos_immobile') + case ('rho_sgl_screw_pos_imm') outputID = merge(rho_sgl_imm_scr_pos_ID,undefined_ID,prm%totalNslip>0) - case ('rho_sgl_screw_neg_immobile') + case ('rho_sgl_screw_neg_imm') outputID = merge(rho_sgl_imm_scr_neg_ID,undefined_ID,prm%totalNslip>0) - case ('rho_dip_edge') + case ('rho_dip_edg') outputID = merge(rho_dip_edg_ID,undefined_ID,prm%totalNslip>0) - case ('rho_dip_screw') + case ('rho_dip_scr') outputID = merge(rho_dip_scr_ID,undefined_ID,prm%totalNslip>0) case ('rho_forest') outputID = merge(rho_forest_ID,undefined_ID,prm%totalNslip>0) case ('resolvedstress_back') outputID = merge(resolvedstress_back_ID,undefined_ID,prm%totalNslip>0) - case ('resistance') + case ('tau_pass') outputID = merge(tau_pass_ID,undefined_ID,prm%totalNslip>0) case ('rho_dot_sgl') outputID = merge(rho_dot_sgl_ID,undefined_ID,prm%totalNslip>0) @@ -485,15 +485,15 @@ subroutine plastic_nonlocal_init outputID = merge(rho_dot_sgl_mobile_ID,undefined_ID,prm%totalNslip>0) case ('rho_dot_dip') outputID = merge(rho_dot_dip_ID,undefined_ID,prm%totalNslip>0) - case ('velocity_edge_pos') + case ('v_edg_pos') outputID = merge(v_edg_pos_ID,undefined_ID,prm%totalNslip>0) - case ('velocity_edge_neg') + case ('v_edg_neg') outputID = merge(v_edg_neg_ID,undefined_ID,prm%totalNslip>0) - case ('velocity_screw_pos') + case ('v_scr_pos') outputID = merge(v_scr_pos_ID,undefined_ID,prm%totalNslip>0) - case ('velocity_screw_neg') + case ('v_scr_neg') outputID = merge(v_scr_neg_ID,undefined_ID,prm%totalNslip>0) - case ('accumulatedshear','accumulated_shear') + case ('gamma') outputID = merge(gamma_ID,undefined_ID,prm%totalNslip>0) end select