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

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

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

revision 2784 by lgao, Thu Nov 26 05:07:33 2009 UTC revision 2785 by lgao, Thu Nov 26 05:17:40 2009 UTC
# Line 2469  C_TensorBinaryOperation(Data const &arg_ Line 2469  C_TensorBinaryOperation(Data const &arg_
2469        DataExpanded* tmp_1=dynamic_cast<DataExpanded*>(arg_1_Z.borrowData());        DataExpanded* tmp_1=dynamic_cast<DataExpanded*>(arg_1_Z.borrowData());
2470        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2471    
2472        int sampleNo_1,dataPointNo_1;        int sampleNo_1;
2473        int numSamples_1 = arg_1_Z.getNumSamples();        int numSamples_1 = arg_1_Z.getNumSamples();
2474        int numDataPointsPerSample_1 = arg_1_Z.getNumDataPointsPerSample();        int numDataPointsPerSample_1 = arg_1_Z.getNumDataPointsPerSample();
2475        int offset_0 = tmp_0->getPointOffset(0,0);        int offset_0 = tmp_0->getPointOffset(0,0);
# Line 2477  C_TensorBinaryOperation(Data const &arg_ Line 2477  C_TensorBinaryOperation(Data const &arg_
2477        double ptr_0 = ptr_src[0];        double ptr_0 = ptr_src[0];
2478        int size = size1*numDataPointsPerSample_1;        int size = size1*numDataPointsPerSample_1;
2479        res.requireWrite();        res.requireWrite();
2480        #pragma omp parallel for private(sampleNo_1,dataPointNo_1) schedule(static)        #pragma omp parallel for private(sampleNo_1) schedule(static)
2481        for (sampleNo_1 = 0; sampleNo_1 < numSamples_1; sampleNo_1++) {        for (sampleNo_1 = 0; sampleNo_1 < numSamples_1; sampleNo_1++) {
2482  //        for (dataPointNo_1 = 0; dataPointNo_1 < numDataPointsPerSample_1; dataPointNo_1++) {  //        for (dataPointNo_1 = 0; dataPointNo_1 < numDataPointsPerSample_1; dataPointNo_1++) {
2483            int offset_1 = tmp_1->getPointOffset(sampleNo_1,0);            int offset_1 = tmp_1->getPointOffset(sampleNo_1,0);
# Line 2845  C_TensorBinaryOperation(Data const &arg_ Line 2845  C_TensorBinaryOperation(Data const &arg_
2845        DataConstant* tmp_1=dynamic_cast<DataConstant*>(arg_1_Z.borrowData());        DataConstant* tmp_1=dynamic_cast<DataConstant*>(arg_1_Z.borrowData());
2846        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2847    
2848        int sampleNo_0,dataPointNo_0;        int sampleNo_0;
2849        int numSamples_0 = arg_0_Z.getNumSamples();        int numSamples_0 = arg_0_Z.getNumSamples();
2850        int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();        int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();
2851        int offset_1 = tmp_1->getPointOffset(0,0);        int offset_1 = tmp_1->getPointOffset(0,0);
# Line 2853  C_TensorBinaryOperation(Data const &arg_ Line 2853  C_TensorBinaryOperation(Data const &arg_
2853        double ptr_1 = ptr_src[0];        double ptr_1 = ptr_src[0];
2854        int size = size0 * numDataPointsPerSample_0;        int size = size0 * numDataPointsPerSample_0;
2855        res.requireWrite();        res.requireWrite();
2856        #pragma omp parallel for private(sampleNo_0,dataPointNo_0) schedule(static)        #pragma omp parallel for private(sampleNo_0) schedule(static)
2857        for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {        for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {
2858  //        for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {  //        for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {
2859            int offset_0 = tmp_0->getPointOffset(sampleNo_0,0);            int offset_0 = tmp_0->getPointOffset(sampleNo_0,0);
Legend:
Removed from v.2784  
changed lines
  Added in v.2785
  ViewVC Help
Powered by ViewVC 1.1.26