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

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

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

revision 1388 by trankine, Fri Jan 11 07:45:58 2008 UTC revision 2548 by jfenwick, Mon Jul 20 06:20:06 2009 UTC
# Line 1  Line 1 
1    
 /* $Id$ */  
   
2  /*******************************************************  /*******************************************************
3   *  *
4   *           Copyright 2003-2007 by ACceSS MNRF  * Copyright (c) 2003-2009 by University of Queensland
5   *       Copyright 2007 by University of Queensland  * Earth Systems Science Computational Center (ESSCC)
6   *  * http://www.uq.edu.au/esscc
7   *                http://esscc.uq.edu.au  *
8   *        Primary Business: Queensland, Australia  * Primary Business: Queensland, Australia
9   *  Licensed under the Open Software License version 3.0  * Licensed under the Open Software License version 3.0
10   *     http://www.opensource.org/licenses/osl-3.0.php  * http://www.opensource.org/licenses/osl-3.0.php
11   *  *
12   *******************************************************/  *******************************************************/
13    
14    
15  /**************************************************************/  /**************************************************************/
16    
# Line 43  Line 42 
42    
43  #include "Assemble.h"  #include "Assemble.h"
44  #include "Util.h"  #include "Util.h"
45  #include "escript/blocktimer.h"  #include "esysUtils/blocktimer.h"
46  #ifdef _OPENMP  #ifdef _OPENMP
47  #include <omp.h>  #include <omp.h>
48  #endif  #endif
# Line 65  void Finley_Assemble_PDE(Finley_NodeFile Line 64  void Finley_Assemble_PDE(Finley_NodeFile
64    Finley_resetError();    Finley_resetError();
65    
66    {    {
   int iam, numCPUs;  
67  #ifdef Paso_MPI  #ifdef Paso_MPI
68      int iam, numCPUs;
69    iam = elements->elementDistribution->MPIInfo->rank;    iam = elements->elementDistribution->MPIInfo->rank;
70    numCPUs = elements->elementDistribution->MPIInfo->size;    numCPUs = elements->elementDistribution->MPIInfo->size;
71  #endif  #endif
# Line 337  void Finley_Assemble_PDE(Finley_NodeFile Line 336  void Finley_Assemble_PDE(Finley_NodeFile
336              } else {              } else {
337                 Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE supports numShape=NumNodes or 2*numShape=NumNodes only.");                 Finley_setError(TYPE_ERROR,"Finley_Assemble_PDE supports numShape=NumNodes or 2*numShape=NumNodes only.");
338              }              }
339            } else if (p.numDim==2) {            } else if (p.numDim==1) {
340              if (p.row_NS == p.col_NS && p.row_NS == p.row_NN && p.col_NS == p.col_NN ) {              if (p.row_NS == p.col_NS && p.row_NS == p.row_NN && p.col_NS == p.col_NN ) {
341                 Finley_Assemble_PDE_Single2_1D(p,elements,S,F,A,B,C,D,X,Y);                 Finley_Assemble_PDE_Single2_1D(p,elements,S,F,A,B,C,D,X,Y);
342              } else if ( p.row_NS == p.col_NS &&  2*p.row_NS == p.row_NN && 2*p.col_NS == p.col_NN ) {              } else if ( p.row_NS == p.col_NS &&  2*p.row_NS == p.row_NN && 2*p.col_NS == p.col_NN ) {

Legend:
Removed from v.1388  
changed lines
  Added in v.2548

  ViewVC Help
Powered by ViewVC 1.1.26