/[escript]/trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp
ViewVC logotype

Diff of /trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp

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

revision 1627 by trankine, Fri Jan 11 07:45:58 2008 UTC revision 1628 by phornby, Fri Jul 11 13:12:46 2008 UTC
# Line 57  namespace finley { Line 57  namespace finley {
57      AbstractContinuousDomain* temp;      AbstractContinuousDomain* temp;
58      Finley_Mesh *mesh_p=NULL;      Finley_Mesh *mesh_p=NULL;
59      char error_msg[LenErrorMsg_MAX];      char error_msg[LenErrorMsg_MAX];
60      char *fName = Paso_MPI_appendRankToFileName(strdup(fileName.c_str()), mpi_info->size, mpi_info->rank);  
61        // I don't think the strdup is needed since Paso_MPI_appendRankToFileName
62        // does it's own allocation.
63        // char *fName = Paso_MPI_appendRankToFileName(strdup(fileName.c_str()),
64        //                                             mpi_info->size,
65        //                                             mpi_info->rank);
66    
67        char *fName = Paso_MPI_appendRankToFileName(fileName.c_str(),
68                                                    mpi_info->size,
69                                                    mpi_info->rank);
70    
71      double blocktimer_start = blocktimer_time();      double blocktimer_start = blocktimer_time();
72      Finley_resetError();      Finley_resetError();
# Line 471  namespace finley { Line 480  namespace finley {
480      // to Finley_Mesh_read      // to Finley_Mesh_read
481      Finley_Mesh* fMesh=0;      Finley_Mesh* fMesh=0;
482      // Win32 refactor      // Win32 refactor
483      char *fName = ((fileName.size()+1)>0) ? TMPMEMALLOC((fileName.size()+1),char) : (char*)NULL;      if( fileName.size() == 0 )
484        {
485           throw DataException("Null file name!");
486        }
487    
488        char *fName = TMPMEMALLOC(fileName.size()+1,char);
489        
490      strcpy(fName,fileName.c_str());      strcpy(fName,fileName.c_str());
491      double blocktimer_start = blocktimer_time();      double blocktimer_start = blocktimer_time();
492    
# Line 496  namespace finley { Line 511  namespace finley {
511      // to Finley_Mesh_read      // to Finley_Mesh_read
512      Finley_Mesh* fMesh=0;      Finley_Mesh* fMesh=0;
513      // Win32 refactor      // Win32 refactor
514      char *fName = ((fileName.size()+1)>0) ? TMPMEMALLOC((fileName.size()+1),char) : (char*)NULL;      if( fileName.size() == 0 )
515        {
516           throw DataException("Null file name!");
517        }
518    
519        char *fName = TMPMEMALLOC(fileName.size()+1,char);
520        
521      strcpy(fName,fileName.c_str());      strcpy(fName,fileName.c_str());
522      double blocktimer_start = blocktimer_time();      double blocktimer_start = blocktimer_time();
523    
# Line 522  namespace finley { Line 543  namespace finley {
543      // to Finley_Mesh_read      // to Finley_Mesh_read
544      Finley_Mesh* fMesh=0;      Finley_Mesh* fMesh=0;
545      // Win32 refactor      // Win32 refactor
546      char *fName = ((fileName.size()+1)>0) ? TMPMEMALLOC((fileName.size()+1),char) : (char*)NULL;      if( fileName.size() == 0 )
547        {
548           throw DataException("Null file name!");
549        }
550    
551        char *fName = TMPMEMALLOC(fileName.size()+1,char);
552        
553      strcpy(fName,fileName.c_str());      strcpy(fName,fileName.c_str());
554      double blocktimer_start = blocktimer_time();      double blocktimer_start = blocktimer_time();
555    

Legend:
Removed from v.1627  
changed lines
  Added in v.1628

  ViewVC Help
Powered by ViewVC 1.1.26