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

make use of consistency checks

This commit is contained in:
Martin Diehl 2019-09-20 16:52:55 -07:00
parent ef4204da14
commit 7e6265b128
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/grid/DAMASK_grid.f90
View File

@ -29,6 +29,7 @@ program DAMASK_spectral
use grid_thermal_spectral use grid_thermal_spectral
use HDF5_utilities use HDF5_utilities
use results use results
use rotations
implicit none implicit none
@ -79,6 +80,7 @@ program DAMASK_spectral
character(len=6) :: loadcase_string character(len=6) :: loadcase_string
character(len=1024) :: & character(len=1024) :: &
incInfo incInfo
type(rotation) :: R
type(tLoadCase), allocatable, dimension(:) :: loadCases !< array of all load cases type(tLoadCase), allocatable, dimension(:) :: loadCases !< array of all load cases
type(tLoadCase) :: newLoadCase type(tLoadCase) :: newLoadCase
type(tSolutionState), allocatable, dimension(:) :: solres type(tSolutionState), allocatable, dimension(:) :: solres
@ -234,8 +236,8 @@ program DAMASK_spectral
do j = 1, 3 do j = 1, 3
temp_valueVector(j) = IO_floatValue(line,chunkPos,i+k+j) temp_valueVector(j) = IO_floatValue(line,chunkPos,i+k+j)
enddo enddo
if (l == 1) temp_valueVector(1:3) = temp_valueVector(1:3) * INRAD ! convert to rad call R%fromEulerAngles(temp_valueVector(1:3),degrees=(l==1))
newLoadCase%rotation = math_EulerToR(temp_valueVector(1:3)) ! convert rad Eulers to rotation matrix newLoadCase%rotation = R%asRotationMatrix()
case('rotation','rot') ! assign values for the rotation matrix case('rotation','rot') ! assign values for the rotation matrix
temp_valueVector = 0.0_pReal temp_valueVector = 0.0_pReal
do j = 1, 9 do j = 1, 9

5
src/lattice.f90
View File

@ -960,6 +960,7 @@ function lattice_C66_trans(Ntrans,C_parent66,structure_target, &
real(pReal), dimension(6,6) :: C_bar66, C_target_unrotated66 real(pReal), dimension(6,6) :: C_bar66, C_target_unrotated66
real(pReal), dimension(3,3,3,3) :: C_target_unrotated real(pReal), dimension(3,3,3,3) :: C_target_unrotated
real(pReal), dimension(3,3,sum(Ntrans)) :: Q,S real(pReal), dimension(3,3,sum(Ntrans)) :: Q,S
type(rotation) :: R
real(pReal) :: a_bcc, a_fcc, CoverA_trans real(pReal) :: a_bcc, a_fcc, CoverA_trans
integer :: i integer :: i
@ -1000,7 +1001,9 @@ function lattice_C66_trans(Ntrans,C_parent66,structure_target, &
call buildTransformationSystem(Q,S,Ntrans,CoverA_trans,a_fcc,a_bcc) call buildTransformationSystem(Q,S,Ntrans,CoverA_trans,a_fcc,a_bcc)
do i = 1, sum(Ntrans) do i = 1, sum(Ntrans)
lattice_C66_trans(1:6,1:6,i) = math_sym3333to66(math_rotate_forward3333(C_target_unrotated,Q(1:3,1:3,i))) call R%fromRotationMatrix(Q(1:3,1:3,i))
lattice_C66_trans(1:6,1:6,i) &
= math_sym3333to66(math_rotate_forward3333(C_target_unrotated,R%asRotationMatrix()))
enddo enddo
end function lattice_C66_trans end function lattice_C66_trans