/[escript]/branches/domexper/dudley/src/ElementFile.h
ViewVC logotype

Diff of /branches/domexper/dudley/src/ElementFile.h

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

revision 3220 by jfenwick, Wed Sep 29 00:33:16 2010 UTC revision 3221 by jfenwick, Wed Sep 29 01:00:21 2010 UTC
# Line 17  Line 17 
17    
18  #include "Dudley.h"  #include "Dudley.h"
19  #include "NodeFile.h"  #include "NodeFile.h"
 //#include "ReferenceElementSets.h"  
20  #include "ElementType.h"  #include "ElementType.h"
21  #include "escript/DataC.h"  #include "escript/DataC.h"
22    
# Line 29  Line 28 
28  struct Dudley_ElementFile_Jacobeans {  struct Dudley_ElementFile_Jacobeans {
29    Dudley_Status_t status;               /* status of mesh when jacobeans where updated last time */    Dudley_Status_t status;               /* status of mesh when jacobeans where updated last time */
30    dim_t numDim;                         /* spatial dimension */    dim_t numDim;                         /* spatial dimension */
31  //  Dudley_ShapeFunction* BasisFunctions; /* basis function used */    dim_t numQuad;    /* number of quadrature nodes used to calculate jacobeans */
32  //  dim_t numQuadTotal;           /* total number of quadrature nodes used to calculate jacobeans */    dim_t numShapes;  /* number of shape functions */
   dim_t numQuad;  
   dim_t numShapes;  
 //  dim_t numShapesTotal;         /* total number of shape functions =  BasisFunctions->numShapes */  
33    dim_t numElements;            /* number of elements */    dim_t numElements;            /* number of elements */
34    double* absD;         /* used to compute volume */    double* absD;         /* used to compute volume */
35    double quadweight;        /* used to compute volume */    double quadweight;        /* used to compute volume */
# Line 46  struct Dudley_ElementFile { Line 42  struct Dudley_ElementFile {
42    Paso_MPIInfo *MPIInfo;    Paso_MPIInfo *MPIInfo;
43    Paso_MPI_rank *Owner;    Paso_MPI_rank *Owner;
44    
 //  Dudley_ReferenceElementSet *referenceElementSet; /* the reference element to be used */  
   
45    dim_t numElements;                             /* number of elements. */    dim_t numElements;                             /* number of elements. */
46        
47    index_t *Id;                                 /* Id[i] is the id nmber of    index_t *Id;                                 /* Id[i] is the id nmber of
# Line 87  struct Dudley_ElementFile { Line 81  struct Dudley_ElementFile {
81    Dudley_ElementFile_Jacobeans* jacobeans_reducedQ;  /* jacobeans of the shape function used for solution approximation for reduced integration order*/    Dudley_ElementFile_Jacobeans* jacobeans_reducedQ;  /* jacobeans of the shape function used for solution approximation for reduced integration order*/
82    dim_t numDim;     /* spatial dimension of the domain */    dim_t numDim;     /* spatial dimension of the domain */
83    dim_t numLocalDim;    /* dimension of the element eg 2 for A line in 2D or 3D */    dim_t numLocalDim;    /* dimension of the element eg 2 for A line in 2D or 3D */
84    ElementTypeId etype;    ElementTypeId etype;  /* element type */
85    const char* ename;      const char* ename;    /* name of element type */
86    dim_t numShapes;    dim_t numShapes;  /* number of shape functions */
87  };  };
88    
89  typedef struct Dudley_ElementFile Dudley_ElementFile;  typedef struct Dudley_ElementFile Dudley_ElementFile;
 //Dudley_ElementFile* Dudley_ElementFile_alloc(Dudley_ReferenceElementSet* referenceElementSet, Paso_MPIInfo *MPIInfo);  
90  Dudley_ElementFile* Dudley_ElementFile_alloc(ElementTypeId etype, Paso_MPIInfo *MPIInfo);  Dudley_ElementFile* Dudley_ElementFile_alloc(ElementTypeId etype, Paso_MPIInfo *MPIInfo);
91  void Dudley_ElementFile_free(Dudley_ElementFile*);  void Dudley_ElementFile_free(Dudley_ElementFile*);
92  void Dudley_ElementFile_allocTable(Dudley_ElementFile*,dim_t);  void Dudley_ElementFile_allocTable(Dudley_ElementFile*,dim_t);

Legend:
Removed from v.3220  
changed lines
  Added in v.3221

  ViewVC Help
Powered by ViewVC 1.1.26