[Teem-commit] teem/src/gage vecGage.c,1.15,1.16

[Gordon K. <kin...@us...>]

Update of /cvsroot/teem/teem/src/gage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29006

Modified Files:
	vecGage.c 
Log Message:
made the vector kind row-major compliant

Index: vecGage.c
===================================================================
RCS file: /cvsroot/teem/teem/src/gage/vecGage.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** vecGage.c	13 Feb 2004 23:12:52 -0000	1.15
--- vecGage.c	25 Mar 2004 01:37:45 -0000	1.16
***************
*** 30,34 ****
    {gageVecDivergence,    1,  1,  {gageVecJacobian, -1, -1, -1, -1},                              -1,  -1},
    {gageVecCurl,          3,  1,  {gageVecJacobian, -1, -1, -1, -1},                              -1,  -1},
!   /* HEY: if teem matrices go to row-major, these will change to sub-items */
    {gageVecGradient0,     3,  1,  {gageVecJacobian, -1, -1, -1, -1},                              -1,  -1},
    {gageVecGradient1,     3,  1,  {gageVecJacobian, -1, -1, -1, -1},                              -1,  -1},
--- 30,34 ----
    {gageVecDivergence,    1,  1,  {gageVecJacobian, -1, -1, -1, -1},                              -1,  -1},
    {gageVecCurl,          3,  1,  {gageVecJacobian, -1, -1, -1, -1},                              -1,  -1},
!   /* HEY: these should change to sub-items!!! */
    {gageVecGradient0,     3,  1,  {gageVecJacobian, -1, -1, -1, -1},                              -1,  -1},
    {gageVecGradient1,     3,  1,  {gageVecJacobian, -1, -1, -1, -1},                              -1,  -1},
***************
*** 86,97 ****
    }
  
-   if (pvl->needD[1]) {
-     /* because we operated component-at-a-time, and because matrices are
-        in column order, the 1st column currently contains the three
-        derivatives of the X component; this should be the 1st row, and
-        likewise for the 2nd and 3rd column/rows.  */
-     ELL_3M_TRANSPOSE_IP(jac, tmp);
-   }
- 
    return;
  }
--- 86,89 ----
***************
*** 126,132 ****
      /* done if doV1 */
      /*
!       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
      */
      if (ctx->verbose) {
--- 118,124 ----
      /* done if doV1 */
      /*
!       0:dv_x/dx  1:dv_x/dy  2:dv_x/dz
!       3:dv_y/dx  4:dv_y/dy  5:dv_y/dz
!       6:dv_z/dx  7:dv_z/dy  8:dv_z/dz
      */
      if (ctx->verbose) {
***************
*** 145,168 ****
    if (GAGE_QUERY_ITEM_TEST(pvl->query, gageVecCurl)) {
      ELL_3V_SET(pvl->directAnswer[gageVecCurl],
! 	       jacAns[5] - jacAns[7],
! 	       jacAns[6] - jacAns[2],
! 	       jacAns[1] - jacAns[3]);
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, gageVecGradient0)) {
      ELL_3V_SET(pvl->directAnswer[gageVecGradient0],
  	       jacAns[0],
! 	       jacAns[3],
! 	       jacAns[6]);
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, gageVecGradient1)) {
      ELL_3V_SET(pvl->directAnswer[gageVecGradient1],
! 	       jacAns[1],
  	       jacAns[4],
! 	       jacAns[7]);
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, gageVecGradient2)) {
      ELL_3V_SET(pvl->directAnswer[gageVecGradient2],
! 	       jacAns[2],
! 	       jacAns[5],
  	       jacAns[8]);
    }
--- 137,160 ----
    if (GAGE_QUERY_ITEM_TEST(pvl->query, gageVecCurl)) {
      ELL_3V_SET(pvl->directAnswer[gageVecCurl],
! 	       jacAns[7] - jacAns[5],
! 	       jacAns[2] - jacAns[6],
! 	       jacAns[3] - jacAns[1]);
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, gageVecGradient0)) {
      ELL_3V_SET(pvl->directAnswer[gageVecGradient0],
  	       jacAns[0],
! 	       jacAns[1],
! 	       jacAns[2]);
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, gageVecGradient1)) {
      ELL_3V_SET(pvl->directAnswer[gageVecGradient1],
! 	       jacAns[3],
  	       jacAns[4],
! 	       jacAns[5]);
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, gageVecGradient2)) {
      ELL_3V_SET(pvl->directAnswer[gageVecGradient2],
! 	       jacAns[6],
! 	       jacAns[7],
  	       jacAns[8]);
    }