From 32493675d620c1e5a5967901cbffe4f7848773e0 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 5 Mar 2014 08:06:21 +0000 Subject: [PATCH] fixed bug in constitutive introduced in rev 2988 causing wrong names in *.outputConstitutive --- code/constitutive.f90 | 2 +- code/lattice.f90 | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/constitutive.f90 b/code/constitutive.f90 index a1780921d..9c9ac833a 100644 --- a/code/constitutive.f90 +++ b/code/constitutive.f90 @@ -204,7 +204,7 @@ subroutine constitutive_init write(FILEUNIT,'(/,a,/)') '['//trim(phase_name(phase))//']' if (knownPlasticity) then 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) enddo endif diff --git a/code/lattice.f90 b/code/lattice.f90 index ba1fade70..d7dff371e 100644 --- a/code/lattice.f90 +++ b/code/lattice.f90 @@ -1334,11 +1334,14 @@ end function lattice_qInSST !-------------------------------------------------------------------------------------------------- function lattice_qDisorientation(Q1, Q2, symmetryType) use prec, only: & - tol_math_check + tol_math_check + use IO, only: & + IO_error use math, only: & math_qMul, & math_qConj + implicit none real(pReal), dimension(4) :: lattice_qDisorientation real(pReal), dimension(4), intent(in) :: Q1, & ! 1st orientation Q2 ! 2nd orientation @@ -1374,6 +1377,8 @@ function lattice_qDisorientation(Q1, Q2, symmetryType) lattice_qInSST(mis,symmetryType)) & lattice_qDisorientation = mis ! found better one enddo; enddo; enddo + case default + call IO_error(450_pInt,symmetryType) ! complain about unknown symmetry end select end function lattice_qDisorientation