diff --git a/code/lattice.f90 b/code/lattice.f90 index b056bbef8..c24dbf2ed 100644 --- a/code/lattice.f90 +++ b/code/lattice.f90 @@ -848,24 +848,24 @@ module lattice !-------------------------------------------------------------------------------------------------- ! bct integer(pInt), dimension(LATTICE_maxNslipFamily), parameter, public :: & - LATTICE_bct_NslipSystem = int([2, 2, 2, 4, 2, 4, 2, 2, 4, 8, 4, 8, 8 ],pInt) !< # of slip systems per family for bct (Sn) Bieler J. Electr Mater 2009 + LATTICE_bct_NslipSystem = int([2, 2, 2, 4, 2, 4, 2, 2, 4, 8, 4, 8, 8 ],pInt) !< # of slip systems per family for bct (Sn) Bieler J. Electr Mater 2009 integer(pInt), dimension(LATTICE_maxNtwinFamily), parameter, public :: & - LATTICE_bct_NtwinSystem = int([0, 0, 0, 0], pInt) !< total # of twin systems per family for bct-example + LATTICE_bct_NtwinSystem = int([0, 0, 0, 0], pInt) !< total # of twin systems per family for bct-example integer(pInt), dimension(LATTICE_maxNtransFamily), parameter, public :: & - LATTICE_bct_NtransSystem = int([0,0],pInt) !< total # of transformation systems per family for bcc + LATTICE_bct_NtransSystem = int([0,0],pInt) !< total # of transformation systems per family for bct integer(pInt), dimension(LATTICE_maxNcleavageFamily), parameter, public :: & - LATTICE_bct_NcleavageSystem = int([0,0,0],pInt) !< total # of cleavage systems per family for bcc + LATTICE_bct_NcleavageSystem = int([0,0,0],pInt) !< total # of cleavage systems per family for bct integer(pInt), parameter , private :: & LATTICE_bct_Nslip = 52_pInt, & ! sum(lattice_bct_NslipSystem), !< total # of slip systems for bct - LATTICE_bct_Ntwin = 0_pInt, & ! sum(lattice_bcc_NtwinSystem) !< total # of twin systems for bcc - LATTICE_bct_NnonSchmid = 0_pInt, & !< # of non-Schmid contributions for bcc - LATTICE_bct_Ntrans = 0_pInt, & !< total # of transformations for bcc - LATTICE_bct_Ncleavage = 0_pInt !< total # of transformations for bcc + LATTICE_bct_Ntwin = 0_pInt, & ! sum(lattice_bcc_NtwinSystem) !< total # of twin systems for bct + LATTICE_bct_NnonSchmid = 0_pInt, & !< # of non-Schmid contributions for bct + LATTICE_bct_Ntrans = 0_pInt, & !< total # of transformations for bct + LATTICE_bct_Ncleavage = 0_pInt !< total # of transformations for bct real(pReal), dimension(3+3,LATTICE_bct_Nslip), parameter, private :: & LATTICE_bct_systemSlip = reshape(real([& @@ -2140,7 +2140,7 @@ pure function lattice_qDisorientation(Q1, Q2, struct) real(pReal), dimension(4) :: lattice_qDisorientation real(pReal), dimension(4), intent(in) :: & Q1, & ! 1st orientation - Q2 ! 2nd orientation + Q2 ! 2nd orientation integer(kind(LATTICE_undefined_ID)), optional, intent(in) :: & ! if given, symmetries between the two orientation will be considered struct diff --git a/code/plastic_nonlocal.f90 b/code/plastic_nonlocal.f90 index d48e26a88..2e9248a50 100644 --- a/code/plastic_nonlocal.f90 +++ b/code/plastic_nonlocal.f90 @@ -3143,8 +3143,7 @@ do n = 1_pInt,Nneighbors !* All values below the threshold are set to zero. else absoluteMisorientation = lattice_qDisorientation(orientation(1:4,1,i,e), & - orientation(1:4,1,neighbor_i,neighbor_e), & - 0_pInt) ! no symmetry + orientation(1:4,1,neighbor_i,neighbor_e)) ! no symmetry do s1 = 1_pInt,ns ! my slip systems do s2 = 1_pInt,ns ! my neighbor's slip systems my_compatibility(1,s2,s1,n) = math_mul3x3(slipNormal(1:3,s1), math_qRot(absoluteMisorientation, slipNormal(1:3,s2))) & diff --git a/code/plastic_phenoplus.f90 b/code/plastic_phenoplus.f90 index 6fd16a1e3..7e3f003e7 100644 --- a/code/plastic_phenoplus.f90 +++ b/code/plastic_phenoplus.f90 @@ -769,6 +769,7 @@ subroutine plastic_phenoplus_microstructure(orientation,ipc,ip,el) lattice_sd, & lattice_qDisorientation + !***input variables implicit none integer(pInt), intent(in) :: & @@ -855,8 +856,7 @@ subroutine plastic_phenoplus_microstructure(orientation,ipc,ip,el) neighbor_ph = mappingConstitutive(2, neighbor_n, neighbor_ip, neighbor_el) neighbor_orientation = orientation(1:4, neighbor_n, neighbor_ip, neighbor_el) !ipc is always 1. absMisorientation = lattice_qDisorientation(my_orientation, & - neighbor_orientation, & - 0_pInt) !no need for explicit calculation of symmetry + neighbor_orientation) !no need for explicit calculation of symmetry !***only perform m' calculation for neighbor with the same phase if (ph==neighbor_ph) then loopNeighborSlip: do ne_slip=1_pInt,ns !assuming all have the same slip systems here