/[escript]/trunk/finley/src/Assemble_LumpedSystem.c
ViewVC logotype

Diff of /trunk/finley/src/Assemble_LumpedSystem.c

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

revision 2748 by gross, Tue Nov 17 07:32:59 2009 UTC revision 2750 by caltinay, Tue Nov 17 23:39:20 2009 UTC
# Line 47  void Finley_Assemble_LumpedSystem(Finley Line 47  void Finley_Assemble_LumpedSystem(Finley
47    double *S=NULL, *EM_lumpedMat=NULL, *Vol=NULL, *lumpedMat_p=NULL;    double *S=NULL, *EM_lumpedMat=NULL, *Vol=NULL, *lumpedMat_p=NULL;
48    register double rtmp;    register double rtmp;
49    size_t len_EM_lumpedMat_size;    size_t len_EM_lumpedMat_size;
50    #if (defined NEW_LUMPING) || (defined _OPENMP)  #ifdef NEW_LUMPING
51    register double m_t=0., diagS=0.;    register double m_t=0., diagS=0.;
52    #endif  #endif
53    
54    Finley_resetError();    Finley_resetError();
55    
# Line 113  void Finley_Assemble_LumpedSystem(Finley Line 113  void Finley_Assemble_LumpedSystem(Finley
113            
114      expandedD=isExpanded(D);      expandedD=isExpanded(D);
115      S=p.row_jac->BasisFunctions->S;      S=p.row_jac->BasisFunctions->S;
116        
117    #ifdef NEW_LUMPING
118      #pragma omp parallel private(color, EM_lumpedMat, row_index, Vol, D_p, s, q, k, rtmp, diagS, m_t)      #pragma omp parallel private(color, EM_lumpedMat, row_index, Vol, D_p, s, q, k, rtmp, diagS, m_t)
119    #else
120        #pragma omp parallel private(color, EM_lumpedMat, row_index, Vol, D_p, s, q, k, rtmp)
121    #endif
122      {      {
123         EM_lumpedMat=THREAD_MEMALLOC(len_EM_lumpedMat,double);         EM_lumpedMat=THREAD_MEMALLOC(len_EM_lumpedMat,double);
124         row_index=THREAD_MEMALLOC(p.row_numShapesTotal,index_t);         row_index=THREAD_MEMALLOC(p.row_numShapesTotal,index_t);

Legend:
Removed from v.2748  
changed lines
  Added in v.2750

  ViewVC Help
Powered by ViewVC 1.1.26