Modifying common curve properties

This commit is contained in:
James E McClure 2014-10-15 20:29:37 -04:00
parent a3bdeb504f
commit c14be0cf64

View File

@ -4189,8 +4189,9 @@ inline void pmmc_CommonCurveSpeed(DoubleArray &CubeValues, DoubleArray &dPdt, Do
} }
} }
inline void pmmc_CurveCurvature(){ inline void pmmc_CurveCurvature(DoubleArray &f, DoubleArray &s){
int p,i,j,k;
double fxx,fyy,fzz,fxy,fxz,fyz,fx,fy,fz; double fxx,fyy,fzz,fxy,fxz,fyz,fx,fy,fz;
double sxx,syy,szz,sxy,sxz,syz,sx,sy,sz; double sxx,syy,szz,sxy,sxz,syz,sx,sy,sz;
@ -4224,15 +4225,15 @@ inline void pmmc_CurveCurvature(){
syz = 0.25*(s(i,j+1,k+1) - s(i,j+1,k-1) - s(i,j-1,k+1) + s(i,j-1,k-1)); syz = 0.25*(s(i,j+1,k+1) - s(i,j+1,k-1) - s(i,j-1,k+1) + s(i,j-1,k-1));
// Compute the Jacobean matrix for tangent vector // Compute the Jacobean matrix for tangent vector
Gxx = sxy*fz + sy*fxz - sxz*fy - sz*fxy; Axx = sxy*fz + sy*fxz - sxz*fy - sz*fxy;
Gxy = sxz*fx + sz*fxx - sxx*fz - sx*fxz; Axy = sxz*fx + sz*fxx - sxx*fz - sx*fxz;
Gxz = sxx*fy + sx*fxy - sxy*fx - sy*fxx; Axz = sxx*fy + sx*fxy - sxy*fx - sy*fxx;
Gyx = syy*fz + sy*fyz - syz*fy - sz*fyy; Ayx = syy*fz + sy*fyz - syz*fy - sz*fyy;
Gyy = syz*fx + sz*fxy - sxy*fz - sx*fyz; Ayy = syz*fx + sz*fxy - sxy*fz - sx*fyz;
Gyz = sxy*fy + sx*fyy - syy*fx - sy*fxy; Ayz = sxy*fy + sx*fyy - syy*fx - sy*fxy;
Gxx = syz*fz + sy*fzz - szz*fy - sz*fyz; Axx = syz*fz + sy*fzz - szz*fy - sz*fyz;
Gxy = szz*fx + sz*fxz - sxz*fz - sx*fzz; Axy = szz*fx + sz*fxz - sxz*fz - sx*fzz;
Gxz = sxz*fy + sx*fyz - syz*fx - sy*fxz; Axz = sxz*fy + sx*fyz - syz*fx - sy*fxz;
// Compute the tangent vector // Compute the tangent vector
Tx[p] = sy*fz-sz*fy; Tx[p] = sy*fz-sz*fy;