/[escript]/branches/doubleplusgood/finley/src/Mesh.cpp
ViewVC logotype

Diff of /branches/doubleplusgood/finley/src/Mesh.cpp

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

revision 2856 by gross, Mon Jan 18 04:14:37 2010 UTC revision 3259 by jfenwick, Mon Oct 11 01:48:14 2010 UTC
# Line 1  Line 1 
1  /*******************************************************  /*******************************************************
2  *  *
3  * Copyright (c) 2003-2009 by University of Queensland  * Copyright (c) 2003-2010 by University of Queensland
4  * Earth Systems Science Computational Center (ESSCC)  * Earth Systems Science Computational Center (ESSCC)
5  * http://www.uq.edu.au/esscc  * http://www.uq.edu.au/esscc
6  *  *
# Line 24  Line 24 
24  /*   allocates a Mesh with name name for elements of type id using an integration order. If order is negative, */  /*   allocates a Mesh with name name for elements of type id using an integration order. If order is negative, */
25  /*   the most appropriate order is selected indepently. */  /*   the most appropriate order is selected indepently. */
26    
27  Finley_Mesh* Finley_Mesh_alloc(char* name,dim_t numDim, Paso_MPIInfo *mpi_info)  Finley_Mesh* Finley_Mesh_alloc(char* name,dim_t numDim, Esys_MPIInfo *mpi_info)
28  {  {
29    Finley_Mesh *out;    Finley_Mesh *out;
30        
# Line 45  Finley_Mesh* Finley_Mesh_alloc(char* nam Line 45  Finley_Mesh* Finley_Mesh_alloc(char* nam
45    out->FullReducedPattern=NULL;    out->FullReducedPattern=NULL;
46    out->ReducedFullPattern=NULL;    out->ReducedFullPattern=NULL;
47    out->ReducedReducedPattern=NULL;    out->ReducedReducedPattern=NULL;
48    out->MPIInfo = Paso_MPIInfo_getReference( mpi_info );    out->MPIInfo = Esys_MPIInfo_getReference( mpi_info );
49    if (! Finley_noError()) {    if (! Finley_noError()) {
50        Finley_Mesh_free(out);        Finley_Mesh_free(out);
51        return NULL;        return NULL;
# Line 102  void Finley_Mesh_free(Finley_Mesh* in) { Line 102  void Finley_Mesh_free(Finley_Mesh* in) {
102         Paso_SystemMatrixPattern_free(in->FullReducedPattern);         Paso_SystemMatrixPattern_free(in->FullReducedPattern);
103         Paso_SystemMatrixPattern_free(in->ReducedFullPattern);         Paso_SystemMatrixPattern_free(in->ReducedFullPattern);
104         Paso_SystemMatrixPattern_free(in->ReducedReducedPattern);         Paso_SystemMatrixPattern_free(in->ReducedReducedPattern);
105         Paso_MPIInfo_free( in->MPIInfo );         Esys_MPIInfo_free( in->MPIInfo );
106         MEMFREE(in);               MEMFREE(in);      
107       }       }
108    }    }
# Line 142  int  Finley_Mesh_getStatus(Finley_Mesh* Line 142  int  Finley_Mesh_getStatus(Finley_Mesh*
142     }     }
143  }  }
144    
145  void Mesh_setOrders(Finley_Mesh *in)  void Finley_Mesh_setOrders(Finley_Mesh *in)
146  {  {
147     const dim_t order_max=9999999;     const dim_t order_max=9999999;
148     dim_t locals[4];     dim_t locals[4];
149     #ifdef PASO_MPI     #ifdef ESYS_MPI
150         dim_t globals[4];         dim_t globals[4];
151     #endif     #endif
152     locals[0]=order_max; locals[1]=order_max; locals[2]=order_max; locals[3]=order_max;     locals[0]=order_max; locals[1]=order_max; locals[2]=order_max; locals[3]=order_max;
# Line 179  void Mesh_setOrders(Finley_Mesh *in) Line 179  void Mesh_setOrders(Finley_Mesh *in)
179    
180    }    }
181    
182     #ifdef PASO_MPI     #ifdef ESYS_MPI
183         MPI_Allreduce( locals, globals, 4, MPI_INT, MPI_MIN, in->MPIInfo->comm );         MPI_Allreduce( locals, globals, 4, MPI_INT, MPI_MIN, in->MPIInfo->comm );
184         in->approximationOrder=(globals[0] < order_max ? globals[0] : -1 );         in->approximationOrder=(globals[0] < order_max ? globals[0] : -1 );
185         in->reducedApproximationOrder=(globals[1] < order_max ? globals[1] : -1 );         in->reducedApproximationOrder=(globals[1] < order_max ? globals[1] : -1 );

Legend:
Removed from v.2856  
changed lines
  Added in v.3259

  ViewVC Help
Powered by ViewVC 1.1.26