solve1: Move condition that could never be reached into if-clause
parent
1457666221
commit
300ebd02b0
|
@ -118,7 +118,13 @@ for its = 1:maxit
|
||||||
if check > 0
|
if check > 0
|
||||||
den = max([f;0.5*nn]) ;
|
den = max([f;0.5*nn]) ;
|
||||||
if max(abs(g).*max([abs(x(j2)') ones(1,nn)])')/den < tolmin
|
if max(abs(g).*max([abs(x(j2)') ones(1,nn)])')/den < tolmin
|
||||||
return
|
if max(abs(x(j2)-xold(j2))./max([abs(x(j2)') ones(1,nn)])') < tolx
|
||||||
|
disp (' ')
|
||||||
|
disp (['SOLVE: Iteration ' num2str(its)])
|
||||||
|
disp (['Convergence on dX.'])
|
||||||
|
disp (x)
|
||||||
|
return
|
||||||
|
end
|
||||||
else
|
else
|
||||||
disp (' ')
|
disp (' ')
|
||||||
disp (['SOLVE: Iteration ' num2str(its)])
|
disp (['SOLVE: Iteration ' num2str(its)])
|
||||||
|
@ -127,13 +133,6 @@ for its = 1:maxit
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if max(abs(x(j2)-xold(j2))./max([abs(x(j2)') ones(1,nn)])') < tolx
|
|
||||||
disp (' ')
|
|
||||||
disp (['SOLVE: Iteration ' num2str(its)])
|
|
||||||
disp (['Convergence on dX.'])
|
|
||||||
disp (x)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
elseif max(abs(fvec)) < tolf
|
elseif max(abs(fvec)) < tolf
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue