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

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

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

revision 1795 by trankine, Fri Jan 11 07:45:58 2008 UTC revision 1796 by jfenwick, Wed Sep 17 01:45:46 2008 UTC
# Line 18  extern "C" { Line 18  extern "C" {
18  }  }
19    
20  #include "Data.h"  #include "Data.h"
21  #include "DataArrayView.h"  #include "DataTypes.h"
22    
23  int getFunctionSpaceType(struct escriptDataC* data)  int getFunctionSpaceType(struct escriptDataC* data)
24  {  {
# Line 36  int isDataPointShapeEqual(struct escript Line 36  int isDataPointShapeEqual(struct escript
36       if (temp->isEmpty()) {       if (temp->isEmpty()) {
37          return true;          return true;
38       } else {       } else {
39            escript::DataArrayView::ShapeType givenShape(&dimensions[0],&dimensions[rank]);            escript::DataTypes::ShapeType givenShape(&dimensions[0],&dimensions[rank]);
40            return (temp->getPointDataView().getShape()==givenShape);            return (temp->getDataPointShape()==givenShape);
41       }       }
42    }    }
43  }  }
# Line 93  int getDataPointShape(struct escriptData Line 93  int getDataPointShape(struct escriptData
93       if (i<0 || i>=rank) {       if (i<0 || i>=rank) {
94          return 1;          return 1;
95       } else {       } else {
96          const escript::DataArrayView::ShapeType view=temp->getDataPointShape();          const escript::DataTypes::ShapeType view=temp->getDataPointShape();
97          return view[i];          return view[i];
98       }       }
99    }    }

Legend:
Removed from v.1795  
changed lines
  Added in v.1796

  ViewVC Help
Powered by ViewVC 1.1.26