status from development branch

This commit is contained in:
Martin Diehl 2017-02-03 20:35:05 +01:00
parent d202e7dbd5
commit 2116226407
2 changed files with 3 additions and 12 deletions

View File

@ -423,7 +423,7 @@ end function constitutive_homogenizedC
!--------------------------------------------------------------------------------------------------
!> @brief calls microstructure function of the different constitutive models
!--------------------------------------------------------------------------------------------------
subroutine constitutive_microstructure(orientations, Fe, Fp, ipc, ip, el, F0s,Fes,Fps,Tstar_vs)
subroutine constitutive_microstructure(orientations, Fe, Fp, ipc, ip, el)
use prec, only: &
pReal
use material, only: &
@ -460,15 +460,7 @@ subroutine constitutive_microstructure(orientations, Fe, Fp, ipc, ip, el, F0s,Fe
ho, & !< homogenization
tme !< thermal member position
real(pReal), intent(in), dimension(:,:,:,:) :: &
orientations
real(pReal), intent(in), dimension(:,:,:,:,:) :: &
F0s, &
Fes, &
Fps
real(pReal), intent(in), dimension(:,:,:,:) :: &
Tstar_vs !< crystal orientations as quaternions
orientations !< crystal orientations as quaternions
ho = material_homog(ip,el)
tme = thermalMapping(ho)%p(ip,el)
@ -483,7 +475,7 @@ subroutine constitutive_microstructure(orientations, Fe, Fp, ipc, ip, el, F0s,Fe
case (PLASTICITY_NONLOCAL_ID) plasticityType
call plastic_nonlocal_microstructure (Fe,Fp,ip,el)
case (PLASTICITY_PHENOPLUS_ID) plasticityType
call plastic_phenoplus_microstructure(orientations,ipc,ip,el,F0s,Fes,Fps,Tstar_vs)
call plastic_phenoplus_microstructure(orientations,ipc,ip,el)
end select plasticityType
end subroutine constitutive_microstructure

View File

@ -166,7 +166,6 @@ subroutine plastic_phenoplus_init(fileUnit)
line = ''
real(pReal), dimension(:), allocatable :: tempPerSlip
write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_PHENOPLUS_label//' init -+>>>'
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
#include "compilation_info.f90"