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

Diff of /branches/more_shared_ptrs_from_1812/finley/src/CPPAdapter/MeshAdapterFactory.cpp

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

trunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp revision 1776 by ksteube, Tue Sep 9 06:03:53 2008 UTC branches/more_shared_ptrs_from_1812/finley/src/CPPAdapter/MeshAdapterFactory.cpp revision 1813 by jfenwick, Fri Sep 26 00:58:05 2008 UTC
# Line 1  Line 1 
1    
 /* $Id$ */  
   
2  /*******************************************************  /*******************************************************
3   *  *
4   *           Copyright 2003-2007 by ACceSS MNRF  * Copyright (c) 2003-2008 by University of Queensland
5   *       Copyright 2007 by University of Queensland  * Earth Systems Science Computational Center (ESSCC)
6   *  * http://www.uq.edu.au/esscc
7   *                http://esscc.uq.edu.au  *
8   *        Primary Business: Queensland, Australia  * Primary Business: Queensland, Australia
9   *  Licensed under the Open Software License version 3.0  * Licensed under the Open Software License version 3.0
10   *     http://www.opensource.org/licenses/osl-3.0.php  * http://www.opensource.org/licenses/osl-3.0.php
11   *  *
12   *******************************************************/  *******************************************************/
13    
14    
15  #ifdef PASO_MPI  #ifdef PASO_MPI
16  #include <mpi.h>  #include <mpi.h>
# Line 476  namespace finley { Line 475  namespace finley {
475                       int integrationOrder,                       int integrationOrder,
476                                       int reducedIntegrationOrder,                                       int reducedIntegrationOrder,
477                                       int optimize)                                       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();  
   
     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)  
478    {    {
479      //      //
480      // create a copy of the filename to overcome the non-constness of call      // create a copy of the filename to overcome the non-constness of call

Legend:
Removed from v.1776  
changed lines
  Added in v.1813

  ViewVC Help
Powered by ViewVC 1.1.26