revision 682 by robwdcock, Mon Mar 27 02:43:09 2006 UTC revision 757 by woo409, Mon Jun 26 13:12:56 2006 UTC
# Line 13  Line 13
13
16    #include "system_dep.h"
17
18  extern "C" {  extern "C" {
19  #include "../Finley.h"  #include "../Finley.h"
# Line 44  namespace finley { Line 45  namespace finley {
45       \param integrationOrder Input - order of the quadrature scheme.         \param integrationOrder Input - order of the quadrature scheme.
46       If integrationOrder<0 the integration order is selected independently.       If integrationOrder<0 the integration order is selected independently.
47    */    */
48      FINLEY_DLL_API
50                       int integrationOrder=-1);                       int integrationOrder=-1);
51    /**    /**
# Line 59  namespace finley { Line 61  namespace finley {
61       \param periodic0, periodic1, periodic2 Input - whether or not boundary       \param periodic0, periodic1, periodic2 Input - whether or not boundary
62       conditions of the dimension are periodic       conditions of the dimension are periodic
63    */    */
64      FINLEY_DLL_API
65    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,
66              double l0=1.0,double l1=1.0,double l2=1.0,              double l0=1.0,double l1=1.0,double l2=1.0,
67              int periodic0=0,int periodic1=0,              int periodic0=0,int periodic1=0,
# Line 80  namespace finley { Line 83  namespace finley {
83       conditions of the dimension are periodic       conditions of the dimension are periodic
84       \param useElementsOnFace Input - whether or not to use elements on face       \param useElementsOnFace Input - whether or not to use elements on face
85    */    */
86      FINLEY_DLL_API
87    escript::AbstractContinuousDomain* rectangle(int n0=1,int n1=1,int order=1,    escript::AbstractContinuousDomain* rectangle(int n0=1,int n1=1,int order=1,
88                        double l0=1.0, double l1=1.0,                        double l0=1.0, double l1=1.0,
89                        int periodic0=false,int periodic1=false,                        int periodic0=false,int periodic1=false,
# Line 99  namespace finley { Line 103  namespace finley {
103       \param useElementsOnFace Input - whether or not to use the elements       \param useElementsOnFace Input - whether or not to use the elements
104       on the face       on the face
105    */    */
106      FINLEY_DLL_API
107    escript::AbstractContinuousDomain* interval(int n0=1,int order=1,double l0=1.0,    escript::AbstractContinuousDomain* interval(int n0=1,int order=1,double l0=1.0,
108                       int periodic0=false,                       int periodic0=false,
109                       int integrationOrder=-1,                       int integrationOrder=-1,
# Line 108  namespace finley { Line 113  namespace finley {
113       Merges a list of meshes into one list.       Merges a list of meshes into one list.
114       \param meshList Input - The list of meshes.       \param meshList Input - The list of meshes.
115    */    */
116      FINLEY_DLL_API
117    escript::AbstractContinuousDomain* meshMerge(const boost::python::list& meshList);    escript::AbstractContinuousDomain* meshMerge(const boost::python::list& meshList);
118    /**    /**
119       \brief       \brief
# Line 117  namespace finley { Line 123  namespace finley {
123       \param safetyFactor Input - ??       \param safetyFactor Input - ??
124       \param tolerance Input - ??       \param tolerance Input - ??
125    */    */
126      FINLEY_DLL_API
127    escript::AbstractContinuousDomain* glueFaces(const boost::python::list& meshList,    escript::AbstractContinuousDomain* glueFaces(const boost::python::list& meshList,
128                 double safetyFactor=0.2,                 double safetyFactor=0.2,
129                 double tolerance=100.*std::numeric_limits<double>::epsilon());                 double tolerance=100.*std::numeric_limits<double>::epsilon());
# Line 127  namespace finley { Line 134  namespace finley {
134       \param safetyFactor Input - ??       \param safetyFactor Input - ??
135       \param tolerance Input - ??       \param tolerance Input - ??
136    */    */
137      FINLEY_DLL_API
138    escript::AbstractContinuousDomain* joinFaces(const boost::python::list& meshList,    escript::AbstractContinuousDomain* joinFaces(const boost::python::list& meshList,
139              double safetyFactor=0.2,              double safetyFactor=0.2,
140              double tolerance=100.*std::numeric_limits<double>::epsilon());              double tolerance=100.*std::numeric_limits<double>::epsilon());

Legend:
 Removed from v.682 changed lines Added in v.757