From b410a089956c96fc111ee5eb1f768b14c3f23770 Mon Sep 17 00:00:00 2001 From: Su Leen Wong Date: Mon, 8 Jun 2015 14:26:50 +0000 Subject: [PATCH] Renamed some variables for consistency --- code/lattice.f90 | 12 ++++++------ code/plastic_dislotwin.f90 | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/lattice.f90 b/code/lattice.f90 index c0065f049..5552076b8 100644 --- a/code/lattice.f90 +++ b/code/lattice.f90 @@ -64,7 +64,7 @@ module lattice lattice_tt real(pReal), allocatable, dimension(:,:,:), protected, public :: & - lattice_NItrans_v, & !< Eigendeformation tensor in vector form + lattice_Strans_v, & !< Eigendeformation tensor in vector form lattice_projectionTrans !< Matrix for projection of slip to fault-band (twin) systems for strain-induced martensite nucleation real(pReal), allocatable, dimension(:,:,:,:), protected, public :: & @@ -72,7 +72,7 @@ module lattice lattice_Utrans, & !< Bain deformation lattice_Btrans, & !< Rotation of fcc to Bain coordinate system lattice_Qtrans, & !< Total rotation: Q = R*B - lattice_NItrans !< Eigendeformation tensor for phase transformation + lattice_Strans !< Eigendeformation tensor for phase transformation real(pReal), allocatable, dimension(:,:), protected, public :: & lattice_shearTwin !< characteristic twin shear @@ -1148,8 +1148,8 @@ subroutine lattice_init allocate(lattice_Utrans(3,3,lattice_maxNtrans,Nphases),source=0.0_pReal) allocate(lattice_Btrans(3,3,lattice_maxNtrans,Nphases),source=0.0_pReal) allocate(lattice_Qtrans(3,3,lattice_maxNtrans,Nphases),source=0.0_pReal) - allocate(lattice_NItrans(3,3,lattice_maxNtrans,Nphases),source=0.0_pReal) - allocate(lattice_NItrans_v(6,lattice_maxNtrans,Nphases),source=0.0_pReal) + allocate(lattice_Strans(3,3,lattice_maxNtrans,Nphases),source=0.0_pReal) + allocate(lattice_Strans_v(6,lattice_maxNtrans,Nphases),source=0.0_pReal) allocate(lattice_projectionTrans(lattice_maxNtrans,lattice_maxNtrans,Nphases),source=0.0_pReal) allocate(lattice_NslipSystem(lattice_maxNslipFamily,Nphases),source=0_pInt) @@ -1622,9 +1622,9 @@ subroutine lattice_initializeStructure(myPhase,CoverA,a_fcc,a_bcc) lattice_Btrans(1:3,1:3,i,myPhase) = math_axisAngleToR(rb(1:3,i),ab(i)*INRAD) lattice_Qtrans(1:3,1:3,i,myPhase) = math_mul33x33(lattice_Rtrans(1:3,1:3,i,myPhase), & lattice_Btrans(1:3,1:3,i,myPhase)) - lattice_NItrans(1:3,1:3,i,myPhase) = math_mul33x33(lattice_Rtrans(1:3,1:3,i,myPhase), & + lattice_Strans(1:3,1:3,i,myPhase) = math_mul33x33(lattice_Rtrans(1:3,1:3,i,myPhase), & lattice_Utrans(1:3,1:3,i,myPhase)) - math_identity2nd(3) - lattice_NItrans_v(1:6,i,myPhase) = math_Mandel33to6(math_symmetric33(lattice_NItrans(1:3,1:3,i,myPhase))) + lattice_Strans_v(1:6,i,myPhase) = math_Mandel33to6(math_symmetric33(lattice_Strans(1:3,1:3,i,myPhase))) enddo do i = 1_pInt,myNcleavage ! store slip system vectors and Schmid matrix for my structure lattice_Scleavage(1:3,1:3,1,i,myPhase) = math_tensorproduct(cd(1:3,i),cn(1:3,i)) diff --git a/code/plastic_dislotwin.f90 b/code/plastic_dislotwin.f90 index bd2135f23..e47c2fcc4 100644 --- a/code/plastic_dislotwin.f90 +++ b/code/plastic_dislotwin.f90 @@ -1381,8 +1381,8 @@ subroutine plastic_dislotwin_LpAndItsTangent(Lp,dLp_dTstar99,Tstar_v,Temperature lattice_Sslip_v, & lattice_Stwin, & lattice_Stwin_v, & - lattice_NItrans, & - lattice_NItrans_v, & + lattice_Strans, & + lattice_Strans_v, & lattice_maxNslipFamily,& lattice_maxNtwinFamily, & lattice_maxNtransFamily, & @@ -1626,7 +1626,7 @@ subroutine plastic_dislotwin_LpAndItsTangent(Lp,dLp_dTstar99,Tstar_v,Temperature j = j+1_pInt !* Resolved shear stress on transformation system - tau_trans(j) = dot_product(Tstar_v,lattice_NItrans_v(:,index_myFamily+i,ph)) + tau_trans(j) = dot_product(Tstar_v,lattice_Strans_v(:,index_myFamily+i,ph)) !* Total martensite volume fraction for transformation system V_trans(j) = plasticState(ph)%state(3*ns+2*nt+j, of) + plasticState(ph)%state(3*ns+2*nt+nr+j, of) @@ -1643,14 +1643,14 @@ subroutine plastic_dislotwin_LpAndItsTangent(Lp,dLp_dTstar99,Tstar_v,Temperature endif !* Plastic velocity gradient for phase transformation - Lp = Lp + Vdot_trans(j)*lattice_NItrans(:,:,index_myFamily+i,ph) + Lp = Lp + Vdot_trans(j)*lattice_Strans(:,:,index_myFamily+i,ph) !* Calculation of the tangent of Lp forall (k=1_pInt:3_pInt,l=1_pInt:3_pInt,m=1_pInt:3_pInt,n=1_pInt:3_pInt) & dLp_dTstar3333(k,l,m,n) = & dLp_dTstar3333(k,l,m,n) + dVdot_dtautrans(j)*& - lattice_NItrans(k,l,index_myFamily+i,ph)*& - lattice_NItrans(m,n,index_myFamily+i,ph) + lattice_Strans(k,l,index_myFamily+i,ph)*& + lattice_Strans(m,n,index_myFamily+i,ph) enddo transSystemsLoop enddo transFamiliesLoop @@ -1676,7 +1676,7 @@ subroutine plastic_dislotwin_dotState(Tstar_v,Temperature,ipc,ip,el) use lattice, only: & lattice_Sslip_v, & lattice_Stwin_v, & - lattice_NItrans_v, & + lattice_Strans_v, & lattice_maxNslipFamily, & lattice_maxNtwinFamily, & lattice_maxNtransFamily, & @@ -1879,7 +1879,7 @@ subroutine plastic_dislotwin_dotState(Tstar_v,Temperature,ipc,ip,el) j = j+1_pInt !* Resolved shear stress on transformation system - tau_trans(j) = dot_product(Tstar_v,lattice_NItrans_v(:,index_myFamily+i,ph)) + tau_trans(j) = dot_product(Tstar_v,lattice_Strans_v(:,index_myFamily+i,ph)) !* Total martensite volume fraction for transformation system V_trans(j) = plasticState(ph)%state(3*ns+2*nt+j, of) + plasticState(ph)%state(3*ns+2*nt+nr+j, of)