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

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

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

revision 1425 by trankine, Fri Jan 11 07:45:58 2008 UTC revision 1426 by trankine, Wed Feb 27 06:12:15 2008 UTC
# Line 27  namespace escript { Line 27  namespace escript {
27    
28  //  //
29  // Create a null domain for use with any default-constructed function space  // Create a null domain for use with any default-constructed function space
30  ESCRIPT_DLL_API NullDomain FunctionSpace::m_nullDomainValue;  NullDomain const FunctionSpace::nullDomainValue;
31    
32  FunctionSpace::FunctionSpace():  FunctionSpace::FunctionSpace():
33    m_domain(static_cast<AbstractDomain*>(&m_nullDomainValue)),    m_domain(static_cast<const AbstractDomain*>(&nullDomainValue)),
34    m_functionSpaceType(m_nullDomainValue.getFunctionCode())    m_functionSpaceType(nullDomainValue.getFunctionCode())
35  {  {
36  }  }
37    
# Line 67  FunctionSpace::getDomain() const Line 67  FunctionSpace::getDomain() const
67    return *m_domain;    return *m_domain;
68  }  }
69    
70  std::string  const std::string &
71  FunctionSpace::toString() const  FunctionSpace::toString() const
72  {  {
73    std::stringstream temp;    std::stringstream temp;
74    temp << m_domain->functionSpaceTypeAsString(m_functionSpaceType)    temp << m_domain->functionSpaceTypeAsString(m_functionSpaceType)
75         << " on " << m_domain->getDescription();         << " on " << m_domain->getDescription();
76    return temp.str();  
77      type_str = temp.str();
78    
79      return type_str;
80  }  }
81    
82    
83    #ifdef DEBUG_PY_STRINGS
84    PyObject *
85    FunctionSpace::toPyString() const
86    {
87      boost::python::to_python_value<const std::string &> cvtr;
88      std::stringstream temp;
89    
90      temp << m_domain->functionSpaceTypeAsString(m_functionSpaceType)
91           << " on " << m_domain->getDescription();
92    
93      //toString();
94      type_str = temp.str();
95    
96      return cvtr(type_str);
97    }
98    #endif
99    
100    
101  int  int
102  FunctionSpace::getTagFromSampleNo(int sampleNo) const  FunctionSpace::getTagFromSampleNo(int sampleNo) const
103  {  {
# Line 122  FunctionSpace& Line 144  FunctionSpace&
144  FunctionSpace::operator=(const FunctionSpace& other)  FunctionSpace::operator=(const FunctionSpace& other)
145  {  {
146    // explicitly defined assignment operator to emphasise pointer copy    // explicitly defined assignment operator to emphasise pointer copy
   m_nullDomainValue=other.m_nullDomainValue;  
147    m_functionSpaceType=other.m_functionSpaceType;    m_functionSpaceType=other.m_functionSpaceType;
148    m_domain=other.m_domain;    m_domain=other.m_domain;
149    return *this;    return *this;

Legend:
Removed from v.1425  
changed lines
  Added in v.1426

  ViewVC Help
Powered by ViewVC 1.1.26