/[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 817 by ksteube, Sat Aug 26 03:08:52 2006 UTC revision 934 by gross, Tue Jan 23 09:52:45 2007 UTC
# Line 57  namespace finley { Line 57  namespace finley {
57      return temp;      return temp;
58    }    }
59    
60      AbstractContinuousDomain* readGmsh(const std::string& fileName,
61                                         int numDim,
62                                         int integrationOrder,
63                                         int reducedIntegrationOrder,
64                                         bool optimizeLabeling)
65      {
66        //
67        // create a copy of the filename to overcome the non-constness of call
68        // to Finley_Mesh_read
69        Finley_Mesh* fMesh=0;
70        // Win32 refactor
71        char *fName = ((fileName.size()+1)>0) ? TMPMEMALLOC((fileName.size()+1),char) : (char*)NULL;
72        strcpy(fName,fileName.c_str());
73    
74    #ifndef PASO_MPI
75        fMesh=Finley_Mesh_readGmsh(fName, numDim, integrationOrder, reducedIntegrationOrder, optimizeLabeling);
76    #else
77        {
78          stringstream temp;
79          temp << "Unable to read gmsh meshes from file under MPI yet...";
80          setFinleyError(VALUE_ERROR,temp.str().c_str());
81        }
82    #endif
83        checkFinleyError();
84        AbstractContinuousDomain* temp=new MeshAdapter(fMesh);
85        
86        /* win32 refactor */
87        TMPMEMFREE(fName);
88        
89        return temp;
90      }
91    
92    AbstractContinuousDomain* brick(int n0,int n1,int n2,int order,    AbstractContinuousDomain* brick(int n0,int n1,int n2,int order,
93              double l0,double l1,double l2,              double l0,double l1,double l2,
94              int periodic0,int periodic1,              int periodic0,int periodic1,

Legend:
Removed from v.817  
changed lines
  Added in v.934

  ViewVC Help
Powered by ViewVC 1.1.26