From 466ced911e8c1ce45c1a22b36e5de360c92e1935 Mon Sep 17 00:00:00 2001 From: Christoph Kords Date: Wed, 9 Feb 2011 08:39:07 +0000 Subject: [PATCH] * check convergence for nonlocals also in stiffness calculation mode --- code/crystallite.f90 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/crystallite.f90 b/code/crystallite.f90 index 65ca30c26..364255a41 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -1026,7 +1026,7 @@ enddo ! --- CHECK CONVERGENCE --- crystallite_todo = .false. ! done with integration -if ( mode == 1 .and. .not. singleRun ) then ! for central solution +if (.not. singleRun) then ! if not requesting Integration of just a single IP if (any(.not. crystallite_converged .and. .not. crystallite_localConstitution)) then ! any non-local not yet converged (or broken)... crystallite_converged = crystallite_converged .and. crystallite_localConstitution ! ...restart all non-local as not converged endif @@ -1426,7 +1426,7 @@ relTemperatureResiduum = 0.0_pReal ! --- nonlocal convergence check --- if (verboseDebugger .and. mode==1) write(6,*) 'crystallite_converged',crystallite_converged -if ( mode == 1 .and. .not. singleRun ) then ! for central solution +if (.not. singleRun) then ! if not requesting Integration of just a single IP if ( any(.not. crystallite_converged .and. .not. crystallite_localConstitution)) then ! any non-local not yet converged (or broken)... crystallite_converged = crystallite_converged .and. crystallite_localConstitution ! ...restart all non-local as not converged endif @@ -1704,7 +1704,7 @@ relTemperatureResiduum = 0.0_pReal ! --- NONLOCAL CONVERGENCE CHECK --- if (verboseDebugger .and. mode==1) write(6,*) 'crystallite_converged',crystallite_converged -if ( mode == 1 .and. .not. singleRun ) then ! for central solution +if (.not. singleRun) then ! if not requesting Integration of just a single IP if ( any(.not. crystallite_converged .and. .not. crystallite_localConstitution)) then ! any non-local not yet converged (or broken)... crystallite_converged = crystallite_converged .and. crystallite_localConstitution ! ...restart all non-local as not converged endif @@ -1885,7 +1885,7 @@ endif ! --- CHECK NON-LOCAL CONVERGENCE --- crystallite_todo = .false. ! done with integration -if ( mode == 1 .and. .not. singleRun ) then ! for central solution +if (.not. singleRun) then ! if not requesting Integration of just a single IP if (any(.not. crystallite_converged .and. .not. crystallite_localConstitution)) then ! any non-local not yet converged (or broken)... crystallite_converged = crystallite_converged .and. crystallite_localConstitution ! ...restart all non-local as not converged endif @@ -2147,7 +2147,7 @@ do while (any(crystallite_todo) .and. NiterationState < nState ) ! --- CONVERGENCE CHECK --- - if ( mode == 1 .and. .not. singleRun ) then ! for central solution + if (.not. singleRun) then ! if not requesting Integration of just a single IP if (any(.not. crystallite_converged .and. .not. crystallite_localConstitution)) then ! any non-local not yet converged (or broken)... crystallite_converged = crystallite_converged .and. crystallite_localConstitution ! ...restart all non-local as not converged endif