/[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 3269 by jfenwick, Wed Oct 13 03:21:50 2010 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 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"),

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

  ViewVC Help
Powered by ViewVC 1.1.26