/[escript]/branches/arrexp_2137_win_merge/escript/src/DataExpanded.cpp
ViewVC logotype

Diff of /branches/arrexp_2137_win_merge/escript/src/DataExpanded.cpp

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

revision 2220 by jfenwick, Wed Jan 14 04:31:34 2009 UTC revision 2221 by jfenwick, Mon Jan 19 06:11:25 2009 UTC
# Line 33  using namespace boost; Line 33  using namespace boost;
33  using namespace escript::DataTypes;  using namespace escript::DataTypes;
34    
35    
36  #define CHECK_FOR_EX_WRITE if (!checkNoSharing()) {throw DataException("Attempt to modify shared object");}  // #define CHECK_FOR_EX_WRITE if (!checkNoSharing()) {throw DataException("Attempt to modify shared object");}
37    
38  // #define CHECK_FOR_EX_WRITE if (!checkNoSharing()) {std::ostringstream ss; ss << " Attempt to modify shared object. line " << __LINE__ << " of " << __FILE__; throw DataException(ss.str());}  #define CHECK_FOR_EX_WRITE if (!checkNoSharing()) {std::ostringstream ss; ss << " Attempt to modify shared object. line " << __LINE__ << " of " << __FILE__; *((int*)0)=17;throw DataException(ss.str());}
39    
40  namespace escript {  namespace escript {
41    
# Line 115  DataExpanded::DataExpanded(const DataExp Line 115  DataExpanded::DataExpanded(const DataExp
115    for (i=0;i<numRows;i++) {    for (i=0;i<numRows;i++) {
116      for (j=0;j<numCols;j++) {      for (j=0;j<numCols;j++) {
117        try {        try {
 //         getPointDataView().copySlice(getPointOffset(i,j),  
 //                                      other.getPointDataView(),  
 //                                      other.getPointOffset(i,j),  
 //                                      region_loop_range);  
118          DataTypes::copySlice(getVector(),getShape(),getPointOffset(i,j),          DataTypes::copySlice(getVector(),getShape(),getPointOffset(i,j),
119                                       other.getVector(),                                       other.getVector(),
120                       other.getShape(),                       other.getShape(),
# Line 132  DataExpanded::DataExpanded(const DataExp Line 128  DataExpanded::DataExpanded(const DataExp
128    }    }
129  }  }
130    
 // DataExpanded::DataExpanded(const DataArrayView& value,  
 //                            const FunctionSpace& what)  
 //   : DataAbstract(what)  
 // {  
 //   //  
 //   // get the shape of the given data value  
 //   DataTypes::ShapeType tempShape=value.getShape();  
 //   //  
 //   // initialise this Data object to the shape of the given data value  
 //   initialise(tempShape,what.getNumSamples(),what.getNumDPPSample());  
 //   //  
 //   // copy the given value to every data point  
 //   copy(value);  
 // }  
   
131  DataExpanded::DataExpanded(const FunctionSpace& what,  DataExpanded::DataExpanded(const FunctionSpace& what,
132                             const DataTypes::ShapeType &shape,                             const DataTypes::ShapeType &shape,
133                             const DataTypes::ValueType &data)                             const DataTypes::ValueType &data)

Legend:
Removed from v.2220  
changed lines
  Added in v.2221

  ViewVC Help
Powered by ViewVC 1.1.26