/[escript]/branches/arrayview_from_1695_trunk/escript/src/UnaryOp.h
ViewVC logotype

Diff of /branches/arrayview_from_1695_trunk/escript/src/UnaryOp.h

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

trunk/esys2/escript/src/Data/UnaryOp.h revision 121 by jgs, Fri May 6 04:26:16 2005 UTC trunk/escript/src/UnaryOp.h revision 757 by woo409, Mon Jun 26 13:12:56 2006 UTC
# Line 1  Line 1 
1  // $Id$  // $Id$
2  /*  /*
3   ******************************************************************************   ************************************************************
4   *                                                                            *   *          Copyright 2006 by ACcESS MNRF                   *
5   *       COPYRIGHT  ACcESS 2004 -  All Rights Reserved                        *   *                                                          *
6   *                                                                            *   *              http://www.access.edu.au                    *
7   * This software is the property of ACcESS. No part of this code              *   *       Primary Business: Queensland, Australia            *
8   * may be copied in any form or by any means without the expressed written    *   *  Licensed under the Open Software License version 3.0    *
9   * consent of ACcESS.  Copying, use or modification of this software          *   *     http://www.opensource.org/licenses/osl-3.0.php       *
10   * by any unauthorised person is illegal unless that person has a software    *   *                                                          *
11   * license agreement with ACcESS.                                             *   ************************************************************
  *                                                                            *  
  ******************************************************************************  
12  */  */
13                                                                              
14  #if !defined escript_UnaryOp_20040315_H  #if !defined escript_UnaryOp_20040315_H
15  #define escript_UnaryOp_20040315_H  #define escript_UnaryOp_20040315_H
16    #include "system_dep.h"
17    
18  #include "escript/Data/DataException.h"  #include "DataArrayView.h"
19  #include "escript/Data/DataArrayView.h"  #include "DataConstant.h"
20  #include "escript/Data/DataConstant.h"  #include "DataTagged.h"
21  #include "escript/Data/DataExpanded.h"  #include "DataExpanded.h"
 #include "escript/Data/DataTagged.h"  
   
 #include <iostream>  
 #include <boost/scoped_ptr.hpp>  
 #include <functional>  
 #include <string>  
22    
23  namespace escript {  namespace escript {
24    
# Line 48  unaryOp(DataExpanded& data, Line 41  unaryOp(DataExpanded& data,
41    int i,j;    int i,j;
42    DataArrayView::ValueType::size_type numDPPSample=data.getNumDPPSample();    DataArrayView::ValueType::size_type numDPPSample=data.getNumDPPSample();
43    DataArrayView::ValueType::size_type numSamples=data.getNumSamples();    DataArrayView::ValueType::size_type numSamples=data.getNumSamples();
44  #pragma omp parallel for private(i,j) schedule(static)    #pragma omp parallel for private(i,j) schedule(static)
45    for (i=0;i<numSamples;i++) {    for (i=0;i<numSamples;i++) {
46      for (j=0;j<numDPPSample;j++) {      for (j=0;j<numDPPSample;j++) {
47        data.getPointDataView().unaryOp(data.getPointOffset(i,j),operation);        data.getPointDataView().unaryOp(data.getPointOffset(i,j),operation);

Legend:
Removed from v.121  
changed lines
  Added in v.757

  ViewVC Help
Powered by ViewVC 1.1.26