/[escript]/trunk/escript/src/escriptcpp.cpp
ViewVC logotype

Diff of /trunk/escript/src/escriptcpp.cpp

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

revision 576 by gross, Fri Mar 3 08:28:42 2006 UTC revision 699 by gross, Fri Mar 31 06:27:56 2006 UTC
# Line 1  Line 1 
1  //$Id$  //$Id$
2  /*=============================================================================  /*
3     ************************************************************
4   ******************************************************************************   *          Copyright 2006 by ACcESS MNRF                   *
5   *                                                                            *   *                                                          *
6   *       COPYRIGHT ACcESS 2004 -  All Rights Reserved                         *   *              http://www.access.edu.au                    *
7   *                                                                            *   *       Primary Business: Queensland, Australia            *
8   * This software is the property of ACcESS.  No part of this code             *   *  Licensed under the Open Software License version 3.0    *
9   * may be copied in any form or by any means without the expressed written    *   *     http://www.opensource.org/licenses/osl-3.0.php       *
10   * consent of ACcESS.  Copying, use or modification of this software          *   *                                                          *
11   * by any unauthorised person is illegal unless that                          *   ************************************************************
12   * person has a software license agreement with ACcESS.                       *  */
  *                                                                            *  
  ******************************************************************************  
   
 ******************************************************************************/  
13    
14  #include "Data.h"  #include "Data.h"
 #include "DataVariable.h"  
15  #include "FunctionSpace.h"  #include "FunctionSpace.h"
16  #include "FunctionSpaceFactory.h"  #include "FunctionSpaceFactory.h"
17  #include "DataFactory.h"  #include "DataFactory.h"
# Line 25  Line 20 
20  #include "Utils.h"  #include "Utils.h"
21  #include "AbstractSystemMatrix.h"  #include "AbstractSystemMatrix.h"
22    
23  #include "esysExceptionTranslator.h"  #include "esysUtils/esysExceptionTranslator.h"
24    
25  #include <boost/python.hpp>  #include <boost/python.hpp>
26  #include <boost/python/module.hpp>  #include <boost/python/module.hpp>
# Line 106  BOOST_PYTHON_MODULE(escriptcpp) Line 101  BOOST_PYTHON_MODULE(escriptcpp)
101       .def("__str__",&escript::FunctionSpace::toString)       .def("__str__",&escript::FunctionSpace::toString)
102       .def(self == self)       .def(self == self)
103       .def(self != self);       .def(self != self);
   
   //  
   // Interface for DataVariable  
   //  
   class_<escript::DataVariable>("DataVariable",init<>())  
     .def(init<escript::Data*>())  
     .def("evaluate",&escript::DataVariable::evaluate)  
     .def("sum",&escript::DataVariable::sum)  
     .def("diff",&escript::DataVariable::diff);  
   
104    //    //
105    // Interface for Data    // Interface for Data
106    //    //
# Line 160  BOOST_PYTHON_MODULE(escriptcpp) Line 145  BOOST_PYTHON_MODULE(escriptcpp)
145      .def("_trace",&escript::Data::trace)      .def("_trace",&escript::Data::trace)
146      .def("_maxval",&escript::Data::maxval)      .def("_maxval",&escript::Data::maxval)
147      .def("_minval",&escript::Data::minval)      .def("_minval",&escript::Data::minval)
148      .def("_wherePositive",&escript::Data::wherePositive,(arg("tol")=0.0))      .def("_wherePositive",&escript::Data::wherePositive)
149      .def("_whereNegative",&escript::Data::whereNegative,(arg("tol")=0.0))      .def("_whereNegative",&escript::Data::whereNegative)
150      .def("_whereNonNegative",&escript::Data::whereNonNegative,(arg("tol")=0.0))      .def("_whereNonNegative",&escript::Data::whereNonNegative)
151      .def("_whereNonPositive",&escript::Data::whereNonPositive,(arg("tol")=0.0))      .def("_whereNonPositive",&escript::Data::whereNonPositive)
152      .def("_whereZero",&escript::Data::whereZero,(arg("tol")=0.0))      .def("_whereZero",&escript::Data::whereZero,(arg("tol")=0.0))
153      .def("_whereNonZero",&escript::Data::whereNonZero,(arg("tol")=0.0))      .def("_whereNonZero",&escript::Data::whereNonZero,(arg("tol")=0.0))
154      .def("_sin",&escript::Data::sin)      .def("_sin",&escript::Data::sin)
# Line 204  BOOST_PYTHON_MODULE(escriptcpp) Line 189  BOOST_PYTHON_MODULE(escriptcpp)
189      // following two functions implement the python ** operator      // following two functions implement the python ** operator
190      .def("__pow__",&escript::Data::powO)      .def("__pow__",&escript::Data::powO)
191      .def("__pow__",&escript::Data::powD)      .def("__pow__",&escript::Data::powD)
192        .def("__rpow__",&escript::Data::rpowO)
193      // NOTE:: The order of these declarations is important. Anything      // NOTE:: The order of these declarations is important. Anything
194      // declared before the generic declaration isn't found so the generic      // declared before the generic declaration isn't found so the generic
195      // version will be called.      // version will be called.

Legend:
Removed from v.576  
changed lines
  Added in v.699

  ViewVC Help
Powered by ViewVC 1.1.26