/[escript]/branches/doubleplusgood/dudley/src/Mesh_readGmsh.cpp
ViewVC logotype

Diff of /branches/doubleplusgood/dudley/src/Mesh_readGmsh.cpp

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

revision 3224 by jfenwick, Wed Sep 29 05:19:37 2010 UTC revision 3227 by jfenwick, Thu Sep 30 06:07:08 2010 UTC
# Line 47  Dudley_Mesh *Dudley_Mesh_readGmsh(char * Line 47  Dudley_Mesh *Dudley_Mesh_readGmsh(char *
47      FILE *fileHandle_p = NULL;      FILE *fileHandle_p = NULL;
48      ElementTypeId *element_type = NULL;      ElementTypeId *element_type = NULL;
49    
50      Paso_MPIInfo *mpi_info = Paso_MPIInfo_alloc(MPI_COMM_WORLD);      Esys_MPIInfo *mpi_info = Esys_MPIInfo_alloc(MPI_COMM_WORLD);
51      Dudley_resetError();      Dudley_resetError();
52      if (mpi_info->size > 1)      if (mpi_info->size > 1)
53      {      {
54      Dudley_setError(IO_ERROR, "reading GMSH with MPI is not supported yet.");      Dudley_setError(IO_ERROR, "reading GMSH with MPI is not supported yet.");
55      Paso_MPIInfo_free(mpi_info);      Esys_MPIInfo_free(mpi_info);
56      return NULL;      return NULL;
57      }      }
58      else      else
# Line 70  Dudley_Mesh *Dudley_Mesh_readGmsh(char * Line 70  Dudley_Mesh *Dudley_Mesh_readGmsh(char *
70      {      {
71          sprintf(error_msg, "Opening Gmsh file %s for reading failed.", fname);          sprintf(error_msg, "Opening Gmsh file %s for reading failed.", fname);
72          Dudley_setError(IO_ERROR, error_msg);          Dudley_setError(IO_ERROR, error_msg);
73          Paso_MPIInfo_free(mpi_info);          Esys_MPIInfo_free(mpi_info);
74          return NULL;          return NULL;
75      }      }
76    
# Line 395  Dudley_Mesh *Dudley_Mesh_readGmsh(char * Line 395  Dudley_Mesh *Dudley_Mesh_readGmsh(char *
395      if (Dudley_noError())      if (Dudley_noError())
396          Dudley_Mesh_prepare(mesh_p, optimize);          Dudley_Mesh_prepare(mesh_p, optimize);
397      /* free up memory */      /* free up memory */
398      Paso_MPIInfo_free(mpi_info);      Esys_MPIInfo_free(mpi_info);
399      if (!Dudley_noError())      if (!Dudley_noError())
400      {      {
401          Dudley_Mesh_free(mesh_p);          Dudley_Mesh_free(mesh_p);

Legend:
Removed from v.3224  
changed lines
  Added in v.3227

  ViewVC Help
Powered by ViewVC 1.1.26