223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed indentation

This commit is contained in:
Martin Diehl 2019-04-03 13:11:18 +02:00
parent 3887d5631a
commit 4724e42b7f
1 changed files with 615 additions and 608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rotations.f90
View File

@ -204,12 +204,19 @@ function rotTensor(self,m,active)
real(pReal), intent(in), dimension(3,3) :: m real(pReal), intent(in), dimension(3,3) :: m
logical, intent(in), optional :: active logical, intent(in), optional :: active
logical :: passive
passive: if (merge(.not. active, .true., present(active))) then if (present(active)) then
passive = .not. active
else
passive = .true.
endif
if (passive) then
rotTensor = matmul(matmul(self%asRotationMatrix(),m),transpose(self%asRotationMatrix())) rotTensor = matmul(matmul(self%asRotationMatrix(),m),transpose(self%asRotationMatrix()))
else passive else
rotTensor = matmul(matmul(transpose(self%asRotationMatrix()),m),self%asRotationMatrix()) rotTensor = matmul(matmul(transpose(self%asRotationMatrix()),m),self%asRotationMatrix())
endif passive endif
end function rotTensor end function rotTensor
@ -478,6 +485,7 @@ end function ax2ho
pure function ho2ax(ho) result(ax) pure function ho2ax(ho) result(ax)
use prec, only: & use prec, only: &
dEq0 dEq0
implicit none implicit none
real(pReal), intent(in), dimension(3) :: ho real(pReal), intent(in), dimension(3) :: ho
real(pReal), dimension(4) :: ax real(pReal), dimension(4) :: ax
@ -1025,7 +1033,6 @@ pure function ho2ro(ho) result(ro)
real(pReal), intent(in), dimension(3) :: ho real(pReal), intent(in), dimension(3) :: ho
real(pReal), dimension(4) :: ro real(pReal), dimension(4) :: ro
ro = ax2ro(ho2ax(ho)) ro = ax2ro(ho2ax(ho))
end function ho2ro end function ho2ro