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

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

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

revision 580 by gross, Wed Mar 8 05:45:51 2006 UTC revision 584 by gross, Thu Mar 9 23:03:38 2006 UTC
# Line 467  DataExpanded::copyAll(const boost::pytho Line 467  DataExpanded::copyAll(const boost::pytho
467  void  void
468  DataExpanded::eigenvalues(DataAbstract* ev)  DataExpanded::eigenvalues(DataAbstract* ev)
469  {  {
470      int sampleNo,dataPointNo;
471    int numSamples = getNumSamples();    int numSamples = getNumSamples();
472    int numDataPointsPerSample = getNumDPPSample();    int numDataPointsPerSample = getNumDPPSample();
473    DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);    DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
# Line 476  DataExpanded::eigenvalues(DataAbstract* Line 477  DataExpanded::eigenvalues(DataAbstract*
477    DataArrayView& thisView=getPointDataView();    DataArrayView& thisView=getPointDataView();
478    DataArrayView& evView=ev->getPointDataView();    DataArrayView& evView=ev->getPointDataView();
479    #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)    #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
480    for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {    for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
481      for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {      for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
482           DataArrayView::eigenvalues(thisView,getPointOffset(sampleNo,dataPointNo),           DataArrayView::eigenvalues(thisView,getPointOffset(sampleNo,dataPointNo),
483                                      evView,ev->getPointOffset(sampleNo,dataPointNo));                                      evView,ev->getPointOffset(sampleNo,dataPointNo));
484      }      }
# Line 488  DataExpanded::eigenvalues_and_eigenvecto Line 489  DataExpanded::eigenvalues_and_eigenvecto
489  {  {
490    int numSamples = getNumSamples();    int numSamples = getNumSamples();
491    int numDataPointsPerSample = getNumDPPSample();    int numDataPointsPerSample = getNumDPPSample();
492      int sampleNo,dataPointNo;
493    DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);    DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
494    if (temp_ev==0) {    if (temp_ev==0) {
495      throw DataException("Error - DataExpanded::eigenvalues_and_eigenvectors: casting to DataExpanded failed (propably a programming error).");      throw DataException("Error - DataExpanded::eigenvalues_and_eigenvectors: casting to DataExpanded failed (propably a programming error).");
# Line 500  DataExpanded::eigenvalues_and_eigenvecto Line 502  DataExpanded::eigenvalues_and_eigenvecto
502    DataArrayView& evView=ev->getPointDataView();    DataArrayView& evView=ev->getPointDataView();
503    DataArrayView& VView=V->getPointDataView();    DataArrayView& VView=V->getPointDataView();
504    #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)    #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
505    for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {    for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
506      for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {      for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
507           DataArrayView::eigenvalues_and_eigenvectors(thisView,getPointOffset(sampleNo,dataPointNo),           DataArrayView::eigenvalues_and_eigenvectors(thisView,getPointOffset(sampleNo,dataPointNo),
508                                                       evView,ev->getPointOffset(sampleNo,dataPointNo),                                                       evView,ev->getPointOffset(sampleNo,dataPointNo),
509                                                       VView,V->getPointOffset(sampleNo,dataPointNo),                                                       VView,V->getPointOffset(sampleNo,dataPointNo),

Legend:
Removed from v.580  
changed lines
  Added in v.584

  ViewVC Help
Powered by ViewVC 1.1.26