From 2116226407a897a37dd3a511351b8aa4dc60f146 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 3 Feb 2017 20:35:05 +0100 Subject: [PATCH] status from development branch --- src/constitutive.f90 | 14 +++----------- src/plastic_phenoplus.f90 | 1 - 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/constitutive.f90 b/src/constitutive.f90 index 35137438d..de8f61c2a 100644 --- a/src/constitutive.f90 +++ b/src/constitutive.f90 @@ -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 diff --git a/src/plastic_phenoplus.f90 b/src/plastic_phenoplus.f90 index c9b5eead9..105a64b34 100644 --- a/src/plastic_phenoplus.f90 +++ b/src/plastic_phenoplus.f90 @@ -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"