/[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 3991 by jfenwick, Fri Sep 21 02:47:54 2012 UTC revision 3992 by caltinay, Wed Sep 26 02:50:48 2012 UTC
# Line 62  namespace finley { Line 62  namespace finley {
62    FINLEY_DLL_API    FINLEY_DLL_API
63  //   escript::AbstractContinuousDomain* readMesh(const std::string& fileName,  //   escript::AbstractContinuousDomain* readMesh(const std::string& fileName,
64     escript::Domain_ptr readMesh(const std::string& fileName,     escript::Domain_ptr readMesh(const std::string& fileName,
65                       int integrationOrder=-1,                                       int integrationOrder=-1,
66                       int reducedIntegrationOrder=-1,                                       int reducedIntegrationOrder=-1,
67                                       int optimize=0);                                       int optimize=0);
68    /**    /**
69       \brief       \brief
# Line 80  namespace finley { Line 80  namespace finley {
80    FINLEY_DLL_API    FINLEY_DLL_API
81  //   escript::AbstractContinuousDomain* readGmsh(const std::string& fileName,  //   escript::AbstractContinuousDomain* readGmsh(const std::string& fileName,
82    escript::Domain_ptr readGmsh(const std::string& fileName,    escript::Domain_ptr readGmsh(const std::string& fileName,
83                       int numDim,                                 int numDim,
84                       int integrationOrder=-1,                                 int integrationOrder=-1,
85                       int reducedIntegrationOrder=-1,                                 int reducedIntegrationOrder=-1,
86                       int optimize=0,                                 int optimize=0,
87                                       int useMacroElements=0);                                 int useMacroElements=0);
88    
89    /**    /**
90       \brief       \brief
91       Creates a rectangular mesh with n0 x n1 x n2 elements over the brick       Creates a rectangular mesh with n0 x n1 x n2 elements over the brick
92       [0,l0] x [0,l1] x [0,l2].       [0,l0] x [0,l1] x [0,l2].
93    
94       \param n0,n1,n2 Input - number of elements in each dimension       \param n0,n1,n2 number of elements in each dimension
95       \param order Input - =1, =-1 or =2 gives the order of shape function (-1= macro elements of order 1)       \param order =1, =-1 or =2 gives the order of shape function
96       \param l0,l1,l2 Input - length of each side of brick                    (-1= macro elements of order 1)
97       \param integrationOrder Input - order of the quadrature scheme.         \param l0,l1,l2 length of each side of brick
98       If integrationOrder<0 the integration order is selected independently.       \param periodic0, periodic1, periodic2 whether or not boundary
99       \param reducedIntegrationOrder Input - order of the reduced quadrature scheme.                conditions of the dimension are periodic
100       If reducedIntegrationOrder<0 the integration order is selected independently.       \param integrationOrder order of the quadrature scheme.  
101       \param useElementsOnFace Input - whether or not to use elements on face            If integrationOrder<0 the integration order is selected independently.
102       \param periodic0, periodic1, periodic2 Input - whether or not boundary       \param reducedIntegrationOrder order of the reduced quadrature scheme.  
103       conditions of the dimension are periodic            If reducedIntegrationOrder<0 the integration order is selected independently.
104       \param useFullElementOrder       \param useElementsOnFace whether or not to use elements on face
105       \param optimize       \param useFullElementOrder whether to use second order elements
106         \param optimize whether to apply optimization
107         \param points
108         \param tags
109         \param tagnamestonums
110    */    */
 //   escript::AbstractContinuousDomain* brick(int n0=1,int n1=1,int n2=1,int order=1,  
111  FINLEY_DLL_API  FINLEY_DLL_API
112    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,
113              double l0=1.0,double l1=1.0,double l2=1.0,                      double l0=1.0, double l1=1.0, double l2=1.0,
114              int periodic0=0,int periodic1=0,                      int periodic0=0, int periodic1=0,
115              int periodic2=0,                      int periodic2=0,
116              int integrationOrder=-1,                      int integrationOrder=-1,
117              int reducedIntegrationOrder=-1,                      int reducedIntegrationOrder=-1,
118              int useElementsOnFace=0,                      int useElementsOnFace=0,
119                      int useFullElementOrder=0,                      int useFullElementOrder=0,
120                      int optimize=0,                      int optimize=0,
121              const std::vector<double>& points=std::vector<double>(),                      const std::vector<double>& points=std::vector<double>(),
122              const std::vector<int>& tags=std::vector<int>(),                      const std::vector<int>& tags=std::vector<int>(),
123              const std::map<std::string, int>& tagnamestonums=std::map<std::string, int>()                      const std::map<std::string, int>& tagnamestonums=std::map<std::string, int>()
124              );                      );
125                                    
126     /**     /**
127     \brief Python driver for brick()     \brief Python driver for brick()
128     \param args see brick() definition for order of params     \param args see brick() definition for order of params
# Line 140  FINLEY_DLL_API Line 143  FINLEY_DLL_API
143       Creates a rectangular mesh with n0 x n1 elements over the brick       Creates a rectangular mesh with n0 x n1 elements over the brick
144       [0,l0] x [0,l1].       [0,l0] x [0,l1].
145    
146       \param n0,n1 Input - number of elements in each dimension       \param n0,n1 number of elements in each dimension
147       \param order Input - =1, =-1 or =2 gives the order of shape function (-1= macro elements of order 1)       \param l0,l1 length of each side of brick
148       \param l0,l1 Input - length of each side of brick       \param order =1, =-1 or =2 gives the order of shape function
149       \param integrationOrder Input - order of the quadrature scheme.                    (-1= macro elements of order 1)
150       If integrationOrder<0 the integration order is selected       \param periodic0, periodic1 whether or not the boundary conditions of the
151       independently.              dimension are periodic
152       \param reducedIntegrationOrder Input - order of the reduced quadrature scheme.         \param integrationOrder order of the quadrature scheme.
153       If reducedIntegrationOrder<0 the integration order is selected independently.              If integrationOrder<0 the integration order is selected
154       \param periodic0, periodic1 Input - whether or not the boundary              independently.
155       conditions of the dimension are periodic       \param reducedIntegrationOrder order of the reduced quadrature scheme.  
156       \param useElementsOnFace Input - whether or not to use elements on face              If reducedIntegrationOrder<0 the integration order is selected
157                independently.
158         \param useElementsOnFace whether or not to use elements on face
159       \param useFullElementOrder       \param useFullElementOrder
160       \param optimize       \param optimize
161         \param points
162         \param tags
163         \param tagnamestonums
164    */    */
 //   escript::AbstractContinuousDomain* rectangle(int n0=1,int n1=1,int order=1,  
165  FINLEY_DLL_API  FINLEY_DLL_API
166    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,
167                        double l0=1.0, double l1=1.0,                                  double l0=1.0, double l1=1.0,
168                        int periodic0=false,int periodic1=false,                                  int periodic0=false, int periodic1=false,
169                        int integrationOrder=-1,                                  int integrationOrder=-1,
170                                        int reducedIntegrationOrder=-1,                                  int reducedIntegrationOrder=-1,
171                        int useElementsOnFace=0,                                  int useElementsOnFace=0,
172                                        int useFullElementOrder=0,                                  int useFullElementOrder=0,
173                                        int optimize=0,                                  int optimize=0,
174                        const std::vector<double>& points=std::vector<double>(),                                  const std::vector<double>& points=std::vector<double>(),
175                        const std::vector<int>& tags=std::vector<int>(),                                  const std::vector<int>& tags=std::vector<int>(),
176                        const std::map<std::string, int>& tagnamestonums=std::map<std::string, int>()                                  const std::map<std::string, int>& tagnamestonums=std::map<std::string, int>()
177                        );                          );
178    /**    /**
179       \brief       \brief
180       Merges a list of meshes into one list.       Merges a list of meshes into one list.
# Line 188  FINLEY_DLL_API Line 195  FINLEY_DLL_API
195    FINLEY_DLL_API    FINLEY_DLL_API
196  //   escript::AbstractContinuousDomain* glueFaces(const boost::python::list& meshList,  //   escript::AbstractContinuousDomain* glueFaces(const boost::python::list& meshList,
197    escript::Domain_ptr glueFaces(const boost::python::list& meshList,    escript::Domain_ptr glueFaces(const boost::python::list& meshList,
198                 double safetyFactor=0.2,                             double safetyFactor=0.2,
199                 double tolerance=1.e-8,                             double tolerance=1.e-8,
200                             int optimize=0);                             int optimize=0);
201    /**    /**
202       \brief       \brief
# Line 202  FINLEY_DLL_API Line 209  FINLEY_DLL_API
209    FINLEY_DLL_API    FINLEY_DLL_API
210  //   escript::AbstractContinuousDomain* joinFaces(const boost::python::list& meshList,  //   escript::AbstractContinuousDomain* joinFaces(const boost::python::list& meshList,
211    escript::Domain_ptr joinFaces(const boost::python::list& meshList,    escript::Domain_ptr joinFaces(const boost::python::list& meshList,
212              double safetyFactor=0.2,                          double safetyFactor=0.2,
213              double tolerance=1.e-8,                          double tolerance=1.e-8,
214                          int optimize=0);                          int optimize=0);
215    
216  } // end of namespace  } // end of namespace

Legend:
Removed from v.3991  
changed lines
  Added in v.3992

  ViewVC Help
Powered by ViewVC 1.1.26