/[escript]/branches/trilinos_from_5897/ripley/src/Brick.h
ViewVC logotype

Diff of /branches/trilinos_from_5897/ripley/src/Brick.h

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

revision 6008 by caltinay, Tue Feb 9 06:33:24 2016 UTC revision 6009 by caltinay, Wed Mar 2 04:13:26 2016 UTC
# Line 17  Line 17 
17  #ifndef __RIPLEY_BRICK_H__  #ifndef __RIPLEY_BRICK_H__
18  #define __RIPLEY_BRICK_H__  #define __RIPLEY_BRICK_H__
19    
 #include <paso/Coupler.h>  
20  #include <ripley/RipleyDomain.h>  #include <ripley/RipleyDomain.h>
21    
22    #include <paso/Coupler.h>
23    
24  namespace ripley {  namespace ripley {
25    
26  /**  /**
# Line 338  inline dim_t Brick::getNumDataPointsGlob Line 339  inline dim_t Brick::getNumDataPointsGlob
339    
340  inline double Brick::getLocalCoordinate(index_t index, int dim) const  inline double Brick::getLocalCoordinate(index_t index, int dim) const
341  {  {
342      EsysAssert((dim>=0 && dim<3), "'dim' out of bounds");      ESYS_ASSERT(dim>=0 && dim<3, "'dim' out of bounds");
343      EsysAssert((index>=0 && index<m_NN[dim]), "'index' out of bounds");      ESYS_ASSERT(index>=0 && index<m_NN[dim], "'index' out of bounds");
344      return m_origin[dim]+m_dx[dim]*(m_offset[dim]+index);      return m_origin[dim]+m_dx[dim]*(m_offset[dim]+index);
345  }  }
346    
# Line 360  inline dim_t Brick::getNumDOF() const Line 361  inline dim_t Brick::getNumDOF() const
361  //protected  //protected
362  inline dim_t Brick::getNumDOFInAxis(unsigned axis) const  inline dim_t Brick::getNumDOFInAxis(unsigned axis) const
363  {  {
364      EsysAssert((axis < m_numDim), "Invalid axis");      ESYS_ASSERT(axis < m_numDim, "Invalid axis");
365      return (m_gNE[axis]+1)/m_NX[axis];      return (m_gNE[axis]+1)/m_NX[axis];
366  }  }
367    

Legend:
Removed from v.6008  
changed lines
  Added in v.6009

  ViewVC Help
Powered by ViewVC 1.1.26