/[escript]/branches/domexper/dudley/src/Mesh_read.c
ViewVC logotype

Diff of /branches/domexper/dudley/src/Mesh_read.c

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 29  Dudley_Mesh* Dudley_Mesh_read(char* fnam Line 29  Dudley_Mesh* Dudley_Mesh_read(char* fnam
29      Paso_MPIInfo *mpi_info = NULL;      Paso_MPIInfo *mpi_info = NULL;
30      dim_t numNodes, numDim, numEle, i0, i1;      dim_t numNodes, numDim, numEle, i0, i1;
31      Dudley_Mesh *mesh_p=NULL;      Dudley_Mesh *mesh_p=NULL;
 //    Dudley_ReferenceElementSet *refPoints=NULL, *refFaceElements=NULL, *refElements=NULL;  
32      char name[LenString_MAX],element_type[LenString_MAX],frm[20];      char name[LenString_MAX],element_type[LenString_MAX],frm[20];
33      char error_msg[LenErrorMsg_MAX];      char error_msg[LenErrorMsg_MAX];
34      FILE *fileHandle_p = NULL;      FILE *fileHandle_p = NULL;
# Line 221  Dudley_Mesh* Dudley_Mesh_read(char* fnam Line 220  Dudley_Mesh* Dudley_Mesh_read(char* fnam
220    
221      /* Allocate the ElementFile */      /* Allocate the ElementFile */
222      if (Dudley_noError()) {      if (Dudley_noError()) {
 //  refElements= Dudley_ReferenceElementSet_alloc(typeID,order, reduced_order);  
223      mesh_p->Elements=Dudley_ElementFile_alloc(typeID, mpi_info);      mesh_p->Elements=Dudley_ElementFile_alloc(typeID, mpi_info);
224      numNodes = mesh_p->Elements->numNodes; /* New meaning for numNodes: num nodes per element */      numNodes = mesh_p->Elements->numNodes; /* New meaning for numNodes: num nodes per element */
225      }      }
# Line 328  Dudley_Mesh* Dudley_Mesh_read(char* fnam Line 326  Dudley_Mesh* Dudley_Mesh_read(char* fnam
326      if (Dudley_noError())      if (Dudley_noError())
327      {      {
328          /* Allocate the ElementFile */          /* Allocate the ElementFile */
 //      refFaceElements= Dudley_ReferenceElementSet_alloc(typeID,order, reduced_order);  
329          mesh_p->FaceElements=Dudley_ElementFile_alloc(typeID, mpi_info);          mesh_p->FaceElements=Dudley_ElementFile_alloc(typeID, mpi_info);
330          numNodes = mesh_p->FaceElements->numNodes; /* New meaning for numNodes: num nodes per element */          numNodes = mesh_p->FaceElements->numNodes; /* New meaning for numNodes: num nodes per element */
331      }      }
# Line 407  Dudley_Mesh* Dudley_Mesh_read(char* fnam Line 404  Dudley_Mesh* Dudley_Mesh_read(char* fnam
404      TMPMEMFREE(tempInts);      TMPMEMFREE(tempInts);
405      }      }
406      /* ************************************* end of Read the face element data *************************************** */      /* ************************************* end of Read the face element data *************************************** */
     /* ************************************* read contact elements ************************************************** */  
   
     // Dudley does not have contact elements  
407    
408      /* ********************************* read nodal elements ****************************************************** */      /* ********************************* read nodal elements ****************************************************** */
409      /* *******************************  Read the element typeID */      /* *******************************  Read the element typeID */
# Line 441  Dudley_Mesh* Dudley_Mesh_read(char* fnam Line 435  Dudley_Mesh* Dudley_Mesh_read(char* fnam
435      if (Dudley_noError())      if (Dudley_noError())
436      {      {
437      /* Allocate the ElementFile */      /* Allocate the ElementFile */
 //  refPoints= Dudley_ReferenceElementSet_alloc(typeID,order, reduced_order);  
438      mesh_p->Points=Dudley_ElementFile_alloc(typeID,  mpi_info);      mesh_p->Points=Dudley_ElementFile_alloc(typeID,  mpi_info);
439      numNodes = mesh_p->Points->numNodes; /* New meaning for numNodes: num nodes per element */      numNodes = mesh_p->Points->numNodes; /* New meaning for numNodes: num nodes per element */
440      }        }  
# Line 626  Dudley_Mesh* Dudley_Mesh_read(char* fnam Line 619  Dudley_Mesh* Dudley_Mesh_read(char* fnam
619      Dudley_Mesh_free(mesh_p);      Dudley_Mesh_free(mesh_p);
620      }      }
621      /* free up memory */      /* free up memory */
 //    Dudley_ReferenceElementSet_dealloc(refPoints);  
 //    Dudley_ReferenceElementSet_dealloc(refFaceElements);  
 //    Dudley_ReferenceElementSet_dealloc(refElements);  
622      Paso_MPIInfo_free( mpi_info );      Paso_MPIInfo_free( mpi_info );
623      return mesh_p;      return mesh_p;
624  }  }

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

  ViewVC Help
Powered by ViewVC 1.1.26