From b9e55b4495e92db9dceef4e13b95ea9910933ecb Mon Sep 17 00:00:00 2001 From: Pratheek Shanthraj Date: Mon, 27 Jan 2014 11:05:36 +0000 Subject: [PATCH] moved setting of CPFEM forwarding flag to the forwarding subroutine --- code/DAMASK_spectral_solverAL.f90 | 2 +- code/DAMASK_spectral_solverBasicPETSc.f90 | 2 +- code/DAMASK_spectral_solverPolarisation.f90 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/DAMASK_spectral_solverAL.f90 b/code/DAMASK_spectral_solverAL.f90 index 176049221..0db3f280c 100644 --- a/code/DAMASK_spectral_solverAL.f90 +++ b/code/DAMASK_spectral_solverAL.f90 @@ -322,7 +322,6 @@ type(tSolutionState) function & S_scale = math_invSym3333(C_minMaxAvg) endif - ForwardData = .True. AL_solution%converged =.false. !-------------------------------------------------------------------------------------------------- @@ -676,6 +675,7 @@ subroutine AL_forward(guess,timeinc,timeinc_old,loadCaseTime,F_BC,P_BC,rotation_ F = reshape(F_lastInc, [9,grid(1),grid(2),grid(3)]) C_volAvg = C_volAvgLastInc else + ForwardData = .True. !-------------------------------------------------------------------------------------------------- ! calculate rate for aim C_volAvgLastInc = C_volAvg diff --git a/code/DAMASK_spectral_solverBasicPETSc.f90 b/code/DAMASK_spectral_solverBasicPETSc.f90 index c7cd77cc2..9e32d36a6 100644 --- a/code/DAMASK_spectral_solverBasicPETSc.f90 +++ b/code/DAMASK_spectral_solverBasicPETSc.f90 @@ -288,7 +288,6 @@ type(tSolutionState) function basicPETSc_solution( & S = Utilities_maskedCompliance(rotation_BC,P_BC%maskLogical,C_volAvg) if (update_gamma) call Utilities_updateGamma(C_minmaxAvg,restartWrite) - ForwardData = .True. BasicPETSc_solution%converged =.false. !-------------------------------------------------------------------------------------------------- @@ -600,6 +599,7 @@ subroutine BasicPETSc_forward(guess,timeinc,timeinc_old,loadCaseTime,F_BC,P_BC,r F = reshape(F_lastInc, [9,grid(1),grid(2),grid(3)]) C_volAvg = C_volAvgLastInc else + ForwardData = .True. C_volAvgLastInc = C_volAvg !-------------------------------------------------------------------------------------------------- ! calculate rate for aim diff --git a/code/DAMASK_spectral_solverPolarisation.f90 b/code/DAMASK_spectral_solverPolarisation.f90 index a755b51a8..e734b90f8 100644 --- a/code/DAMASK_spectral_solverPolarisation.f90 +++ b/code/DAMASK_spectral_solverPolarisation.f90 @@ -325,7 +325,6 @@ type(tSolutionState) function & !-------------------------------------------------------------------------------------------------- ! set module wide availabe data - ForwardData = .True. mask_stress = P_BC%maskFloat params%P_BC = P_BC%values params%rotation_BC = rotation_BC @@ -674,6 +673,7 @@ subroutine Polarisation_forward(guess,timeinc,timeinc_old,loadCaseTime,F_BC,P_BC F = reshape(F_lastInc, [9,grid(1),grid(2),grid(3)]) C_volAvg = C_volAvgLastInc else + ForwardData = .True. C_volAvgLastInc = C_volAvg !-------------------------------------------------------------------------------------------------- ! calculate rate for aim