|
From: Gordon K. <kin...@us...> - 2004-04-22 07:27:59
|
Update of /cvsroot/teem/teem/src/gage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8925 Modified Files: gage.h vecGage.c Log Message: added sub-items for the individual vector components Index: gage.h =================================================================== RCS file: /cvsroot/teem/teem/src/gage/gage.h,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** gage.h 11 Apr 2004 02:31:41 -0000 1.65 --- gage.h 22 Apr 2004 07:19:00 -0000 1.66 *************** *** 279,296 **** gageVecUnknown=-1, /* -1: nobody knows */ gageVecVector, /* 0: "v", component-wise-intrpolated (CWI) vec: GT[3] */ ! gageVecLength, /* 1: "l", length of CWI vector: GT[1] */ ! gageVecNormalized, /* 2: "n", normalized CWI vector: GT[3] */ ! gageVecJacobian, /* 3: "j", component-wise Jacobian: GT[9] 0:dv_x/dx 3:dv_x/dy 6:dv_x/dz 1:dv_y/dx 4:dv_y/dy 7:dv_y/dz 2:dv_z/dx 5:dv_z/dy 8:dv_z/dz */ ! gageVecDivergence, /* 4: "d", divergence (based on Jacobian): GT[1] */ ! gageVecCurl, /* 5: "c", curl (based on Jacobian): GT[3] */ ! gageVecCurlNorm, /* 6: "cm", curl magnitude: GT[1] */ ! gageVecHelicity, /* 7: "h", helicity: vec . curl: GT[1] */ ! gageVecNormHelicity,/* 8: "nh", normalized helicity: GT[1] */ ! gageVecLambda2, /* 9: "lmbda2", lambda2 criterion: GT[1] */ ! gageVecImaginaryPart,/* 10: "imag", imag. part of jacobian's eigenv: GT[1] */ ! gageVecHessian, /* 11: "vh", second-order derivative: GT[27] 0:d2v_x/dxdx 1:d2v_x/dxdy 2:d2v_x/dxdz 3:d2v_x/dydx 4:d2v_x/dydy 5:d2v_x/dydz --- 279,299 ---- gageVecUnknown=-1, /* -1: nobody knows */ gageVecVector, /* 0: "v", component-wise-intrpolated (CWI) vec: GT[3] */ ! gageVecVector0, /* 1: "v0", vector[0]: GT[1] */ ! gageVecVector1, /* 2: "v1", vector[0]: GT[1] */ ! gageVecVector2, /* 3: "v2", vector[0]: GT[1] */ ! gageVecLength, /* 4: "l", length of CWI vector: GT[1] */ ! gageVecNormalized, /* 5: "n", normalized CWI vector: GT[3] */ ! gageVecJacobian, /* 6: "j", component-wise Jacobian: GT[9] 0:dv_x/dx 3:dv_x/dy 6:dv_x/dz 1:dv_y/dx 4:dv_y/dy 7:dv_y/dz 2:dv_z/dx 5:dv_z/dy 8:dv_z/dz */ ! gageVecDivergence, /* 7: "d", divergence (based on Jacobian): GT[1] */ ! gageVecCurl, /* 8: "c", curl (based on Jacobian): GT[3] */ ! gageVecCurlNorm, /* 9: "cm", curl magnitude: GT[1] */ ! gageVecHelicity, /* 10: "h", helicity: vec . curl: GT[1] */ ! gageVecNormHelicity,/*11: "nh", normalized helicity: GT[1] */ ! gageVecLambda2, /* 12: "lmbda2", lambda2 criterion: GT[1] */ ! gageVecImaginaryPart,/* 13: "imag", imag. part of jacobian's eigenv: GT[1] */ ! gageVecHessian, /* 14: "vh", second-order derivative: GT[27] 0:d2v_x/dxdx 1:d2v_x/dxdy 2:d2v_x/dxdz 3:d2v_x/dydx 4:d2v_x/dydy 5:d2v_x/dydz *************** *** 299,319 **** [...] 24:dv2_z/dzdx 25:d2v_z/dzdy 26:d2v_z/dzdz */ ! gageVecDivGradient,/* 12: "dg", divergence gradient: GT[3] */ ! gageVecCurlGradient,/*13: "cg", curl gradient: GT[9] */ ! gageVecCurlNormGrad,/*14: "cng", curl norm gradient: GT[3] */ ! gageVecNCurlNormGrad, /* 15: "ncng", normalized curl norm gradient: GT[3] */ ! gageVecHelGradient,/* 16: "hg", helicity gradient: GT[3] */ ! gageVecDirHelDeriv,/* 17: "dhd", directional derivative of helicity: GT[1] */ ! gageVecProjHelGradient, /* 18: "phg", projected helicity gradient: GT[3] */ ! gageVecGradient0, /* 19: "g0", gradient of 1st component of vector: GT[3] */ ! gageVecGradient1, /* 20: "g1", gradient of 2nd component of vector: GT[3] */ ! gageVecGradient2, /* 21: "g2", gradient of 3rd component of vector: GT[3] */ ! gageVecMultiGrad, /* 22: "mg", sum of outer products of gradients: GT[9] */ ! gageVecMGFrob, /* 23: "mgfrob", frob norm of multi-gradient: GT[1] */ ! gageVecMGEval, /* 24: "mgeval", eigenvalues of multi-gradient: GT[3] */ ! gageVecMGEvec, /* 25: "mgevec", eigenvectors of multi-gradient: GT[9] */ gageVecLast }; ! #define GAGE_VEC_ITEM_MAX 25 struct gageKind_t; /* dumb forward declaraction, ignore */ --- 302,322 ---- [...] 24:dv2_z/dzdx 25:d2v_z/dzdy 26:d2v_z/dzdz */ ! gageVecDivGradient,/* 15: "dg", divergence gradient: GT[3] */ ! gageVecCurlGradient,/*16: "cg", curl gradient: GT[9] */ ! gageVecCurlNormGrad,/*17: "cng", curl norm gradient: GT[3] */ ! gageVecNCurlNormGrad, /* 18: "ncng", normalized curl norm gradient: GT[3] */ ! gageVecHelGradient,/* 19: "hg", helicity gradient: GT[3] */ ! gageVecDirHelDeriv,/* 20: "dhd", directional derivative of helicity: GT[1] */ ! gageVecProjHelGradient, /* 21: "phg", projected helicity gradient: GT[3] */ ! gageVecGradient0, /* 22: "g0", gradient of 1st component of vector: GT[3] */ ! gageVecGradient1, /* 23: "g1", gradient of 2nd component of vector: GT[3] */ ! gageVecGradient2, /* 24: "g2", gradient of 3rd component of vector: GT[3] */ ! gageVecMultiGrad, /* 25: "mg", sum of outer products of gradients: GT[9] */ ! gageVecMGFrob, /* 26: "mgfrob", frob norm of multi-gradient: GT[1] */ ! gageVecMGEval, /* 27: "mgeval", eigenvalues of multi-gradient: GT[3] */ ! gageVecMGEvec, /* 28: "mgevec", eigenvectors of multi-gradient: GT[9] */ gageVecLast }; ! #define GAGE_VEC_ITEM_MAX 28 struct gageKind_t; /* dumb forward declaraction, ignore */ Index: vecGage.c =================================================================== RCS file: /cvsroot/teem/teem/src/gage/vecGage.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** vecGage.c 11 Apr 2004 02:31:41 -0000 1.20 --- vecGage.c 22 Apr 2004 07:19:00 -0000 1.21 *************** *** 62,65 **** --- 62,68 ---- /* enum value len,deriv, prereqs, parent item, index*/ {gageVecVector, 3, 0, {-1, -1, -1, -1, -1}, -1, -1}, + {gageVecVector0, 1, 0, {gageVecVector, -1, -1, -1, -1}, gageVecVector, 0}, + {gageVecVector1, 1, 0, {gageVecVector, -1, -1, -1, -1}, gageVecVector, 1}, + {gageVecVector2, 1, 0, {gageVecVector, -1, -1, -1, -1}, gageVecVector, 2}, {gageVecLength, 1, 0, {gageVecVector, -1, -1, -1, -1}, -1, -1}, {gageVecNormalized, 3, 0, {gageVecVector, gageVecLength, -1, -1, -1}, -1, -1}, *************** *** 150,154 **** gage_t *vecAns, *normAns, *jacAns, *curlAns, *hesAns, *curlGradAns, *helGradAns, *dirHelDirAns, *curlnormgradAns; ! int asw; vecAns = pvl->directAnswer[gageVecVector]; --- 153,157 ---- gage_t *vecAns, *normAns, *jacAns, *curlAns, *hesAns, *curlGradAns, *helGradAns, *dirHelDirAns, *curlnormgradAns; ! /* int asw; */ vecAns = pvl->directAnswer[gageVecVector]; *************** *** 169,172 **** --- 172,179 ---- } } + /* done if doV + if (GAGE_QUERY_ITEM_TEST(pvl->query, gageVecVector{0,1,2})) { + } + */ if (GAGE_QUERY_ITEM_TEST(pvl->query, gageVecLength)) { pvl->directAnswer[gageVecLength][0] = ELL_3V_LEN(vecAns); *************** *** 232,236 **** ELL_3M_ADD2(symm, symm, tmpMat); /* get eigenvalues in sorted order */ ! asw = ell_3m_eigenvalues_d(eval, symm, AIR_TRUE); pvl->directAnswer[gageVecLambda2][0] = eval[1]; } --- 239,243 ---- ELL_3M_ADD2(symm, symm, tmpMat); /* get eigenvalues in sorted order */ ! /* asw = */ ell_3m_eigenvalues_d(eval, symm, AIR_TRUE); pvl->directAnswer[gageVecLambda2][0] = eval[1]; } *************** *** 383,386 **** --- 390,396 ---- "(unknown gageVec)", "vector", + "vector0", + "vector1", + "vector2", "length", "normalized", *************** *** 413,416 **** --- 423,429 ---- "unknown gageVec query", "component-wise-interpolated vector", + "vector[0]", + "vector[1]", + "vector[2]", "length of vector", "normalized vector", *************** *** 443,446 **** --- 456,462 ---- gageVecUnknown, gageVecVector, + gageVecVector0, + gageVecVector1, + gageVecVector2, gageVecLength, gageVecNormalized, *************** *** 471,474 **** --- 487,493 ---- #define GV_V gageVecVector + #define GV_V0 gageVecVector0 + #define GV_V1 gageVecVector1 + #define GV_V2 gageVecVector2 #define GV_L gageVecLength #define GV_N gageVecNormalized *************** *** 500,503 **** --- 519,525 ---- _gageVecStrEqv[][AIR_STRLEN_SMALL] = { "v", "vector", "vec", + "v0", "vector0", "vec0", + "v1", "vector1", "vec1", + "v2", "vector2", "vec2", "l", "length", "len", "n", "normalized", "normalized vector", *************** *** 531,534 **** --- 553,559 ---- _gageVecValEqv[] = { GV_V, GV_V, GV_V, + GV_V0, GV_V0, GV_V0, + GV_V1, GV_V1, GV_V1, + GV_V2, GV_V2, GV_V2, GV_L, GV_L, GV_L, GV_N, GV_N, GV_N, |