diff --git a/src/lattice.f90 b/src/lattice.f90 index b21b1e554..f6c2bccbf 100644 --- a/src/lattice.f90 +++ b/src/lattice.f90 @@ -2339,15 +2339,15 @@ function lattice_CorrespondanceMatrix_twin(Ntwin,lattice,cOverA) result(Correspo characteristicShearTwin = lattice_characteristicShear_Twin(Ntwin,lattice,cOverA) SchmidMatrixTwin = lattice_SchmidMatrix_twin(Ntwin,lattice,cOverA) - write(6,*)'math_axisAngletoR', math_axisAngleToR(coordinateSystem(1:3,2,1), 180.0_pReal*INRAD) + write(6,*)'coordinate system', coordinateSystem(1:3,2,1) - CorrespondanceMatrix(1:3,1:3,1) = math_axisAngleToR(coordinateSystem(1:3,2,6), 180.0_pReal*INRAD) ! delete this + !CorrespondanceMatrix(1:3,1:3,1) = math_axisAngleToR(coordinateSystem(1:3,2,6), 180.0_pReal*INRAD) ! delete this - !do i = 1, sum(Ntwin) - ! CorrespondanceMatrix(1:3,1:3,i) = math_mul3333xx33(math_axisAngleToR(coordinateSystem(1:3,2,i), & - ! 180.0_pReal*INRAD), MATH_I3 + characteristicShearTwin(i)* & - ! SchmidMatrixTwin(1:3,1:3,i)) - !enddo + do i = 1, sum(Ntwin) + CorrespondanceMatrix(1:3,1:3,i) = matmul(math_axisAngleToR(coordinateSystem(1:3,2,i), & + 180.0_pReal*INRAD), MATH_I3 + characteristicShearTwin(i)* & + SchmidMatrixTwin(1:3,1:3,i)) + enddo end function lattice_CorrespondanceMatrix_twin diff --git a/src/phase_mechanical_plastic_phenopowerlaw.f90 b/src/phase_mechanical_plastic_phenopowerlaw.f90 index 3f551392e..bdee12f3e 100644 --- a/src/phase_mechanical_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanical_plastic_phenopowerlaw.f90 @@ -422,7 +422,7 @@ fdot_twin = (0.05_pReal*(abs(tau_tw)/state(ph)%xi_tw(:,en))**param(ph)%n_tw)/par !write(6,*) 'twin_var', twin_var !delete this -write(6,*)'correspondanceMatrix', param(ph)%CorrespondanceMatrix(:,:,1) !delete this +!write(6,*)'correspondanceMatrix', param(ph)%CorrespondanceMatrix(:,:,1) !delete this call RANDOM_NUMBER(random)