/[escript]/branches/diaplayground/dudley/src/CPPAdapter/dudleycpp.cpp
ViewVC logotype

Diff of /branches/diaplayground/dudley/src/CPPAdapter/dudleycpp.cpp

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

branches/domexper/dudley/src/CPPAdapter/dudleycpp.cpp revision 3114 by jfenwick, Fri Aug 27 05:26:25 2010 UTC trunk/dudley/src/CPPAdapter/dudleycpp.cpp revision 3469 by jfenwick, Tue Feb 22 06:39:16 2011 UTC
# Line 12  Line 12 
12  *******************************************************/  *******************************************************/
13    
14    
15  #ifdef PASO_MPI  #ifdef ESYS_MPI
16  #include <mpi.h>  #include "esysUtils/Esys_MPI.h"
 #include "paso/Paso_MPI.h"  
17  #endif  #endif
18  extern "C" {  extern "C" {
19  #include "../Dudley.h"  #include "../Dudley.h"
# Line 115  BOOST_PYTHON_MODULE(dudleycpp) Line 114  BOOST_PYTHON_MODULE(dudleycpp)
114        arg("useElementsOnFace")=false,        arg("useElementsOnFace")=false,
115        arg("useFullElementOrder")=false,        arg("useFullElementOrder")=false,
116        arg("optimize")=false)        arg("optimize")=false)
117  ,"Creates a rectangular mesh with n0 x n1 x n2 elements over the brick [0,l0] x [0,l1] x [0,l2]."  ,"Creates a tetrahedral mesh by subdividing n0 x n1 x n2 rectangular elements over the brick [0,l0] x [0,l1] x [0,l2]."
118  "\n\n:param n0:\n:type n0:\n:param n1:\n:type n1:\n:param n2:\n:type n2:\n"  "\n\n:param n0:\n:type n0:\n:param n1:\n:type n1:\n:param n2:\n:type n2:\n"
119  ":param order: =1, =-1 or =2 gives the order of shape function. If -1 macro elements of order 1 are used.\n"  ":param order: =1, =-1 or =2 gives the order of shape function. If -1 macro elements of order 1 are used.\n"
120  ":param l0: length of side 0\n:param l1:\n:param l2:\n"  ":param l0: length of side 0\n:param l1:\n:param l2:\n"
# Line 137  BOOST_PYTHON_MODULE(dudleycpp) Line 136  BOOST_PYTHON_MODULE(dudleycpp)
136        arg("useElementsOnFace")=false,        arg("useElementsOnFace")=false,
137        arg("useFullElementOrder")=false,        arg("useFullElementOrder")=false,
138        arg("optimize")=false)        arg("optimize")=false)
139  ,"Creates a rectangular mesh with n0 x n1 elements over the brick [0,l0] x [0,l1]."  ,"Creates a triangular mesh by subdividing n0 x n1 rectangular elements over the brick [0,l0] x [0,l1]."
140  "\n\n:param n0:\n:type n0:\n:param n1:\n:type n1:\n"  "\n\n:param n0:\n:type n0:\n:param n1:\n:type n1:\n"
141  ":param order: =1, =-1 or =2 gives the order of shape function. If -1 macro elements of order 1 are used.\n"  ":param order: =1, =-1 or =2 gives the order of shape function. If -1 macro elements of order 1 are used.\n"
142  ":param l0: length of side 0\n:param l1:\n"  ":param l0: length of side 0\n:param l1:\n"
# Line 152  BOOST_PYTHON_MODULE(dudleycpp) Line 151  BOOST_PYTHON_MODULE(dudleycpp)
151  ":param optimize: Enable optimisation of node labels\n:type optimize: ``bool``"  ":param optimize: Enable optimisation of node labels\n:type optimize: ``bool``"
152  );  );
153    
   def("Merge",dudley::meshMerge,args("meshList")  
 //       ,return_value_policy<manage_new_object>());  
 ,"Merges a list of meshes into one mesh.\n\n:rtype: `Domain`"  
   );  
   
   def("GlueFaces",dudley::glueFaces,  
       (arg("meshList"),arg("safetyFactor")=0.2,  
       arg("tolerance")=1.e-8,  
       arg("optimize")=true)  
 //       ,return_value_policy<manage_new_object>());  
 ,"Detects matching faces in the mesh, removes them from the mesh and joins the elements touched by the face elements."  
     );  
   
   def("JoinFaces",dudley::joinFaces,  
       (arg("meshList"), arg("safetyFactor")=0.2,  
       arg("tolerance")=1.e-8,  
       arg("optimize")=true)  
 //       ,return_value_policy<manage_new_object>());  
 ,"Detects matching faces in the mesh and replaces them by joint elements."  
     );  
   
   
154    class_<dudley::MeshAdapter, bases<escript::AbstractContinuousDomain> >    class_<dudley::MeshAdapter, bases<escript::AbstractContinuousDomain> >
155        ("MeshAdapter","A concrete class representing a domain. For more details, please consult the c++ documentation.",init<optional <Dudley_Mesh*> >())        ("MeshAdapter","A concrete class representing a domain. For more details, please consult the c++ documentation.",init<optional <Dudley_Mesh*> >())
156        .def(init<const dudley::MeshAdapter&>())        .def(init<const dudley::MeshAdapter&>())
# Line 192  BOOST_PYTHON_MODULE(dudleycpp) Line 169  BOOST_PYTHON_MODULE(dudleycpp)
169  ":return: the number of data points summed across all MPI processes\n"  ":return: the number of data points summed across all MPI processes\n"
170  ":rtype: ``int``")  ":rtype: ``int``")
171        .def("addPDEToSystem",&dudley::MeshAdapter::addPDEToSystem,        .def("addPDEToSystem",&dudley::MeshAdapter::addPDEToSystem,
172  args("mat", "rhs","A", "B", "C", "D", "X", "Y", "d", "y"),  args("mat", "rhs","A", "B", "C", "D", "X", "Y", "d", "y", "d_contact", "y_contact"),
173  "adds a PDE onto the stiffness matrix mat and a rhs\n\n"  "adds a PDE onto the stiffness matrix mat and a rhs\n\n"
174  ":param mat:\n:type mat: `OperatorAdapter`\n:param rhs:\n:type rhs: `Data`\n"  ":param mat:\n:type mat: `OperatorAdapter`\n:param rhs:\n:type rhs: `Data`\n"
175  ":param A:\n:type A: `Data`\n"  ":param A:\n:type A: `Data`\n"
# Line 202  args("mat", "rhs","A", "B", "C", "D", "X Line 179  args("mat", "rhs","A", "B", "C", "D", "X
179  ":param X:\n:type X: `Data`\n"  ":param X:\n:type X: `Data`\n"
180  ":param Y:\n:type Y: `Data`\n"  ":param Y:\n:type Y: `Data`\n"
181  ":param d:\n:type d: `Data`\n"  ":param d:\n:type d: `Data`\n"
182    ":param d_contact:\n:type d_contact: `Data`\n"
183    ":param y_contact:\n:type y_contact: `Data`\n"
184  )  )
185        .def("addPDEToLumpedSystem",&dudley::MeshAdapter::addPDEToLumpedSystem,        .def("addPDEToLumpedSystem",&dudley::MeshAdapter::addPDEToLumpedSystem,
186  args("mat", "D", "d"),  args("mat", "D", "d"),
187  "adds a PDE onto the lumped stiffness matrix\n\n"  "adds a PDE onto the lumped stiffness matrix\n\n"
188  ":param mat:\n:type mat: `Data`\n"  ":param mat:\n:type mat: `Data`\n"
189  ":param D:\n:type D: `Data`\n"  ":param D:\n:type D: `Data`\n"
190  ":param d:\n:type d: `Data`\n")  ":param d:\n:type d: `Data`\n"
191    ":param useHRZ:\n:type useHRZ: bool\n"
192    )
193        .def("addPDEToRHS",&dudley::MeshAdapter::addPDEToRHS,        .def("addPDEToRHS",&dudley::MeshAdapter::addPDEToRHS,
194  args("rhs", "X", "Y", "y", "y_contact"),  args("rhs", "X", "Y", "y", "y_contact"),
195  "adds a PDE onto the stiffness matrix mat and a rhs\n\n"  "adds a PDE onto the stiffness matrix mat and a rhs\n\n"

Legend:
Removed from v.3114  
changed lines
  Added in v.3469

  ViewVC Help
Powered by ViewVC 1.1.26