From 2e377056ed4a1a599ecc6edadf17a94c750db808 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 24 Jul 2014 12:26:01 +0000 Subject: [PATCH] missing adjustment of interface for call to CPFEM_general related to last commit --- code/DAMASK_spectral_utilities.f90 | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/code/DAMASK_spectral_utilities.f90 b/code/DAMASK_spectral_utilities.f90 index 941ff7057..5035e87c5 100644 --- a/code/DAMASK_spectral_utilities.f90 +++ b/code/DAMASK_spectral_utilities.f90 @@ -793,8 +793,6 @@ subroutine utilities_constitutiveResponse(F_lastInc,F,temperature,timeinc,& use debug, only: & debug_reset, & debug_info - use numerics, only: & - usePingPong use math, only: & math_transpose33, & math_rotate_forward33, & @@ -805,9 +803,7 @@ subroutine utilities_constitutiveResponse(F_lastInc,F,temperature,timeinc,& CPFEM_general, & CPFEM_COLLECT, & CPFEM_CALCRESULTS, & - CPFEM_AGERESULTS, & - CPFEM_BACKUPJACOBIAN, & - CPFEM_RESTOREJACOBIAN + CPFEM_AGERESULTS use crystallite, only: & crystallite_temperature use homogenization, only: & @@ -841,16 +837,13 @@ subroutine utilities_constitutiveResponse(F_lastInc,F,temperature,timeinc,& collectMode = CPFEM_COLLECT if (forwardData) then ! aging results calcMode = ior(calcMode, CPFEM_AGERESULTS) - collectMode = ior(collectMode, CPFEM_BACKUPJACOBIAN) materialpoint_F0 = reshape(F_lastInc, [3,3,1,product(grid)]) endif if (cutBack) then ! restore saved variables - collectMode = ior(collectMode , CPFEM_RESTOREJACOBIAN) - collectMode = iand(collectMode, not(CPFEM_BACKUPJACOBIAN)) calcMode = iand(calcMode, not(CPFEM_AGERESULTS)) endif - call CPFEM_general(collectMode,usePingPong,F_lastInc(1:3,1:3,1,1,1),F(1:3,1:3,1,1,1), & ! collect mode handles Jacobian backup / restoration + call CPFEM_general(collectMode,F_lastInc(1:3,1:3,1,1,1),F(1:3,1:3,1,1,1), & ! collect mode handles Jacobian backup / restoration temperature,timeinc,1_pInt,1_pInt) crystallite_temperature = temperature @@ -873,7 +866,7 @@ subroutine utilities_constitutiveResponse(F_lastInc,F,temperature,timeinc,& flush(6) endif - call CPFEM_general(calcMode,usePingPong,F_lastInc(1:3,1:3,1,1,1), F(1:3,1:3,1,1,1), & ! first call calculates everything + call CPFEM_general(calcMode,F_lastInc(1:3,1:3,1,1,1), F(1:3,1:3,1,1,1), & ! first call calculates everything temperature,timeinc,1_pInt,1_pInt) max_dPdF = 0.0_pReal