/[escript]/trunk/ripley/src/Brick.cpp
ViewVC logotype

Diff of /trunk/ripley/src/Brick.cpp

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

revision 5147 by caltinay, Wed Aug 20 10:32:40 2014 UTC revision 5148 by caltinay, Mon Sep 15 01:25:23 2014 UTC
# Line 63  inline int indexOfMax(dim_t a, dim_t b, Line 63  inline int indexOfMax(dim_t a, dim_t b,
63  Brick::Brick(dim_t n0, dim_t n1, dim_t n2, double x0, double y0, double z0,  Brick::Brick(dim_t n0, dim_t n1, dim_t n2, double x0, double y0, double z0,
64               double x1, double y1, double z1, int d0, int d1, int d2,               double x1, double y1, double z1, int d0, int d1, int d2,
65               const vector<double>& points, const vector<int>& tags,               const vector<double>& points, const vector<int>& tags,
66               const simap_t& tagnamestonums,               const TagMap& tagnamestonums,
67               escript::SubWorld_ptr w) :               escript::SubWorld_ptr w) :
68      RipleyDomain(3, w)      RipleyDomain(3, w)
69  {  {
# Line 204  Brick::Brick(dim_t n0, dim_t n1, dim_t n Line 204  Brick::Brick(dim_t n0, dim_t n1, dim_t n
204    
205      populateSampleIds();      populateSampleIds();
206    
207      for (simap_t::const_iterator i = tagnamestonums.begin();      for (TagMap::const_iterator i = tagnamestonums.begin();
208              i != tagnamestonums.end(); i++) {              i != tagnamestonums.end(); i++) {
209          setTagMap(i->first, i->second);          setTagMap(i->first, i->second);
210      }      }
# Line 2064  void Brick::assembleIntegrate(vector<dou Line 2064  void Brick::assembleIntegrate(vector<dou
2064  }  }
2065    
2066  //protected  //protected
2067    IndexVector Brick::getDiagonalIndices() const
2068    {
2069        IndexVector ret(27);
2070        const dim_t nDOF0 = (m_gNE[0]+1)/m_NX[0];
2071        const dim_t nDOF1 = (m_gNE[1]+1)/m_NX[1];
2072        size_t idx = 0;
2073        for (int i2=-1; i2<2; i2++) {
2074            for (int i1=-1; i1<2; i1++) {
2075                for (int i0=-1; i0<2; i0++) {
2076                    ret[idx++] = i2*nDOF0*nDOF1 + i1*nDOF0 + i0;
2077                }
2078            }
2079        }
2080    
2081        return ret;
2082    }
2083    
2084    //protected
2085  void Brick::nodesToDOF(escript::Data& out, const escript::Data& in) const  void Brick::nodesToDOF(escript::Data& out, const escript::Data& in) const
2086  {  {
2087      const dim_t numComp = in.getDataPointSize();      const dim_t numComp = in.getDataPointSize();

Legend:
Removed from v.5147  
changed lines
  Added in v.5148

  ViewVC Help
Powered by ViewVC 1.1.26