added expansion evals...could not validate due to fmm dependence

Author: agillman20

chunkie/+chnk/+quasiproxy/eval_approx.m

@@ -1,4 +1,4 @@
-function uapp = eval_approx(full_sys,chnkr,interface_dens,proxy_dens,d,theta,xxtrg)
+function uapp = eval_approx(full_sys,chnkr,interface_dens,proxy_dens,bragg_coef,KK,ht,hb,d,theta,xxtrg)
 
 % will require lots of clean up for multilayer code.
 
@@ -7,10 +7,41 @@
 
 kh = full_sys.khs(numlayer);
 
-ntot = chnkr.npt;
 nproxy = size(full_sys.Cproxy{numlayer}.r,2);
 
-
+if xxtrg.r(2,1)>hb
+    % use bragg expansion
+    topcoef = bragg_coef(1:KK);
+    kh1 = full_sys.khs(1);
+
+
+    uapp = 0;
+    n = (KK-1)/2;
+    ima = sqrt(-1);
+    for j= 1:KK
+        kappa = kh1*cos(theta)+2*pi*(j-n);
+        knu = sqrt(kh1^2-kappa^2);    
+        uapp = uapp+topcoef(j)*exp(ima*kappa*xxtrg.r(1))*exp(ima*knu*(xxtrg.r(2)-ht));
+    end
+
+elseif xxtrg.r(2,1)<hb
+    % use bragg expansion
+
+    bottcoef = bragg_coef(KK+1:end);
+    kh1 = full_sys.khs(1);
+    khn = full_sys.khs(end);
+
+    uapp = 0;
+    n = (KK-1)/2;
+    ima = sqrt(-1);
+    for j= 1:KK
+        kappa = kh1*cos(theta)+2*pi*(j-n);
+        knd = sqrt(khn^2-kappa^2);            
+        uapp = uapp+bottcoef(j)*exp(ima*kappa*xxtrg.r(1))*exp(ima*knd*(-xxtrg.r(2)+hb));
+    end
+    
+else    
+% use integral operator form of solution    
 % extract the different parts of the solution to the linear system.
  c1=proxy_dens(1:nproxy);
 
@@ -44,7 +75,7 @@
     + alpha*(TrR*interface_dens);
 
 uapp = udens+uproxy;
-
+end
 
 
 return

chunkie/demo/demo_quasiproxy.m

@@ -11,7 +11,8 @@
 
 % test target location for convergence.
 xxtrg = [];
-xxtrg.r = [0.2; 0.5];
+% xxtrg.r = [0.2; 0.5];
+xxtrg.r = [0.2; 1.5];
 xxtrg.n = [0; 0];
 
 % Number of panels
@@ -71,7 +72,7 @@
     fprintf('Flux error est.    = %g\n\n',      flux_error);
     fprintf('\n  theta value , flux error est.    = %g\n',   flux_error );
 
-uapp = chnk.quasiproxy.eval_approx(full_sys,chnkr,interface_dens,proxy_dens,d,theta,xxtrg);    
+uapp = chnk.quasiproxy.eval_approx(full_sys,chnkr,interface_dens,proxy_dens,bragg_coef,KK,d,ht,hb,theta,xxtrg);    
 
 uapp
 

startup.m

@@ -12,6 +12,10 @@ function startup(opts)
 %   opts.fmmrecompile - boolean (false), force recompile of fmm2d library
 %
 
+addpath(genpath('/Users/gillmana/Documents/Research/Flatiron/chunkie/'))
+addpath(genpath('/Users/gillmana/Documents/Research/Flatiron/chunkie/+chnk/+flam'))
+
+
 if nargin < 1
     opts = [];
 end