/[escript]/branches/dirac/finley/src/CPPAdapter/finleycpp.cpp
ViewVC logotype

Diff of /branches/dirac/finley/src/CPPAdapter/finleycpp.cpp

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

revision 1360 by ksteube, Thu Dec 13 05:05:00 2007 UTC revision 1811 by ksteube, Thu Sep 25 23:11:13 2008 UTC
# Line 1  Line 1 
1    
 /* $Id$ */  
   
2  /*******************************************************  /*******************************************************
3   *  *
4   *           Copyright 2003-2007 by ACceSS MNRF  * Copyright (c) 2003-2008 by University of Queensland
5   *       Copyright 2007 by University of Queensland  * Earth Systems Science Computational Center (ESSCC)
6   *  * http://www.uq.edu.au/esscc
7   *                http://esscc.uq.edu.au  *
8   *        Primary Business: Queensland, Australia  * Primary Business: Queensland, Australia
9   *  Licensed under the Open Software License version 3.0  * Licensed under the Open Software License version 3.0
10   *     http://www.opensource.org/licenses/osl-3.0.php  * http://www.opensource.org/licenses/osl-3.0.php
11   *  *
12   *******************************************************/  *******************************************************/
13    
14    
15  #ifdef PASO_MPI  #ifdef PASO_MPI
16  #include <mpi.h>  #include <mpi.h>
17    #include "paso/Paso_MPI.h"
18  #endif  #endif
19  extern "C" {  extern "C" {
20  #include "../Finley.h"  #include "../Finley.h"
# Line 23  extern "C" { Line 23  extern "C" {
23  #include "MeshAdapter.h"  #include "MeshAdapter.h"
24  #include "MeshAdapterFactory.h"  #include "MeshAdapterFactory.h"
25  #include "SystemMatrixAdapter.h"  #include "SystemMatrixAdapter.h"
26    #include "TransportProblemAdapter.h"
27    
28  #include "FinleyAdapterException.h"  #include "FinleyAdapterException.h"
29  // #include "esysUtils/EsysException.h"  // #include "esysUtils/EsysException.h"
# Line 78  using namespace boost::python; Line 79  using namespace boost::python;
79  BOOST_PYTHON_MODULE(finleycpp)  BOOST_PYTHON_MODULE(finleycpp)
80  {  {
81    
   // def("ReadMesh",finley::readMesh,readMesh_overloads());  
   // def("Brick",finley::brick,brick_overloads());  
   // def("Rectangle",finley::rectangle,rectangle_overloads());  
   // def("Interval",finley::interval,interval_overloads());  
   // def("GlueFaces",finley::glueFaces,glueFaces_overloads());  
   // def("JoinFaces",finley::joinFaces,joinFaces_overloads());  
82    //    //
83    // NOTE: The return_value_policy is necessary for functions that    // NOTE: The return_value_policy is necessary for functions that
84    // return pointers.    // return pointers.
85      //
86      register_exception_translator<finley::FinleyAdapterException>(&(esysUtils::esysExceptionTranslator));
87    
88    def("LoadMesh",finley::loadMesh,    def("LoadMesh",finley::loadMesh,
89        (arg("fileName")="file.nc"),        (arg("fileName")="file.nc"),
# Line 94  BOOST_PYTHON_MODULE(finleycpp) Line 91  BOOST_PYTHON_MODULE(finleycpp)
91    def("ReadMesh",finley::readMesh,    def("ReadMesh",finley::readMesh,
92        (arg("fileName")="file.fly",arg("integrationOrder")=-1,  arg("reducedIntegrationOrder")=-1,  arg("optimize")=true),        (arg("fileName")="file.fly",arg("integrationOrder")=-1,  arg("reducedIntegrationOrder")=-1,  arg("optimize")=true),
93        return_value_policy<manage_new_object>());        return_value_policy<manage_new_object>());
   def("ReadMeshMPI",finley::readMeshMPI,  
       (arg("fileName")="file.fly",arg("integrationOrder")=-1,  arg("reducedIntegrationOrder")=-1,  arg("optimize")=true),  
       return_value_policy<manage_new_object>());  
94    
95    def("ReadGmsh",finley::readGmsh,    def("ReadGmsh",finley::readGmsh,
96        (arg("fileName")="file.msh",arg("numDim"), arg("integrationOrder")=-1, arg("reducedIntegrationOrder")=-1, arg("optimize")=true),        (arg("fileName")="file.msh",arg("numDim"), arg("integrationOrder")=-1, arg("reducedIntegrationOrder")=-1, arg("optimize")=true),
# Line 138  BOOST_PYTHON_MODULE(finleycpp) Line 132  BOOST_PYTHON_MODULE(finleycpp)
132        arg("optimize")=true),        arg("optimize")=true),
133        return_value_policy<manage_new_object>());        return_value_policy<manage_new_object>());
134    
135    register_exception_translator<finley::FinleyAdapterException>(&(esysUtils::esysExceptionTranslator));  
136    
137    class_<finley::MeshAdapter, bases<escript::AbstractContinuousDomain> >    class_<finley::MeshAdapter, bases<escript::AbstractContinuousDomain> >
138        ("MeshAdapter",init<optional <Finley_Mesh*> >())        ("MeshAdapter",init<optional <Finley_Mesh*> >())
# Line 149  BOOST_PYTHON_MODULE(finleycpp) Line 143  BOOST_PYTHON_MODULE(finleycpp)
143        .def("getDescription",&finley::MeshAdapter::getDescription)        .def("getDescription",&finley::MeshAdapter::getDescription)
144        .def("getDim",&finley::MeshAdapter::getDim)        .def("getDim",&finley::MeshAdapter::getDim)
145        .def("getDataShape",&finley::MeshAdapter::getDataShape)        .def("getDataShape",&finley::MeshAdapter::getDataShape)
146          .def("getNumDataPointsGlobal",&finley::MeshAdapter::getNumDataPointsGlobal)
147        .def("addPDEToSystem",&finley::MeshAdapter::addPDEToSystem)        .def("addPDEToSystem",&finley::MeshAdapter::addPDEToSystem)
148        .def("addPDEToLumpedSystem",&finley::MeshAdapter::addPDEToLumpedSystem)        .def("addPDEToLumpedSystem",&finley::MeshAdapter::addPDEToLumpedSystem)
149        .def("addPDEToRHS",&finley::MeshAdapter::addPDEToRHS)        .def("addPDEToRHS",&finley::MeshAdapter::addPDEToRHS)
150          .def("addPDEToTransportProblem",&finley::MeshAdapter::addPDEToTransportProblem)
151        .def("newOperator",&finley::MeshAdapter::newSystemMatrix)        .def("newOperator",&finley::MeshAdapter::newSystemMatrix)
152          .def("newTransportProblem",&finley::MeshAdapter::newTransportProblem)
153        .def("getSystemMatrixTypeId",&finley::MeshAdapter::getSystemMatrixTypeId)        .def("getSystemMatrixTypeId",&finley::MeshAdapter::getSystemMatrixTypeId)
154        .def("setX",&finley::MeshAdapter::setNewX)        .def("setX",&finley::MeshAdapter::setNewX)
155        .def("getX",&finley::MeshAdapter::getX)        .def("getX",&finley::MeshAdapter::getX)
# Line 175  BOOST_PYTHON_MODULE(finleycpp) Line 172  BOOST_PYTHON_MODULE(finleycpp)
172        .def("saveMM",&finley::SystemMatrixAdapter::saveMM)        .def("saveMM",&finley::SystemMatrixAdapter::saveMM)
173        .def("saveHB",&finley::SystemMatrixAdapter::saveHB);        .def("saveHB",&finley::SystemMatrixAdapter::saveHB);
174    
175      class_<finley::TransportProblemAdapter, bases<escript::AbstractTransportProblem> >
176          ("TransportProblemAdapter",no_init)
177          .def("getSafeTimeStepSize",&finley::TransportProblemAdapter::getSafeTimeStepSize)
178          .def("resetTransport",&finley::TransportProblemAdapter::resetTransport);
179  }  }

Legend:
Removed from v.1360  
changed lines
  Added in v.1811

  ViewVC Help
Powered by ViewVC 1.1.26