diff --git a/sources/scattering/T_matrix.m b/sources/scattering/T_matrix.m deleted file mode 100644 index 9916c49..0000000 --- a/sources/scattering/T_matrix.m +++ /dev/null @@ -1,43 +0,0 @@ -% Copyright (c) 2017, Amos Egel (KIT), Lorenzo Pattelli (LENS) -% Giacomo Mazzamuto (LENS) -% All rights reserved. -% -% Redistribution and use in source and binary forms, with or without -% modification, are permitted provided that the following conditions are met: -% -% * Redistributions of source code must retain the above copyright notice, this -% list of conditions and the following disclaimer. -% -% * Redistributions in binary form must reproduce the above copyright notice, -% this list of conditions and the following disclaimer in the documentation -% and/or other materials provided with the distribution. -% -% * Neither the name of the copyright holder nor the names of its -% contributors may be used to endorse or promote products derived from -% this software without specific prior written permission. -% -% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -% AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -% IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -% ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -% LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -% CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -% SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -% INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -% CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -% ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -% POSSIBILITY OF SUCH DAMAGE. - -% function T = T_matrix(model) -% -% -% T=zeros(1,jmult_max(1,model.lmax),'single'); -% -% for tau=1:2 -% for l=1:model.lmax -% for m=-l:l -% jmult = multi2single_index(1,tau,l,m,model.lmax); -% T(jmult) = T_entry(tau,l,model.medium_k,model.particle_k,model.particle_radius); -% end -% end -% end \ No newline at end of file diff --git a/sources/scattering/coupling_matrix_multiply.m b/sources/scattering/coupling_matrix_multiply.m index 0bba92c..2b2077b 100644 --- a/sources/scattering/coupling_matrix_multiply.m +++ b/sources/scattering/coupling_matrix_multiply.m @@ -88,17 +88,6 @@ part_pos = gpuArray(single(transpose(simulation.input.particles.positionArray))); -% tic [real_Wx,imag_Wx] = coupling_matrix_multiply_CUDA(real_x,imag_x,real_hTab,imag_hTab,PlmCoeffTable,real_ab5Tab,imag_ab5Tab,part_pos,int32(NS),rResol); -% wait(gpuDevice) -% toc - -% tic -% [real_Wx,imag_Wx] = coupling_matrix_multiply_copy_of_CUDA_lmax3(gather(real_x),gather(imag_x),gather(real_hTab),gather(imag_hTab),gather(PlmCoeffTable),gather(real_ab5Tab),gather(imag_ab5Tab),gather(part_pos),gather(int32(NS)),gather(rResol)); -% toc -% real_Wx(1) -% imag_Wx(1) - -Wx = real_Wx + 1i*imag_Wx; -% norm(Wx) +Wx = real_Wx + 1i*imag_Wx; \ No newline at end of file