/[escript]/branches/diaplayground/ripley/src/Brick.cpp
ViewVC logotype

Diff of /branches/diaplayground/ripley/src/Brick.cpp

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

revision 4861 by sshaw, Thu Apr 10 05:17:47 2014 UTC revision 4934 by jfenwick, Tue May 13 00:28:11 2014 UTC
# Line 62  int indexOfMax(int a, int b, int c) { Line 62  int indexOfMax(int a, int b, int c) {
62  Brick::Brick(int n0, int n1, int n2, double x0, double y0, double z0,  Brick::Brick(int n0, int n1, int n2, double x0, double y0, double z0,
63               double x1, double y1, double z1, int d0, int d1, int d2,               double x1, double y1, double z1, int d0, int d1, int d2,
64               const std::vector<double>& points, const std::vector<int>& tags,               const std::vector<double>& points, const std::vector<int>& tags,
65               const simap_t& tagnamestonums) :               const simap_t& tagnamestonums,
66      RipleyDomain(3)               escript::SubWorld_ptr w) :
67        RipleyDomain(3, w)
68  {  {
69      if (static_cast<long>(n0 + 1) * static_cast<long>(n1 + 1)      if (static_cast<long>(n0 + 1) * static_cast<long>(n1 + 1)
70              * static_cast<long>(n2 + 1) > std::numeric_limits<int>::max())              * static_cast<long>(n2 + 1) > std::numeric_limits<int>::max())
# Line 2062  void Brick::dofToNodes(escript::Data& ou Line 2063  void Brick::dofToNodes(escript::Data& ou
2063      paso::Coupler_ptr coupler(new paso::Coupler(m_connector, numComp));      paso::Coupler_ptr coupler(new paso::Coupler(m_connector, numComp));
2064      // expand data object if necessary to be able to grab the whole data      // expand data object if necessary to be able to grab the whole data
2065      const_cast<escript::Data*>(&in)->expand();      const_cast<escript::Data*>(&in)->expand();
2066      coupler->startCollect(in.getSampleDataRO(0));      coupler->startCollect(in.getDataRO());
2067    
2068      const dim_t numDOF = getNumDOF();      const dim_t numDOF = getNumDOF();
2069      out.requireWrite();      out.requireWrite();

Legend:
Removed from v.4861  
changed lines
  Added in v.4934

  ViewVC Help
Powered by ViewVC 1.1.26