/[escript]/trunk/escript/src/Data.cpp
ViewVC logotype

Diff of /trunk/escript/src/Data.cpp

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

revision 813 by ksteube, Mon Aug 21 02:08:47 2006 UTC revision 814 by gross, Wed Aug 23 09:31:10 2006 UTC
# Line 2595  escript::C_GeneralTensorProduct(Data& ar Line 2595  escript::C_GeneralTensorProduct(Data& ar
2595    if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {    if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {
2596      if (arg_0.probeInterpolation(arg_1.getFunctionSpace())) {      if (arg_0.probeInterpolation(arg_1.getFunctionSpace())) {
2597        Data arg_0_tmp = arg_0.interpolate(arg_1.getFunctionSpace());        Data arg_0_tmp = arg_0.interpolate(arg_1.getFunctionSpace());
2598        arg_1=arg_0_tmp;        arg_0=arg_0_tmp;
2599      }      }
2600      else if (arg_1.probeInterpolation(arg_0.getFunctionSpace())) {      else if (arg_1.probeInterpolation(arg_0.getFunctionSpace())) {
2601        arg_1=arg_1.interpolate(arg_0.getFunctionSpace());        arg_1=arg_1.interpolate(arg_0.getFunctionSpace());
# Line 2604  escript::C_GeneralTensorProduct(Data& ar Line 2604  escript::C_GeneralTensorProduct(Data& ar
2604        throw DataException("Error - C_GeneralTensorProduct: arguments have incompatible function spaces.");        throw DataException("Error - C_GeneralTensorProduct: arguments have incompatible function spaces.");
2605      }      }
2606    }    }
   
2607    // Get rank and shape of inputs    // Get rank and shape of inputs
2608    int rank0 = arg_0.getDataPointRank();    int rank0 = arg_0.getDataPointRank();
2609    int rank1 = arg_1.getDataPointRank();    int rank1 = arg_1.getDataPointRank();

Legend:
Removed from v.813  
changed lines
  Added in v.814

  ViewVC Help
Powered by ViewVC 1.1.26