Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/vector.cpp

    rd09ff7 r29812d  
    225225  Direction.CopyVector(LineVector);
    226226  Direction.SubtractVector(Origin);
    227   Direction.Normalize();
    228227  //*out << Verbose(4) << "INFO: Direction is " << Direction << "." << endl;
    229228  factor = Direction.ScalarProduct(PlaneNormal);
     
    235234  helper.SubtractVector(Origin);
    236235  factor = helper.ScalarProduct(PlaneNormal)/factor;
    237   if (factor < MYEPSILON) { // Origin is in-plane
    238     //*out << Verbose(2) << "Origin of line is in-plane, simple." << endl;
    239     CopyVector(Origin);
    240     return true;
    241   }
    242236  //factor = Origin->ScalarProduct(PlaneNormal)*(-PlaneOffset->ScalarProduct(PlaneNormal))/(Direction.ScalarProduct(PlaneNormal));
    243237  Direction.Scale(factor);
     
    661655};
    662656
    663 /** Given a box by its matrix \a *M and its inverse *Minv the vector is made to point within that box.
    664  * \param *M matrix of box
    665  * \param *Minv inverse matrix
    666  */
    667 void Vector::WrapPeriodically(const double *M, const double *Minv)
    668 {
    669   MatrixMultiplication(Minv);
    670   // truncate to [0,1] for each axis
    671   for (int i=0;i<NDIM;i++) {
    672     x[i] += 0.5;  // set to center of box
    673     while (x[i] >= 1.)
    674       x[i] -= 1.;
    675     while (x[i] < 0.)
    676       x[i] += 1.;
    677   }
    678   MatrixMultiplication(M);
    679 };
    680 
    681657/** Do a matrix multiplication.
    682658 * \param *matrix NDIM_NDIM array
    683659 */
    684 void Vector::MatrixMultiplication(const double *M)
     660void Vector::MatrixMultiplication(double *M)
    685661{
    686662  Vector C;
     
    724700 * \param *matrix NDIM_NDIM array
    725701 */
    726 void Vector::InverseMatrixMultiplication(const double *A)
     702void Vector::InverseMatrixMultiplication(double *A)
    727703{
    728704  Vector C;
Note: See TracChangeset for help on using the changeset viewer.