store second fundamental form

Author: tristangdwl

matlab/@surfer/shape_op.m

@@ -1,5 +1,5 @@
 function shape = shape_op(obj)
-%  shape = shape_op(S,p)
+%  shape = shape_op(S)
 %     This subroutine evaluates the shape operator of a surface in
 %     cartesian coordinates.
 %
@@ -12,16 +12,13 @@
 %  Output arguments:
 %    * shape: double (3,3,S.npts) 
 %
-    ffrm  = get_first_fundamental_form(obj);
-    ffrm2 = get_second_fundamental_form(obj);
-    
+    ffrm2 = cell2mat(obj.sfform);
+    ffrm2 = reshape(ffrm2, 2, obj.npatches, 2,[]); 
+    ffrm2 = permute(ffrm2,[1,3,4,2]); ffrm2= ffrm2(:,:,:);
 
-    dffrm = ffrm(1,1,:).*ffrm(2,2,:)-ffrm(1,2,:).*ffrm(2,1,:);
-    iffrm = ffrm;
-    iffrm(1,1,:) =  ffrm(2,2,:)./dffrm;
-    iffrm(2,2,:) =  ffrm(1,1,:)./dffrm;
-    iffrm(1,2,:) = -ffrm(1,2,:)./dffrm;
-    iffrm(2,1,:) = -ffrm(2,1,:)./dffrm;
+    iffrm = cell2mat(obj.ffforminv);
+    iffrm = reshape(iffrm,  2, obj.npatches, 2,[]);
+    iffrm = permute(iffrm,[1,3,4,2]); iffrm= iffrm(:,:,:);
 
     shape_red = pagemtimes(iffrm,ffrm2);
     shape_red = pagemtimes(shape_red,iffrm);

matlab/@surfer/surfer.m

@@ -92,6 +92,7 @@
         mean_curv     % mean curvatures at nodes (npts*1)
         ffform        % cell array of first fundamental forms at nodes (2,2,npts)
         ffforminv     % cell array of inverses of ffforms at nodes (2,2,npts)
+        sfform        % cell array of second fundamental forms at nodes (2,2,npts)
         aspect_ratio  % measure of local aspect ratio of patch, (npts,1);
         patch_distortion % integral of aspect ratio
         cms           % centroid location of patches (3,npatches)
@@ -223,6 +224,7 @@
             obj.mean_curv = zeros(obj.npts,1);
             obj.ffforminv = cell(npatches,1);
             obj.ffform = cell(npatches,1);
+            obj.sfform = cell(npatches,1);
             obj.aspect_ratio = zeros(obj.npts,1);
             obj.patch_distortion = zeros(obj.npatches,1);
             obj.cms = zeros(3,obj.npatches);
@@ -282,6 +284,7 @@
                 sfform(2,1,iind) = M;
                 sfform(2,2,iind) = N;
 
+                obj.sfform{i} = sfform(:,:,iind);
                 % Mean curvature (LG-2MF+NE)/2(EG-F^2):
                 obj.mean_curv(iind) = -0.5*(L.*dvnormsq - ...
                                        2*M.*duv + dunormsq.*N).*ddinv;

matlab/fmm3dbie_routs.mw

@@ -684,76 +684,6 @@ end
 %
 %
 %
-@ src/get_first_fundamental_form.m
-function [ffrm] = get_first_fundamental_form(S,p,varargin)
-%
-%
-%
-%
-%  Input arguments:
-%    * S: surfer object
-%    * opts: options struct (optional)
-%
-%  Output arguments:
-%
-
-    opts = [];
-    if(nargin == 2)
-       opts = varargin{1};
-    end
-     
-% Extract arrays
-    [srcvals,srccoefs,norders,ixyzs,iptype,wts] = extract_arrays(S);
-    [n12,npts] = size(srcvals);
-    [n9,~] = size(srccoefs);
-    [npatches,~] = size(norders);
-    npatp1 = npatches+1;
-
-
-    ffrm = zeros(4,npts);
-    # FORTRAN get_first_fundamental_form(int[1] npatches, int[npatches] norders, int[npatp1] ixyzs, int[npatches] iptype, int[1] npts, double[n9,npts] srccoefs, double[n12,npts] srcvals, inout double[4,npts] ffrm);
-
-    ffrm = reshape(ffrm,[2,2,npts]);    
-
-end
-
-%
-%
-%
-%
-%
-@ src/get_second_fundamental_form.m
-function [ffrm] = get_second_fundamental_form(S,p,varargin)
-%
-%
-%
-%
-%  Input arguments:
-%    * S: surfer object
-%    * opts: options struct (optional)
-%
-%  Output arguments:
-%
-
-    opts = [];
-    if(nargin == 2)
-       opts = varargin{1};
-    end
-     
-% Extract arrays
-    [srcvals,srccoefs,norders,ixyzs,iptype,wts] = extract_arrays(S);
-    [n12,npts] = size(srcvals);
-    [n9,~] = size(srccoefs);
-    [npatches,~] = size(norders);
-    npatp1 = npatches+1;
-
-
-    ffrm = zeros(4,npts);
-    # FORTRAN get_second_fundamental_form(int[1] npatches, int[npatches] norders, int[npatp1] ixyzs, int[npatches] iptype, int[1] npts, double[n9,npts] srccoefs, double[n12,npts] srcvals, inout double[4,npts] ffrm);
-
-    ffrm = reshape(ffrm,[2,2,npts]);    
-
-end
 
 %-------------------------------------------------
 %

matlab/src/get_oversampling_parameters.m

@@ -1,4 +1,4 @@
-function [novers, varargout] = get_oversampling_parameters(S, Q, eps)
+function [novers,varargout] = get_oversampling_parameters(S,Q,eps)
 %
 %  get_oversampling_parameters
 %     subroutine to estimate the oversampling paramters for a given