/[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 1806 by ksteube, Tue Sep 9 06:03:53 2008 UTC revision 1807 by ksteube, Thu Sep 25 01:04:51 2008 UTC
# Line 492  namespace finley { Line 492  namespace finley {
492      strcpy(fName,fileName.c_str());      strcpy(fName,fileName.c_str());
493      double blocktimer_start = blocktimer_time();      double blocktimer_start = blocktimer_time();
494    
     fMesh=Finley_Mesh_read(fName,integrationOrder, reducedIntegrationOrder, (optimize ? TRUE : FALSE));  
     checkFinleyError();  
     AbstractContinuousDomain* temp=new MeshAdapter(fMesh);  
       
     /* win32 refactor */  
     TMPMEMFREE(fName);  
       
     blocktimer_increment("ReadMesh()", blocktimer_start);  
     return temp;  
   }  
   
   AbstractContinuousDomain* readMeshMPI(const std::string& fileName,  
                      int integrationOrder,  
                                      int reducedIntegrationOrder,  
                                      int optimize)  
   {  
     //  
     // create a copy of the filename to overcome the non-constness of call  
     // to Finley_Mesh_read  
     Finley_Mesh* fMesh=0;  
     // Win32 refactor  
     if( fileName.size() == 0 )  
     {  
        throw DataException("Null file name!");  
     }  
   
     char *fName = TMPMEMALLOC(fileName.size()+1,char);  
       
     strcpy(fName,fileName.c_str());  
     double blocktimer_start = blocktimer_time();  
   
495      fMesh=Finley_Mesh_read_MPI(fName,integrationOrder, reducedIntegrationOrder, (optimize ? TRUE : FALSE));      fMesh=Finley_Mesh_read_MPI(fName,integrationOrder, reducedIntegrationOrder, (optimize ? TRUE : FALSE));
496      checkFinleyError();      checkFinleyError();
497      AbstractContinuousDomain* temp=new MeshAdapter(fMesh);      AbstractContinuousDomain* temp=new MeshAdapter(fMesh);

Legend:
Removed from v.1806  
changed lines
  Added in v.1807

  ViewVC Help
Powered by ViewVC 1.1.26