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

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

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

trunk/finley/src/finley/CPPAdapter/finleycpp.cpp revision 201 by jgs, Wed Nov 23 04:10:21 2005 UTC trunk/finley/src/CPPAdapter/finleycpp.cpp revision 1107 by gross, Thu Apr 19 02:14:18 2007 UTC
# Line 14  Line 14 
14    
15  ******************************************************************************/  ******************************************************************************/
16    
17    #ifdef PASO_MPI
18    #include <mpi.h>
19    #endif
20  extern "C" {  extern "C" {
21  #include "finley/finleyC/Finley.h"  #include "../Finley.h"
22  }  }
 #include "finley/CPPAdapter/MeshAdapter.h"  
 #include "finley/CPPAdapter/MeshAdapterFactory.h"  
 #include "finley/CPPAdapter/SystemMatrixAdapter.h"  
23    
24  #include "esysUtils/EsysException.h"  #include "MeshAdapter.h"
25    #include "MeshAdapterFactory.h"
26    #include "SystemMatrixAdapter.h"
27    
28    #include "FinleyAdapterException.h"
29    // #include "esysUtils/EsysException.h"
30  #include "esysUtils/esysExceptionTranslator.h"  #include "esysUtils/esysExceptionTranslator.h"
31    
32  #include "escript/Data/AbstractContinuousDomain.h"  #include "escript/AbstractContinuousDomain.h"
33    
34  #include <boost/python.hpp>  #include <boost/python.hpp>
35  #include <boost/python/module.hpp>  #include <boost/python/module.hpp>
# Line 85  BOOST_PYTHON_MODULE(finleycpp) Line 90  BOOST_PYTHON_MODULE(finleycpp)
90    // return pointers.    // return pointers.
91    
92    def("ReadMesh",finley::readMesh,    def("ReadMesh",finley::readMesh,
93        (arg("fileName"),arg("integrationOrder")=-1),        (arg("fileName")="file.fly",arg("integrationOrder")=-1,  arg("reducedIntegrationOrder")=-1,  arg("optimizeLabeling")=true),
94          return_value_policy<manage_new_object>());
95    
96      def("ReadGmsh",finley::readGmsh,
97          (arg("fileName")="file.msh",arg("numDim"), arg("integrationOrder")=-1, arg("reducedIntegrationOrder")=-1, arg("optimizeLabeling")=true),
98        return_value_policy<manage_new_object>());        return_value_policy<manage_new_object>());
99    
100    def ("Brick",finley::brick,    def ("Brick",finley::brick,
# Line 93  BOOST_PYTHON_MODULE(finleycpp) Line 102  BOOST_PYTHON_MODULE(finleycpp)
102        arg("order")=1,        arg("order")=1,
103        arg("l0")=1.0,arg("l1")=1.0,arg("l2")=1.0,        arg("l0")=1.0,arg("l1")=1.0,arg("l2")=1.0,
104        arg("periodic0")=false,arg("periodic1")=false,arg("periodic2")=false,        arg("periodic0")=false,arg("periodic1")=false,arg("periodic2")=false,
105        arg("integrationOrder")=-1,        arg("integrationOrder")=-1,  arg("reducedIntegrationOrder")=-1,
106        arg("useElementsOnFace")=false),        arg("useElementsOnFace")=false),
107        return_value_policy<manage_new_object>());        return_value_policy<manage_new_object>());
108    
# Line 101  BOOST_PYTHON_MODULE(finleycpp) Line 110  BOOST_PYTHON_MODULE(finleycpp)
110        (arg("n0")=1,arg("n1")=1,arg("order")=1,        (arg("n0")=1,arg("n1")=1,arg("order")=1,
111        arg("l0")=1.0,arg("l1")=1.0,        arg("l0")=1.0,arg("l1")=1.0,
112        arg("periodic0")=false,arg("periodic1")=false,        arg("periodic0")=false,arg("periodic1")=false,
113        arg("integrationOrder")=-1,        arg("integrationOrder")=-1,  arg("reducedIntegrationOrder")=-1,
114        arg("useElementsOnFace")=false),        arg("useElementsOnFace")=false),
115        return_value_policy<manage_new_object>());        return_value_policy<manage_new_object>());
116    
117    def("Interval",finley::interval,    def("Interval",finley::interval,
118        (arg("n1")=1,arg("order")=1,        (arg("n1")=1,arg("order")=1,
119        arg("l1")=1.0,arg("periodic0")=false,        arg("l1")=1.0,arg("periodic0")=false,
120        arg("integrationOrder")=-1,        arg("integrationOrder")=-1,  arg("reducedIntegrationOrder")=-1,
121        arg("useElementsOnFace")=false),        arg("useElementsOnFace")=false),
122        return_value_policy<manage_new_object>());        return_value_policy<manage_new_object>());
123    
# Line 117  BOOST_PYTHON_MODULE(finleycpp) Line 126  BOOST_PYTHON_MODULE(finleycpp)
126    
127    def("GlueFaces",finley::glueFaces,    def("GlueFaces",finley::glueFaces,
128        (arg("safetyFactor")=0.2,        (arg("safetyFactor")=0.2,
129        arg("tolerance")=std::numeric_limits<double>::epsilon()),        arg("tolerance")=1.e-8,
130          arg("optimizeLabeling")=true),
131        return_value_policy<manage_new_object>());        return_value_policy<manage_new_object>());
132    
133    def("JoinFaces",finley::joinFaces,    def("JoinFaces",finley::joinFaces,
134        (arg("safetyFactor")=0.2,        (arg("safetyFactor")=0.2,
135        arg("tolerance")=std::numeric_limits<double>::epsilon()),        arg("tolerance")=1.e-8,
136          arg("optimizeLabeling")=true),
137        return_value_policy<manage_new_object>());        return_value_policy<manage_new_object>());
138    
139    register_exception_translator<esysUtils::EsysException>(&esysUtils::esysExceptionTranslator);    register_exception_translator<finley::FinleyAdapterException>(&(esysUtils::esysExceptionTranslator));
140    
141    class_<finley::MeshAdapter, bases<escript::AbstractContinuousDomain> >    class_<finley::MeshAdapter, bases<escript::AbstractContinuousDomain> >
142        ("MeshAdapter",init<optional <Finley_Mesh*> >())        ("MeshAdapter",init<optional <Finley_Mesh*> >())
# Line 143  BOOST_PYTHON_MODULE(finleycpp) Line 154  BOOST_PYTHON_MODULE(finleycpp)
154        .def("getNormal",&finley::MeshAdapter::getNormal)        .def("getNormal",&finley::MeshAdapter::getNormal)
155        .def("getSize",&finley::MeshAdapter::getSize)        .def("getSize",&finley::MeshAdapter::getSize)
156        .def("saveDX",&finley::MeshAdapter::saveDX)        .def("saveDX",&finley::MeshAdapter::saveDX)
157        .def("saveVTK",&finley::MeshAdapter::saveVTK);        .def("saveVTK",&finley::MeshAdapter::saveVTK)
158          .def("setTagMap",&finley::MeshAdapter::setTagMap)
159          .def("getTag",&finley::MeshAdapter::getTag)
160          .def("isValidTagName",&finley::MeshAdapter::isValidTagName)
161          .def("showTagNames",&finley::MeshAdapter::showTagNames);
162    
163    
164    class_<finley::SystemMatrixAdapter, bases<escript::AbstractSystemMatrix> >    class_<finley::SystemMatrixAdapter, bases<escript::AbstractSystemMatrix> >

Legend:
Removed from v.201  
changed lines
  Added in v.1107

  ViewVC Help
Powered by ViewVC 1.1.26