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

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

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

revision 3082 by jfenwick, Tue Aug 3 06:04:05 2010 UTC revision 3086 by jfenwick, Thu Aug 5 05:07:58 2010 UTC
# Line 12  Line 12 
12  *******************************************************/  *******************************************************/
13    
14    
15  #if !defined  finley_MeshAdapterFactory_20040526_H  #if !defined  dudley_MeshAdapterFactory_20040526_H
16  #define finley_MeshAdapterFactory_20040526_H  #define dudley_MeshAdapterFactory_20040526_H
17  #include "system_dep.h"  #include "system_dep.h"
18    
19  extern "C" {  extern "C" {
# Line 44  namespace dudley { Line 44  namespace dudley {
44       recovers mesg from a dump file       recovers mesg from a dump file
45       \param fileName Input -  The name of the file.       \param fileName Input -  The name of the file.
46    */    */
47    FINLEY_DLL_API    DUDLEY_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);    escript::Domain_ptr loadMesh(const std::string& fileName);
50    /**    /**
# Line 57  namespace dudley { Line 57  namespace dudley {
57       If reducedIntegrationOrder<0 the integration order is selected independently.       If reducedIntegrationOrder<0 the integration order is selected independently.
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    DUDLEY_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,     escript::Domain_ptr readMesh(const std::string& fileName,
63                       int integrationOrder=-1,                       int integrationOrder=-1,
# Line 74  namespace dudley { Line 74  namespace dudley {
74       If reducedIntegrationOrder<0 the integration order is selected independently.       If reducedIntegrationOrder<0 the integration order is selected independently.
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    DUDLEY_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,    escript::Domain_ptr readGmsh(const std::string& fileName,
80                       int numDim,                       int numDim,
# Line 101  namespace dudley { Line 101  namespace dudley {
101       \param useMacroElements       \param useMacroElements
102       \param optimize       \param optimize
103    */    */
104    FINLEY_DLL_API    DUDLEY_DLL_API
105  //   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,
106    escript::Domain_ptr brick(int n0=1,int n1=1,int n2=1,int order=1,    escript::Domain_ptr brick(int n0=1,int n1=1,int n2=1,int order=1,
107              double l0=1.0,double l1=1.0,double l2=1.0,              double l0=1.0,double l1=1.0,double l2=1.0,
# Line 131  namespace dudley { Line 131  namespace dudley {
131       \param useFullElementOrder       \param useFullElementOrder
132       \param optimize       \param optimize
133    */    */
134    FINLEY_DLL_API    DUDLEY_DLL_API
135  //   escript::AbstractContinuousDomain* rectangle(int n0=1,int n1=1,int order=1,  //   escript::AbstractContinuousDomain* rectangle(int n0=1,int n1=1,int order=1,
136    escript::Domain_ptr rectangle(int n0=1,int n1=1,int order=1,    escript::Domain_ptr rectangle(int n0=1,int n1=1,int order=1,
137                        double l0=1.0, double l1=1.0,                        double l0=1.0, double l1=1.0,
# Line 146  namespace dudley { Line 146  namespace dudley {
146       Merges a list of meshes into one list.       Merges a list of meshes into one list.
147       \param meshList Input - The list of meshes.       \param meshList Input - The list of meshes.
148    */    */
149    FINLEY_DLL_API    DUDLEY_DLL_API
150  //   escript::AbstractContinuousDomain* meshMerge(const boost::python::list& meshList);  //   escript::AbstractContinuousDomain* meshMerge(const boost::python::list& meshList);
151    escript::Domain_ptr meshMerge(const boost::python::list& meshList);    escript::Domain_ptr meshMerge(const boost::python::list& meshList);
152    /**    /**
# Line 158  namespace dudley { Line 158  namespace dudley {
158       \param tolerance Input - ??       \param tolerance Input - ??
159       \param optimize Input - switches on the optimization of node labels       \param optimize Input - switches on the optimization of node labels
160    */    */
161    FINLEY_DLL_API    DUDLEY_DLL_API
162  //   escript::AbstractContinuousDomain* glueFaces(const boost::python::list& meshList,  //   escript::AbstractContinuousDomain* glueFaces(const boost::python::list& meshList,
163    escript::Domain_ptr glueFaces(const boost::python::list& meshList,    escript::Domain_ptr glueFaces(const boost::python::list& meshList,
164                 double safetyFactor=0.2,                 double safetyFactor=0.2,
# Line 172  namespace dudley { Line 172  namespace dudley {
172       \param tolerance Input - ??       \param tolerance Input - ??
173       \param optimize Input - switches on the optimization of node labels       \param optimize Input - switches on the optimization of node labels
174    */    */
175    FINLEY_DLL_API    DUDLEY_DLL_API
176  //   escript::AbstractContinuousDomain* joinFaces(const boost::python::list& meshList,  //   escript::AbstractContinuousDomain* joinFaces(const boost::python::list& meshList,
177    escript::Domain_ptr joinFaces(const boost::python::list& meshList,    escript::Domain_ptr joinFaces(const boost::python::list& meshList,
178              double safetyFactor=0.2,              double safetyFactor=0.2,

Legend:
Removed from v.3082  
changed lines
  Added in v.3086

  ViewVC Help
Powered by ViewVC 1.1.26