add more kernel name options

Author: tristangdwl

chunkie/+chnk/+axissymhelm2d/kern.m

@@ -139,7 +139,7 @@
         end
     end
 
-case {'sdiff'}
+case {'sdiff', 's_diff'}
     ifdiff = 1;
     submat = chnk.axissymhelm2d.green(zk, src, targ, origin, ifdiff);
 
@@ -204,7 +204,7 @@
 
   submat = submat1-submat2;
 
-case {'dpdiff', 'dprimediff'}
+case {'dpdiff', 'dp_diff', 'dprimediff', 'dprime_diff'}
   targnorm = targinfo.n(:,:);
   srcnorm = srcinfo.n(:,:);
   ifdiff = 1;

chunkie/+chnk/+elast2d/kern.m

@@ -87,7 +87,7 @@
         kron(rdotv./r2,[1 0; 0 1]));
     mat = term1+term2;
 
-case {'sgrad'}
+case {'sgrad', 'sg'}
     mat = zeros(4*m,2*n);
     tmp = beta*x./r2;
     mat(1:4:end,1:2:end) = tmp;
@@ -139,7 +139,7 @@
     term1 = eta*(kron(rdotv./r2,[2 0; 0 2]));
     mat = -(term1+term2);
 
-case {'daltgrad'}
+case {'daltgrad', 'daltg'}
     dirx = s.n(1,:); dirx = dirx(:).';
     diry = s.n(2,:); diry = diry(:).';
     rdotv = x.*dirx + y.*diry;

chunkie/+chnk/+helm1d/kern.m

@@ -252,7 +252,7 @@
   submat(1:1:1*nt,2:2:2*ns) = coef(2)*submatsp;
 
 % Gradient correpsonding to transmission rep
-case {'trans_rep_grad','trg'}
+case {'trans_rep_grad','trg','trans_rep_g'}
   coef = ones(2,1);
   if(nargin == 5); coef = varargin{1}; end;
 

chunkie/+chnk/+helm2d/kern.m

@@ -475,7 +475,7 @@
   submat(1:1:1*nt,2:2:2*ns) = coef(2)*submatsp;
 
 % Gradient correpsonding to transmission rep
-case {'trans_rep_grad','trg'}
+case {'trans_rep_grad','trg','trans_rep_g'}
   coef = ones(2,1);
   if(nargin == 5); coef = varargin{1}; end;
 
@@ -500,7 +500,7 @@
 
 
 % Gradient correpsonding to transmission rep (difference)
-case {'trans_rep_grad_diff','trg_diff'}
+case {'trans_rep_grad_diff','trg_diff','trans_rep_g_diff'}
   coef = ones(2,1);
   if(nargin == 5); coef = varargin{1}; end;
 

chunkie/+chnk/+lap2d/kern.m

@@ -18,25 +18,40 @@
 
 % normal derivative of single layer
 case {'sp', 'sprime'}
+    if ~isfield(targinfo,'n')
+        targnorm = chnk.normal2d(targinfo);
+    else
+        targnorm = targinfo.n;
+    end
     [~,grad] = chnk.lap2d.green(src,targ,true);
-    nx = repmat((targinfo.n(1,:)).',1,ns);
-    ny = repmat((targinfo.n(2,:)).',1,ns);
+    nx = repmat((targnorm(1,:)).',1,ns);
+    ny = repmat((targnorm(2,:)).',1,ns);
 
     submat = (grad(:,:,1).*nx + grad(:,:,2).*ny);
 
 % Tangential derivative of single layer
 case {'stau'}
+    if ~isfield(targinfo,'n')
+        targnorm = chnk.normal2d(targinfo);
+    else
+        targnorm = targinfo.n;
+    end
     [~,grad] = chnk.lap2d.green(src,targ,true);
-    nx = repmat((targinfo.n(1,:)).',1,ns);
-    ny = repmat((targinfo.n(2,:)).',1,ns);
+    nx = repmat((targnorm(1,:)).',1,ns);
+    ny = repmat((targnorm(2,:)).',1,ns);
 
     submat = (-grad(:,:,1).*ny + grad(:,:,2).*nx);
 
 % Hilbert transform (two times the adjoint of stau)
 case {'hilb'} 
+    if ~isfield(srcinfo,'n')
+        srcnorm = chnk.normal2d(srcinfo);
+    else
+        srcnorm = srcinfo.n;
+    end
     [~,grad] = chnk.lap2d.green(src,targ,true);
-    nx = repmat((srcinfo.n(1,:)),nt,1);
-    ny = repmat((srcinfo.n(2,:)),nt,1);
+    nx = repmat((srcnorm(1,:)),nt,1);
+    ny = repmat((srcnorm(2,:)),nt,1);
 
     submat = 2*(grad(:,:,1).*ny - grad(:,:,2).*nx);
 
@@ -47,20 +62,33 @@
 
 % gradient of double layer
 case {'dgrad','dg'}
+    if ~isfield(srcinfo,'n')
+        srcnorm = chnk.normal2d(srcinfo);
+    else
+        srcnorm = srcinfo.n;
+    end
     [~,~,hess] = chnk.lap2d.green(src,targ,true);
-    submat = -(hess(:,:,1:2).*srcinfo.n(1,:)+hess(:,:,2:3).*srcinfo.n(2,:));
+    submat = -(hess(:,:,1:2).*srcnorm(1,:)+hess(:,:,2:3).*srcnorm(2,:));
     submat = reshape(permute(submat,[3,1,2]),2*nt,ns);
 
 % normal derivative of double layer
 case {'dprime','dp'}
-  targnorm = targinfo.n(:,:);
-  srcnorm = srcinfo.n(:,:);
-  [~,~,hess] = chnk.lap2d.green(src,targ);
-  nxsrc = repmat(srcnorm(1,:),nt,1);
-  nysrc = repmat(srcnorm(2,:),nt,1);
-  nxtarg = repmat((targnorm(1,:)).',1,ns);
-  nytarg = repmat((targnorm(2,:)).',1,ns);
-  submat = -(hess(:,:,1).*nxsrc.*nxtarg + hess(:,:,2).*(nysrc.*nxtarg+nxsrc.*nytarg)...
+    if ~isfield(targinfo,'n')
+        targnorm = chnk.normal2d(targinfo);
+    else
+        targnorm = targinfo.n;
+    end
+    if ~isfield(srcinfo,'n')
+        srcnorm = chnk.normal2d(srcinfo);
+    else
+        srcnorm = srcinfo.n;
+    end
+    [~,~,hess] = chnk.lap2d.green(src,targ);
+    nxsrc = repmat(srcnorm(1,:),nt,1);
+    nysrc = repmat(srcnorm(2,:),nt,1);
+    nxtarg = repmat((targnorm(1,:)).',1,ns);
+    nytarg = repmat((targnorm(2,:)).',1,ns);
+    submat = -(hess(:,:,1).*nxsrc.*nxtarg + hess(:,:,2).*(nysrc.*nxtarg+nxsrc.*nytarg)...
       + hess(:,:,3).*nysrc.*nytarg);
 
 % single layer
@@ -69,19 +97,29 @@
 
 % combined field
 case {'c', 'combined'}
+    if ~isfield(srcinfo,'n')
+        srcnorm = chnk.normal2d(srcinfo);
+    else
+        srcnorm = srcinfo.n;
+    end
     coef = ones(2,1);
     if(nargin == 4); coef = varargin{1}; end
     [s,grad] = chnk.lap2d.green(src,targ);
-    nx = repmat(srcinfo.n(1,:),nt,1);
-    ny = repmat(srcinfo.n(2,:),nt,1);
+    nx = repmat(srcnorm(1,:),nt,1);
+    ny = repmat(srcnorm(2,:),nt,1);
     submat = -coef(1)*(grad(:,:,1).*nx + grad(:,:,2).*ny) + coef(2)*s;
 
 % gradient of combined field
 case {'cgrad', 'cg'}
+    if ~isfield(srcinfo,'n')
+        srcnorm = chnk.normal2d(srcinfo);
+    else
+        srcnorm = srcinfo.n;
+    end
     coef = ones(2,1);
     if(nargin == 4); coef = varargin{1}; end
     [~,grad,hess] = chnk.lap2d.green(src,targ,true);
-    submat = -(hess(:,:,1:2).*srcinfo.n(1,:)+hess(:,:,2:3).*srcinfo.n(2,:));
+    submat = -(hess(:,:,1:2).*srcnorm(1,:)+hess(:,:,2:3).*srcnorm(2,:));
     submat = coef(1)*reshape(permute(submat,[3,1,2]),2*nt,ns);
     submat = submat+coef(2)*reshape(permute(grad,[3,1,2]),2*nt,ns);