/[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 102 by jgs, Wed Dec 15 07:08:39 2004 UTC revision 123 by jgs, Fri Jul 8 04:08:13 2005 UTC
# Line 52  void Finley_Assemble_PDE(Finley_NodeFile Line 52  void Finley_Assemble_PDE(Finley_NodeFile
52    
53    double *EM_S=NULL,*EM_F=NULL,*V=NULL,*dVdv=NULL,*dSdV=NULL,*Vol=NULL,*dvdV=NULL;    double *EM_S=NULL,*EM_F=NULL,*V=NULL,*dVdv=NULL,*dSdV=NULL,*Vol=NULL,*dvdV=NULL;
54    double time0;    double time0;
55    int dimensions[ESCRIPT_MAX_DATA_RANK],e,q,color;    dim_t dimensions[ESCRIPT_MAX_DATA_RANK],e,q;
56    Assemble_Parameters p;    Assemble_Parameters p;
57    maybelong *index_row=NULL,*index_col=NULL;    index_t *index_row=NULL,*index_col=NULL,color;
58    
59    if (nodes==NULL || elements==NULL) return;    if (nodes==NULL || elements==NULL) return;
60    if (S==NULL && isEmpty(F)) return;    if (S==NULL && isEmpty(F)) return;
# Line 75  void Finley_Assemble_PDE(Finley_NodeFile Line 75  void Finley_Assemble_PDE(Finley_NodeFile
75      return;      return;
76    }    }
77    /*  get a functionspace */    /*  get a functionspace */
78    int funcspace=UNKNOWN;    type_t funcspace=UNKNOWN;
79    updateFunctionSpaceType(funcspace,A);    updateFunctionSpaceType(funcspace,A);
80    updateFunctionSpaceType(funcspace,B);    updateFunctionSpaceType(funcspace,B);
81    updateFunctionSpaceType(funcspace,C);    updateFunctionSpaceType(funcspace,C);
# Line 258  void Finley_Assemble_PDE(Finley_NodeFile Line 258  void Finley_Assemble_PDE(Finley_NodeFile
258           dvdV=(double*) THREAD_MEMALLOC(p.numDim*p.numDim*p.numQuad,double);           dvdV=(double*) THREAD_MEMALLOC(p.numDim*p.numDim*p.numQuad,double);
259           dSdV=(double*) THREAD_MEMALLOC(p.NS_row*p.numQuad*p.numDim,double);           dSdV=(double*) THREAD_MEMALLOC(p.NS_row*p.numQuad*p.numDim,double);
260           Vol=(double*) THREAD_MEMALLOC(p.numQuad,double);           Vol=(double*) THREAD_MEMALLOC(p.numQuad,double);
261           index_col=(maybelong*) THREAD_MEMALLOC(p.NN_col,maybelong);           index_col=(index_t*) THREAD_MEMALLOC(p.NN_col,index_t);
262           index_row=(maybelong*) THREAD_MEMALLOC(p.NN_row,maybelong);           index_row=(index_t*) THREAD_MEMALLOC(p.NN_row,index_t);
263    
264           if (! (Finley_checkPtr(EM_S) || Finley_checkPtr(EM_F) || Finley_checkPtr(V) || Finley_checkPtr(index_col) ||           if (! (Finley_checkPtr(EM_S) || Finley_checkPtr(EM_F) || Finley_checkPtr(V) || Finley_checkPtr(index_col) ||
265                  Finley_checkPtr(index_row) || Finley_checkPtr(dVdv) || Finley_checkPtr(dSdV) || Finley_checkPtr(Vol) ))  {                  Finley_checkPtr(index_row) || Finley_checkPtr(dVdv) || Finley_checkPtr(dSdV) || Finley_checkPtr(Vol) ))  {
266    
267             /*  open loop over all colors: */             /*  open loop over all colors: */
268             for (color=0;color<elements->numColors;color++) {             for (color=elements->minColor;color<=elements->maxColor;color++) {
269                /*  open loop over all elements: */                /*  open loop over all elements: */
270                #pragma omp for private(e) schedule(static)                #pragma omp for private(e) schedule(static)
271                for(e=0;e<elements->numElements;e++){                for(e=0;e<elements->numElements;e++){
# Line 342  void Finley_Assemble_PDE(Finley_NodeFile Line 342  void Finley_Assemble_PDE(Finley_NodeFile
342  }  }
343  /*  /*
344   * $Log$   * $Log$
345     * Revision 1.5  2005/07/08 04:07:46  jgs
346     * Merge of development branch back to main trunk on 2005-07-08
347     *
348   * Revision 1.4  2004/12/15 07:08:32  jgs   * Revision 1.4  2004/12/15 07:08:32  jgs
349   * *** empty log message ***   * *** empty log message ***
350     * Revision 1.1.1.1.2.2  2005/06/29 02:34:47  gross
351     * some changes towards 64 integers in finley
352     *
353     * Revision 1.1.1.1.2.1  2004/11/24 01:37:12  gross
354     * some changes dealing with the integer overflow in memory allocation. Finley solves 4M unknowns now
355   *   *
356   *   *
357   *   *

Legend:
Removed from v.102  
changed lines
  Added in v.123

  ViewVC Help
Powered by ViewVC 1.1.26