/[escript]/branches/trilinos_from_5897/dudley/src/Assemble_PDE_System2_2D.cpp
ViewVC logotype

Diff of /branches/trilinos_from_5897/dudley/src/Assemble_PDE_System2_2D.cpp

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

trunk/dudley/src/Assemble_PDE_System2_2D.cpp revision 5593 by jfenwick, Fri Apr 24 01:36:26 2015 UTC branches/trilinos_from_5897/dudley/src/Assemble_PDE_System2_2D.cpp revision 5933 by caltinay, Wed Feb 17 23:53:30 2016 UTC
# Line 1  Line 1 
1    
2  /*****************************************************************************  /*****************************************************************************
3  *  *
4  * Copyright (c) 2003-2015 by The University of Queensland  * Copyright (c) 2003-2016 by The University of Queensland
5  * http://www.uq.edu.au  * http://www.uq.edu.au
6  *  *
7  * Primary Business: Queensland, Australia  * Primary Business: Queensland, Australia
# Line 47  Line 47 
47  /************************************************************************************/  /************************************************************************************/
48    
49  void Dudley_Assemble_PDE_System2_2D(Dudley_Assemble_Parameters p, Dudley_ElementFile * elements,  void Dudley_Assemble_PDE_System2_2D(Dudley_Assemble_Parameters p, Dudley_ElementFile * elements,
50                      paso::SystemMatrix_ptr Mat, escript::Data* F,                      escript::ASM_ptr mat, escript::Data* F,
51                      const escript::Data* A, const escript::Data* B, const escript::Data* C, const escript::Data* D,                      const escript::Data* A, const escript::Data* B, const escript::Data* C, const escript::Data* D,
52                      const escript::Data* X, const escript::Data* Y)                      const escript::Data* X, const escript::Data* Y)
53  {  {
# Line 441  void Dudley_Assemble_PDE_System2_2D(Dudl Line 441  void Dudley_Assemble_PDE_System2_2D(Dudl
441              if (add_EM_F)              if (add_EM_F)
442                  Dudley_Util_AddScatter(p.numShapes, row_index, p.numEqu, EM_F, F_p, p.row_DOF_UpperBound);                  Dudley_Util_AddScatter(p.numShapes, row_index, p.numEqu, EM_F, F_p, p.row_DOF_UpperBound);
443              if (add_EM_S)              if (add_EM_S)
444                  Dudley_Assemble_addToSystemMatrix(Mat, p.numShapes, row_index, p.numEqu,                  Dudley_Assemble_addToSystemMatrix(mat, p.numShapes, row_index, p.numEqu,
445                                    p.numShapes, row_index, p.numComp, EM_S);                                    p.numShapes, row_index, p.numComp, EM_S);
446    
447              }       /* end color check */              }       /* end color check */
# Line 456  void Dudley_Assemble_PDE_System2_2D(Dudl Line 456  void Dudley_Assemble_PDE_System2_2D(Dudl
456      }               /* end parallel region */      }               /* end parallel region */
457  }  }
458    
 /*  
  * $Log$  
  */  

Legend:
Removed from v.5593  
changed lines
  Added in v.5933

  ViewVC Help
Powered by ViewVC 1.1.26