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

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

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

revision 1871 by ksteube, Thu Sep 25 23:11:13 2008 UTC revision 1872 by jfenwick, Mon Oct 13 00:18:55 2008 UTC
# Line 45  namespace finley { Line 45  namespace finley {
45       \param fileName Input -  The name of the file.       \param fileName Input -  The name of the file.
46    */    */
47    FINLEY_DLL_API    FINLEY_DLL_API
48    escript::AbstractContinuousDomain* loadMesh(const std::string& fileName);  /*  escript::AbstractContinuousDomain* loadMesh(const std::string& fileName);*/
49      escript::Domain_ptr loadMesh(const std::string& fileName);
50    /**    /**
51       \brief       \brief
52       Read a mesh from a file. For MPI parallel runs fan out the mesh to multiple processes.       Read a mesh from a file. For MPI parallel runs fan out the mesh to multiple processes.
# Line 57  namespace finley { Line 58  namespace finley {
58       \param optimize Input - switches on the optimization of node labels       \param optimize Input - switches on the optimization of node labels
59    */    */
60    FINLEY_DLL_API    FINLEY_DLL_API
61    escript::AbstractContinuousDomain* readMesh(const std::string& fileName,  //   escript::AbstractContinuousDomain* readMesh(const std::string& fileName,
62       escript::Domain_ptr readMesh(const std::string& fileName,
63                       int integrationOrder=-1,                       int integrationOrder=-1,
64                                       int reducedIntegrationOrder=-1,                                       int reducedIntegrationOrder=-1,
65                                       int optimize=0);                                       int optimize=0);
# Line 73  namespace finley { Line 75  namespace finley {
75       \param optimize Input - switches on the optimization of node labels       \param optimize Input - switches on the optimization of node labels
76    */    */
77    FINLEY_DLL_API    FINLEY_DLL_API
78    escript::AbstractContinuousDomain* readGmsh(const std::string& fileName,  //   escript::AbstractContinuousDomain* readGmsh(const std::string& fileName,
79      escript::Domain_ptr readGmsh(const std::string& fileName,
80                       int numDim,                       int numDim,
81                       int integrationOrder=-1,                       int integrationOrder=-1,
82                       int reducedIntegrationOrder=-1,                       int reducedIntegrationOrder=-1,
# Line 95  namespace finley { Line 98  namespace finley {
98       conditions of the dimension are periodic       conditions of the dimension are periodic
99    */    */
100    FINLEY_DLL_API    FINLEY_DLL_API
101    escript::AbstractContinuousDomain* brick(int n0=1,int n1=1,int n2=1,int order=1,  //   escript::AbstractContinuousDomain* brick(int n0=1,int n1=1,int n2=1,int order=1,
102      escript::Domain_ptr brick(int n0=1,int n1=1,int n2=1,int order=1,
103              double l0=1.0,double l1=1.0,double l2=1.0,              double l0=1.0,double l1=1.0,double l2=1.0,
104              int periodic0=0,int periodic1=0,              int periodic0=0,int periodic1=0,
105              int periodic2=0,              int periodic2=0,
# Line 122  namespace finley { Line 126  namespace finley {
126       \param useElementsOnFace Input - whether or not to use elements on face       \param useElementsOnFace Input - whether or not to use elements on face
127    */    */
128    FINLEY_DLL_API    FINLEY_DLL_API
129    escript::AbstractContinuousDomain* rectangle(int n0=1,int n1=1,int order=1,  //   escript::AbstractContinuousDomain* rectangle(int n0=1,int n1=1,int order=1,
130      escript::Domain_ptr rectangle(int n0=1,int n1=1,int order=1,
131                        double l0=1.0, double l1=1.0,                        double l0=1.0, double l1=1.0,
132                        int periodic0=false,int periodic1=false,                        int periodic0=false,int periodic1=false,
133                        int integrationOrder=-1,                        int integrationOrder=-1,
# Line 136  namespace finley { Line 141  namespace finley {
141       \param meshList Input - The list of meshes.       \param meshList Input - The list of meshes.
142    */    */
143    FINLEY_DLL_API    FINLEY_DLL_API
144    escript::AbstractContinuousDomain* meshMerge(const boost::python::list& meshList);  //   escript::AbstractContinuousDomain* meshMerge(const boost::python::list& meshList);
145      escript::Domain_ptr meshMerge(const boost::python::list& meshList);
146    /**    /**
147       \brief       \brief
148       Detects matching faces in the mesh, removes them from the mesh       Detects matching faces in the mesh, removes them from the mesh
# Line 147  namespace finley { Line 153  namespace finley {
153       \param optimize Input - switches on the optimization of node labels       \param optimize Input - switches on the optimization of node labels
154    */    */
155    FINLEY_DLL_API    FINLEY_DLL_API
156    escript::AbstractContinuousDomain* glueFaces(const boost::python::list& meshList,  //   escript::AbstractContinuousDomain* glueFaces(const boost::python::list& meshList,
157      escript::Domain_ptr glueFaces(const boost::python::list& meshList,
158                 double safetyFactor=0.2,                 double safetyFactor=0.2,
159                 double tolerance=1.e-8,                 double tolerance=1.e-8,
160                             int optimize=0);                             int optimize=0);
# Line 160  namespace finley { Line 167  namespace finley {
167       \param optimize Input - switches on the optimization of node labels       \param optimize Input - switches on the optimization of node labels
168    */    */
169    FINLEY_DLL_API    FINLEY_DLL_API
170    escript::AbstractContinuousDomain* joinFaces(const boost::python::list& meshList,  //   escript::AbstractContinuousDomain* joinFaces(const boost::python::list& meshList,
171      escript::Domain_ptr joinFaces(const boost::python::list& meshList,
172              double safetyFactor=0.2,              double safetyFactor=0.2,
173              double tolerance=1.e-8,              double tolerance=1.e-8,
174                          int optimize=0);                          int optimize=0);

Legend:
Removed from v.1871  
changed lines
  Added in v.1872

  ViewVC Help
Powered by ViewVC 1.1.26