/[escript]/branches/doubleplusgood/dudley/src/Assemble_PDE_Single2_1D.cpp
ViewVC logotype

Diff of /branches/doubleplusgood/dudley/src/Assemble_PDE_Single2_1D.cpp

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

revision 4331 by jfenwick, Wed Feb 27 06:09:33 2013 UTC revision 4332 by jfenwick, Thu Mar 21 04:21:14 2013 UTC
# Line 71  void Dudley_Assemble_PDE_Single2_1D(Dudl Line 71  void Dudley_Assemble_PDE_Single2_1D(Dudl
71    
72  #pragma omp parallel private(color, EM_S, EM_F, Vol, DSDX, A_p, B_p, C_p, D_p, X_p, Y_p, A_q, B_q, C_q, D_q, X_q, Y_q, row_index, q, s,r,rtmp,add_EM_F, add_EM_S)  #pragma omp parallel private(color, EM_S, EM_F, Vol, DSDX, A_p, B_p, C_p, D_p, X_p, Y_p, A_q, B_q, C_q, D_q, X_q, Y_q, row_index, q, s,r,rtmp,add_EM_F, add_EM_S)
73      {      {
74      EM_S = THREAD_MEMALLOC(len_EM_S, double);      EM_S = new  double[len_EM_S];
75      EM_F = THREAD_MEMALLOC(len_EM_F, double);      EM_F = new  double[len_EM_F];
76      row_index = THREAD_MEMALLOC(p.row_numShapesTotal, index_t);      row_index = new  index_t[p.row_numShapesTotal];
77    
78      if (!Dudley_checkPtr(EM_S) && !Dudley_checkPtr(EM_F) && !Dudley_checkPtr(row_index))      if (!Dudley_checkPtr(EM_S) && !Dudley_checkPtr(EM_F) && !Dudley_checkPtr(row_index))
79      {      {
# Line 342  void Dudley_Assemble_PDE_Single2_1D(Dudl Line 342  void Dudley_Assemble_PDE_Single2_1D(Dudl
342          }       /* end element loop */          }       /* end element loop */
343          }           /* end color loop */          }           /* end color loop */
344    
345          THREAD_MEMFREE(EM_S);   /* these FREEs appear to be inside the if because if any of the allocs */          delete[] EM_S;  /* these FREEs appear to be inside the if because if any of the allocs */
346          THREAD_MEMFREE(EM_F);   /* failed it means an out of memory (which is not recoverable anyway) */          delete[] EM_F;  /* failed it means an out of memory (which is not recoverable anyway) */
347          THREAD_MEMFREE(row_index);          delete[] row_index;
348    
349      }           /* end of pointer check */      }           /* end of pointer check */
350      }               /* end parallel region */      }               /* end parallel region */

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

  ViewVC Help
Powered by ViewVC 1.1.26