Commit 93ebd519 authored by alexander.dornheim's avatar alexander.dornheim
Browse files

Made some small progress on QNAP

parent 5dc72793
......@@ -65,13 +65,13 @@ class QNAP(Algortihm):
gradfnew_vec = (u[:,1]- tmp_u[:,1])
else:
if iter>3:
uold_vec=reshape([real(u(:,1)), imag(u(:,1))], ...
uold_vec=reshape(concatenate(real(u(:,1)), imag(u(:,1))), ...
self.Ny*self.Nx*2, 1);
unew_vec=reshape([real(tmp_u(:,1)), imag(tmp_u(:,1))], ...
unew_vec=reshape(concatenate(real(tmp_u(:,1)), imag(tmp_u(:,1))), ...
self.Ny*self.Nx*2, 1)
gradfold_vec = gradfnew_vec
gradfnew_vec = uold_vec-unew_vec
unew_vec,uold_vec,gap[iter-1],gradfold_vec, change[iter), samsara_data=...
unew_vec,uold_vec,gap[iter-1],gradfold_vec, change[iter], samsara_data=...
feval('samsara', uold_vec, unew_vec, ...
gap(iter-2)*self.Nx*self.Ny,...
gap(iter-1)*self.Nx*self.Ny,...
......@@ -99,7 +99,7 @@ class QNAP(Algortihm):
else:
gradfold_vec = gradfnew_vec
gradfnew_vec = uold_vec-unew_vec
unew_vec,uold_vec,gap[iter-1],gradfold_vec, change[iter), samsara_data=...
unew_vec,uold_vec,gap[iter-1],gradfold_vec, change[iter], samsara_data=...
feval('samsara', uold_vec, unew_vec, ...
gap(iter-2)*self.Nx*self.Ny,...
gap(iter-1)*self.Nx*self.Ny,...
......@@ -112,16 +112,16 @@ class QNAP(Algortihm):
tmp_u[:,:,j]=tmp2
end
else:
tmp2=[real(u[:,:,1]),imag(u[:,:,1)]]
tmp2=concatenate(real(u[:,:,1]),imag(u[:,:,1)])
uold_vec=reshape(tmp2,self.Nx*self.Ny*2,1)
tmp2=[real(tmp_u(:,:,1)), imag(tmp_u(:,:,1))]
tmp2=concatenate(real(tmp_u(:,:,1)), imag(tmp_u(:,:,1)))
unew_vec = reshape(tmp2,self.Nx*self.Ny*2,1)
if iter<=3:
gradfnew_vec = uold_vec-unew_vec
else
gradfold_vec = gradfnew_vec
gradfnew_vec = uold_vec-unew_vec
unew_vec,uold_vec,gap[iter-1],gradfold_vec, change[iter), samsara_data=...
unew_vec,uold_vec,gap[iter-1],gradfold_vec, change[iter], samsara_data=...
feval('samsara', uold_vec, unew_vec, ...
gap(iter-2)*self.Nx*self.Ny,...
gap(iter-1)*self.Nx*self.Ny,...
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment