← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to finley/src/Mesh.h

  • Committer: jfenwick
  • Date: 2010-10-11 01:48:14 UTC
  • Revision ID: svn-v4:77569008-7704-0410-b7a0-a92fef0b09fd:trunk:3259
Merging dudley and scons updates from branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
finley/src/Mesh.h
64
64
#include "paso/SystemMatrixPattern.h"
65
65
#include "escript/DataC.h"
66
66
 
67
 
#ifdef PASO_MPI
68
 
#include "paso/Paso_MPI.h"
 
67
#ifdef ESYS_MPI
 
68
#include "esysUtils/Esys_MPI.h"
69
69
#endif
70
70
 
71
71
/**************************************************************/
92
92
  Paso_SystemMatrixPattern *FullReducedPattern;
93
93
  Paso_SystemMatrixPattern *ReducedFullPattern;
94
94
  Paso_SystemMatrixPattern *ReducedReducedPattern;
95
 
  Paso_MPIInfo *MPIInfo;
 
95
  Esys_MPIInfo *MPIInfo;
96
96
};
97
97
 
98
98
typedef struct Finley_Mesh Finley_Mesh;
108
108
/**************************************************************/
109
109
 
110
110
/*  interfaces: */
111
 
Finley_Mesh* Finley_Mesh_alloc(char* name,dim_t numDim, Paso_MPIInfo *mpi_info);
 
111
Finley_Mesh* Finley_Mesh_alloc(char* name,dim_t numDim, Esys_MPIInfo *mpi_info);
112
112
Finley_Mesh* Finley_Mesh_reference(Finley_Mesh*);
113
113
dim_t Finley_Mesh_getDim(Finley_Mesh*);
114
114
void Finley_Mesh_free(Finley_Mesh*);
125
125
Finley_Mesh* Finley_Mesh_load(char* fname);
126
126
Finley_Mesh* Finley_Mesh_read(char*,index_t, index_t, bool_t);
127
127
Finley_Mesh* Finley_Mesh_readGmsh(char*,index_t, index_t, index_t, bool_t, bool_t);
128
 
void Mesh_setOrders(Finley_Mesh *in);
 
128
void Finley_Mesh_setOrders(Finley_Mesh *in);
129
129
 
130
130
void Finley_Mesh_setCoordinates(Finley_Mesh*,escriptDataC*);
131
131
void Finley_Mesh_setElements(Finley_Mesh* self,Finley_ElementFile *elements);