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

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

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

revision 5932 by caltinay, Fri Feb 5 03:37:49 2016 UTC revision 5933 by caltinay, Wed Feb 17 23:53:30 2016 UTC
# Line 17  Line 17 
17  #define ESNEEDPYTHON  #define ESNEEDPYTHON
18  #include "esysUtils/first.h"  #include "esysUtils/first.h"
19    
   
 #ifdef ESYS_MPI  
20  #include "esysUtils/Esys_MPI.h"  #include "esysUtils/Esys_MPI.h"
 #endif  
21  #include "../Finley.h"  #include "../Finley.h"
22    
 #include <pasowrap/SystemMatrixAdapter.h>  
 #include <pasowrap/TransportProblemAdapter.h>  
   
   
23  #include "MeshAdapter.h"  #include "MeshAdapter.h"
24  #include "MeshAdapterFactory.h"  #include "MeshAdapterFactory.h"
 // #include "SystemMatrixAdapter.h"  
 // #include "TransportProblemAdapter.h"  
25    
26  #include "FinleyAdapterException.h"  #include "FinleyAdapterException.h"
 // #include "esysUtils/EsysException.h"  
27  #include "esysUtils/esysExceptionTranslator.h"  #include "esysUtils/esysExceptionTranslator.h"
   
28  #include "escript/AbstractContinuousDomain.h"  #include "escript/AbstractContinuousDomain.h"
29    
30  #include <boost/python.hpp>  #include <boost/python.hpp>
# Line 205  args("rhs", "X", "Y", "y", "y_contact"), Line 194  args("rhs", "X", "Y", "y", "y_contact"),
194  )  )
195        .def("addPDEToTransportProblem",&finley::MeshAdapter::addPDEToTransportProblem,        .def("addPDEToTransportProblem",&finley::MeshAdapter::addPDEToTransportProblem,
196  args( "tp", "source", "M", "A", "B", "C", "D", "X", "Y", "d", "y", "d_contact", "y_contact"),  args( "tp", "source", "M", "A", "B", "C", "D", "X", "Y", "d", "y", "d_contact", "y_contact"),
197  ":param tp:\n:type tp: `TransportProblemAdapter`\n"  ":param tp:\n:type tp: `TransportProblem`\n"
198  ":param source:\n:type source: `Data`\n"  ":param source:\n:type source: `Data`\n"
199  ":param M:\n:type M: `Data`\n"  ":param M:\n:type M: `Data`\n"
200  ":param A:\n:type A: `Data`\n"  ":param A:\n:type A: `Data`\n"
# Line 221  args( "tp", "source", "M", "A", "B", "C" Line 210  args( "tp", "source", "M", "A", "B", "C"
210  )  )
211        .def("newOperator",&finley::MeshAdapter::newSystemMatrix,        .def("newOperator",&finley::MeshAdapter::newSystemMatrix,
212  args("row_blocksize", "row_functionspace", "column_blocksize", "column_functionspace", "type"),  args("row_blocksize", "row_functionspace", "column_blocksize", "column_functionspace", "type"),
213  "creates a SystemMatrixAdapter stiffness matrix and initializes it with zeros\n\n"  "creates a stiffness matrix and initializes it with zeros\n\n"
214  ":param row_blocksize:\n:type row_blocksize: ``int``\n"  ":param row_blocksize:\n:type row_blocksize: ``int``\n"
215  ":param row_functionspace:\n:type row_functionspace: `FunctionSpace`\n"  ":param row_functionspace:\n:type row_functionspace: `FunctionSpace`\n"
216  ":param column_blocksize:\n:type column_blocksize: ``int``\n"  ":param column_blocksize:\n:type column_blocksize: ``int``\n"
# Line 230  args("row_blocksize", "row_functionspace Line 219  args("row_blocksize", "row_functionspace
219  )  )
220        .def("newTransportProblem",&finley::MeshAdapter::newTransportProblem,        .def("newTransportProblem",&finley::MeshAdapter::newTransportProblem,
221  args("theta", "blocksize", "functionspace", "type"),  args("theta", "blocksize", "functionspace", "type"),
222  "creates a TransportProblemAdapter\n\n"  "creates a TransportProblem\n\n"
223  ":param theta:\n:type theta: ``float``\n"  ":param theta:\n:type theta: ``float``\n"
224  ":param blocksize:\n:type blocksize: ``int``\n"  ":param blocksize:\n:type blocksize: ``int``\n"
225  ":param functionspace:\n:type functionspace: `FunctionSpace`\n"  ":param functionspace:\n:type functionspace: `FunctionSpace`\n"
# Line 290  args("arg"), "assigns new location to th Line 279  args("arg"), "assigns new location to th
279  //  "               to match the nearest node of the finite element mesh.\n:type point: ``list`` of ``floats``\n"  //  "               to match the nearest node of the finite element mesh.\n:type point: ``list`` of ``floats``\n"
280  //  ":param tags: tag to be assigned to the point.\n:type tag: ``int``s or ``strings``\n"      //  ":param tags: tag to be assigned to the point.\n:type tag: ``int``s or ``strings``\n"    
281  //       )  //       )
282  ;   ;
   
 //   class_<finley::SystemMatrixAdapter, bases<escript::AbstractSystemMatrix> >  
 //       ("OperatorAdapter","A concrete class representing an operator. For more details, please see the c++ documentation.", no_init)  
 //       .def("print_matrix_info",&finley::SystemMatrixAdapter::Print_Matrix_Info,(arg("full")=false),"prints information about a system matrix")  
 //       .def("nullifyRowsAndCols",&finley::SystemMatrixAdapter::nullifyRowsAndCols)  
 //       .def("resetValues",&finley::SystemMatrixAdapter::resetValues, "resets the matrix entries")  
 //       .def("saveMM",&finley::SystemMatrixAdapter::saveMM,args("fileName"),  
 // "writes the matrix to a file using the Matrix Market file format")  
 //       .def("saveHB",&finley::SystemMatrixAdapter::saveHB, args("filename"),  
 // "writes the matrix to a file using the Harwell-Boeing file format");  
 //  
 //   class_<finley::TransportProblemAdapter, bases<escript::AbstractTransportProblem> >  
 //       ("TransportProblemAdapter","",no_init)  
 //       .def("getSafeTimeStepSize",&finley::TransportProblemAdapter::getSafeTimeStepSize)  
 //       .def("getUnlimitedTimeStepSize",&finley::TransportProblemAdapter::getUnlimitedTimeStepSize)  
 //       .def("resetTransport",&finley::TransportProblemAdapter::resetTransport,  
 // "resets the transport operator typically as they have been updated");  
283  }  }
284    

Legend:
Removed from v.5932  
changed lines
  Added in v.5933

  ViewVC Help
Powered by ViewVC 1.1.26