/[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 4751 by sshaw, Fri Mar 14 06:49:06 2014 UTC revision 4753 by sshaw, Mon Mar 17 02:39:44 2014 UTC
# Line 3381  int Brick::findNode(const double *coords Line 3381  int Brick::findNode(const double *coords
3381  void Brick::setAssembler(std::string type, std::map<std::string,  void Brick::setAssembler(std::string type, std::map<std::string,
3382          escript::Data> constants) {          escript::Data> constants) {
3383      if (type.compare("WaveAssembler") == 0) {      if (type.compare("WaveAssembler") == 0) {
3384            if (assembler_type != WAVE_ASSEMBLER && assembler_type != DEFAULT_ASSEMBLER)
3385                throw RipleyException("Domain already using a different custom assembler");
3386            assembler_type = WAVE_ASSEMBLER;
3387          delete assembler;          delete assembler;
3388          assembler = new WaveAssembler3D(this, m_dx, m_NX, m_NE, m_NN, constants);          assembler = new WaveAssembler3D(this, m_dx, m_NX, m_NE, m_NN, constants);
3389      } else if (type.compare("LameAssembler") == 0) {      } else if (type.compare("LameAssembler") == 0) {
3390            if (assembler_type != LAME_ASSEMBLER && assembler_type != DEFAULT_ASSEMBLER)
3391                throw RipleyException("Domain already using a different custom assembler");
3392            assembler_type = LAME_ASSEMBLER;
3393          delete assembler;          delete assembler;
3394          assembler = new LameAssembler3D(this, m_dx, m_NX, m_NE, m_NN);          assembler = new LameAssembler3D(this, m_dx, m_NX, m_NE, m_NN);
3395      } else { //else ifs would go before this for other types      } else { //else ifs would go before this for other types

Legend:
Removed from v.4751  
changed lines
  Added in v.4753

  ViewVC Help
Powered by ViewVC 1.1.26