/[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

branches/doubleplusgood/dudley/src/Assemble_PDE_System2_2D.cpp revision 4332 by jfenwick, Thu Mar 21 04:21:14 2013 UTC trunk/dudley/src/Assemble_PDE_System2_2D.cpp revision 5593 by jfenwick, Fri Apr 24 01:36:26 2015 UTC
# Line 1  Line 1 
1    
2  /*****************************************************************************  /*****************************************************************************
3  *  *
4  * Copyright (c) 2003-2013 by University of Queensland  * Copyright (c) 2003-2015 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 9  Line 9 
9  * http://www.opensource.org/licenses/osl-3.0.php  * http://www.opensource.org/licenses/osl-3.0.php
10  *  *
11  * Development until 2012 by Earth Systems Science Computational Center (ESSCC)  * Development until 2012 by Earth Systems Science Computational Center (ESSCC)
12  * Development since 2012 by School of Earth Sciences  * Development 2012-2013 by School of Earth Sciences
13    * Development from 2014 by Centre for Geoscience Computing (GeoComp)
14  *  *
15  *****************************************************************************/  *****************************************************************************/
16    
# Line 34  Line 35 
35    
36  /************************************************************************************/  /************************************************************************************/
37    
38    #define ESNEEDPYTHON
39    #include "esysUtils/first.h"
40    
41  #include "Assemble.h"  #include "Assemble.h"
42  #include "Util.h"  #include "Util.h"
43  #ifdef _OPENMP  #ifdef _OPENMP
# Line 43  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 * Mat, escriptDataC * F,                      paso::SystemMatrix_ptr Mat, escript::Data* F,
51                      escriptDataC * A, escriptDataC * B, escriptDataC * C, escriptDataC * D,                      const escript::Data* A, const escript::Data* B, const escript::Data* C, const escript::Data* D,
52                      escriptDataC * X, escriptDataC * Y)                      const escript::Data* X, const escript::Data* Y)
53  {  {
54    
55  #define DIM 2  #define DIM 2
# Line 56  void Dudley_Assemble_PDE_System2_2D(Dudl Line 60  void Dudley_Assemble_PDE_System2_2D(Dudl
60      index_t *row_index;      index_t *row_index;
61      register dim_t q, s, r, k, m;      register dim_t q, s, r, k, m;
62      register double rtmp, rtmp0, rtmp1, rtmp00, rtmp10, rtmp01, rtmp11;      register double rtmp, rtmp0, rtmp1, rtmp00, rtmp10, rtmp01, rtmp11;
63      bool_t add_EM_F, add_EM_S;      bool add_EM_F, add_EM_S;
64    
65      bool_t extendedA = isExpanded(A);      bool extendedA = isExpanded(A);
66      bool_t extendedB = isExpanded(B);      bool extendedB = isExpanded(B);
67      bool_t extendedC = isExpanded(C);      bool extendedC = isExpanded(C);
68      bool_t extendedD = isExpanded(D);      bool extendedD = isExpanded(D);
69      bool_t extendedX = isExpanded(X);      bool extendedX = isExpanded(X);
70      bool_t extendedY = isExpanded(Y);      bool extendedY = isExpanded(Y);
71      double *F_p = (requireWrite(F), getSampleDataRW(F, 0)); /* use comma, to get around the mixed code and declarations thing */      double *F_p = (requireWrite(F), getSampleDataRW(F, 0)); /* use comma, to get around the mixed code and declarations thing */
72      const double *S = p.shapeFns;      const double *S = p.shapeFns;
73      dim_t len_EM_S = p.numShapes * p.numShapes * p.numEqu * p.numComp;      dim_t len_EM_S = p.numShapes * p.numShapes * p.numEqu * p.numComp;

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

  ViewVC Help
Powered by ViewVC 1.1.26