/[escript]/branches/arrayview_from_1695_trunk/escript/src/Data.cpp
ViewVC logotype

Diff of /branches/arrayview_from_1695_trunk/escript/src/Data.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1709 by jfenwick, Thu Aug 14 05:35:32 2008 UTC revision 1710 by jfenwick, Fri Aug 15 06:24:20 2008 UTC
# Line 2168  escript::C_GeneralTensorProduct(Data& ar Line 2168  escript::C_GeneralTensorProduct(Data& ar
2168    // General tensor product: res(SL x SR) = arg_0(SL x SM) * arg_1(SM x SR)    // General tensor product: res(SL x SR) = arg_0(SL x SM) * arg_1(SM x SR)
2169    // SM is the product of the last axis_offset entries in arg_0.getShape().    // SM is the product of the last axis_offset entries in arg_0.getShape().
2170    
2171      return C_GeneralTensorProduct_J(arg_0, arg_1, axis_offset, transpose);
2172    
2173    // Interpolate if necessary and find an appropriate function space    // Interpolate if necessary and find an appropriate function space
2174    Data arg_0_Z, arg_1_Z;    Data arg_0_Z, arg_1_Z;
2175    if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {    if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {

Legend:
Removed from v.1709  
changed lines
  Added in v.1710

  ViewVC Help
Powered by ViewVC 1.1.26