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

fixed bug in constitutive introduced in rev 2988 causing wrong names in *.outputConstitutive

This commit is contained in:
Martin Diehl 2014-03-05 08:06:21 +00:00
parent e10f8f1b5e
commit 32493675d6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/constitutive.f90
View File

@ -204,7 +204,7 @@ subroutine constitutive_init
write(FILEUNIT,'(/,a,/)') '['//trim(phase_name(phase))//']' write(FILEUNIT,'(/,a,/)') '['//trim(phase_name(phase))//']'
if (knownPlasticity) then if (knownPlasticity) then
write(FILEUNIT,'(a)') '(plasticity)'//char(9)//trim(outputName) write(FILEUNIT,'(a)') '(plasticity)'//char(9)//trim(outputName)
do e = 1_pInt,phase_Noutput(instance) do e = 1_pInt,phase_Noutput(phase)
write(FILEUNIT,'(a,i4)') trim(thisOutput(e,instance))//char(9),thisSize(e,instance) write(FILEUNIT,'(a,i4)') trim(thisOutput(e,instance))//char(9),thisSize(e,instance)
enddo enddo
endif endif

5
code/lattice.f90
View File

@ -1335,10 +1335,13 @@ end function lattice_qInSST
function lattice_qDisorientation(Q1, Q2, symmetryType) function lattice_qDisorientation(Q1, Q2, symmetryType)
use prec, only: & use prec, only: &
tol_math_check tol_math_check
use IO, only: &
IO_error
use math, only: & use math, only: &
math_qMul, & math_qMul, &
math_qConj math_qConj
implicit none
real(pReal), dimension(4) :: lattice_qDisorientation real(pReal), dimension(4) :: lattice_qDisorientation
real(pReal), dimension(4), intent(in) :: Q1, & ! 1st orientation real(pReal), dimension(4), intent(in) :: Q1, & ! 1st orientation
Q2 ! 2nd orientation Q2 ! 2nd orientation
@ -1374,6 +1377,8 @@ function lattice_qDisorientation(Q1, Q2, symmetryType)
lattice_qInSST(mis,symmetryType)) & lattice_qInSST(mis,symmetryType)) &
lattice_qDisorientation = mis ! found better one lattice_qDisorientation = mis ! found better one
enddo; enddo; enddo enddo; enddo; enddo
case default
call IO_error(450_pInt,symmetryType) ! complain about unknown symmetry
end select end select
end function lattice_qDisorientation end function lattice_qDisorientation