/[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 4626 by caltinay, Wed Jan 22 06:07:34 2014 UTC revision 4629 by sshaw, Fri Jan 24 03:29:25 2014 UTC
# Line 17  Line 17 
17  #include <paso/SystemMatrix.h>  #include <paso/SystemMatrix.h>
18  #include <esysUtils/esysFileWriter.h>  #include <esysUtils/esysFileWriter.h>
19  #include <ripley/DefaultAssembler3D.h>  #include <ripley/DefaultAssembler3D.h>
20    #include <ripley/WaveAssembler3D.h>
21  #include <boost/scoped_array.hpp>  #include <boost/scoped_array.hpp>
22    
23  #ifdef USE_NETCDF  #ifdef USE_NETCDF
# Line 225  Brick::Brick(int n0, int n1, int n2, dou Line 226  Brick::Brick(int n0, int n1, int n2, dou
226      createPattern();      createPattern();
227            
228      assembler = new DefaultAssembler3D(this, m_dx, m_NX, m_NE, m_NN);      assembler = new DefaultAssembler3D(this, m_dx, m_NX, m_NE, m_NN);
229        for (map<string, int>::const_iterator i = tagnamestonums.begin();
230                i != tagnamestonums.end(); i++) {
231            setTagMap(i->first, i->second);
232        }
233      addPoints(tags.size(), &points[0], &tags[0]);      addPoints(tags.size(), &points[0], &tags[0]);
234  }  }
235    
# Line 2886  int Brick::findNode(const double *coords Line 2891  int Brick::findNode(const double *coords
2891      return closest;      return closest;
2892  }  }
2893    
2894    void Brick::setAssembler(std::string type, std::map<std::string,
2895            escript::Data> constants) {
2896        if (type.compare("WaveAssembler") == 0) {
2897            delete assembler;
2898            assembler = new WaveAssembler3D(this, m_dx, m_NX, m_NE, m_NN, constants);
2899        } else { //else ifs would go before this for other types
2900            throw RipleyException("Ripley::Rectangle does not support the"
2901                                    " requested assembler");
2902        }
2903    }
2904    
2905  } // end of namespace ripley  } // end of namespace ripley
2906    

Legend:
Removed from v.4626  
changed lines
  Added in v.4629

  ViewVC Help
Powered by ViewVC 1.1.26