/[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 2625 by jfenwick, Fri Aug 21 06:30:25 2009 UTC revision 3259 by jfenwick, Mon Oct 11 01:48:14 2010 UTC
# Line 1  Line 1 
1    
2  /*******************************************************  /*******************************************************
3  *  *
4  * Copyright (c) 2003-2009 by University of Queensland  * Copyright (c) 2003-2010 by University of Queensland
5  * Earth Systems Science Computational Center (ESSCC)  * Earth Systems Science Computational Center (ESSCC)
6  * http://www.uq.edu.au/esscc  * http://www.uq.edu.au/esscc
7  *  *
# 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 "../Finley.h"  #include "../Finley.h"
# Line 107  BOOST_PYTHON_MODULE(finleycpp) Line 106  BOOST_PYTHON_MODULE(finleycpp)
106  ":param optimize: Enable optimisation of node labels\n:type optimize: ``bool``");  ":param optimize: Enable optimisation of node labels\n:type optimize: ``bool``");
107    
108    def("ReadGmsh",finley::readGmsh,    def("ReadGmsh",finley::readGmsh,
109        (arg("fileName")="file.msh",arg("numDim"), arg("integrationOrder")=-1, arg("reducedIntegrationOrder")=-1, arg("optimize")=true)        (arg("fileName")="file.msh",
110           arg("numDim"),
111           arg("integrationOrder")=-1,
112           arg("reducedIntegrationOrder")=-1,
113           arg("optimize")=true,  
114           arg("useMacroElements")=false)
115  //       ,return_value_policy<manage_new_object>());  //       ,return_value_policy<manage_new_object>());
116  ,"Read a gmsh mesh file\n\n"  ,"Read a gmsh mesh file\n\n"
117  ":rtype: `Domain`\n:param fileName:\n:type fileName: ``string``\n"  ":rtype: `Domain`\n:param fileName:\n:type fileName: ``string``\n"
118  ":param integrationOrder: order of the quadrature scheme. If *integrationOrder<0* the integration order is selected independently.\n"  ":param integrationOrder: order of the quadrature scheme. If *integrationOrder<0* the integration order is selected independently.\n"
119  ":type integrationOrder: ``int``\n"  ":type integrationOrder: ``int``\n"
120  ":param reducedIntegrationOrder: order of the quadrature scheme. If *reducedIntegrationOrder<0* the integration order is selected independently.\n"  ":param reducedIntegrationOrder: order of the quadrature scheme. If *reducedIntegrationOrder<0* the integration order is selected independently.\n"
121  ":param optimize: Enable optimisation of node labels\n:type optimize: ``bool``");  ":param optimize: Enable optimisation of node labels\n:type optimize: ``bool``\n"
122    ":param useMacroElements: Enable the usage of macro elements instead of second order elements.\n:type useMacroElements: ``bool``"
123    );
124    
125    def ("Brick",finley::brick,    def ("Brick",finley::brick,
126        (arg("n0")=1,arg("n1")=1,arg("n2")=1,        (arg("n0")=1,arg("n1")=1,arg("n2")=1,
# Line 125  BOOST_PYTHON_MODULE(finleycpp) Line 131  BOOST_PYTHON_MODULE(finleycpp)
131        arg("useElementsOnFace")=false,        arg("useElementsOnFace")=false,
132        arg("useFullElementOrder")=false,        arg("useFullElementOrder")=false,
133        arg("optimize")=false)        arg("optimize")=false)
134          
135  //       ,return_value_policy<manage_new_object>());  //       ,return_value_policy<manage_new_object>());
136  ,"Creates a rectangular mesh with n0 x n1 x n2 elements over the brick [0,l0] x [0,l1] x [0,l2]."  ,"Creates a rectangular mesh with n0 x n1 x n2 elements over the brick [0,l0] x [0,l1] x [0,l2]."
137  "\n\n:param n0:\n:type n0:\n:param n1:\n:type n1:\n:param n2:\n:type n2:\n"  "\n\n:param n0:\n:type n0:\n:param n1:\n:type n1:\n:param n2:\n:type n2:\n"
138  ":param order: =1 or =2 gives the order of shape function\n"  ":param order: =1, =-1 or =2 gives the order of shape function. If -1 macro elements of order 1 are used.\n"
139  ":param l0: length of side 0\n:param l1:\n:param l2:\n"  ":param l0: length of side 0\n:param l1:\n:param l2:\n"
140  ":param integrationOrder: order of the quadrature scheme. If integrationOrder<0 the integration order is selected independently.\n"  ":param integrationOrder: order of the quadrature scheme. If integrationOrder<0 the integration order is selected independently.\n"
141  ":param reducedIntegrationOrder: order of the quadrature scheme. If reducedIntegrationOrder<0 the integration order is selected independently.\n"  ":param reducedIntegrationOrder: order of the quadrature scheme. If reducedIntegrationOrder<0 the integration order is selected independently.\n"
# Line 137  BOOST_PYTHON_MODULE(finleycpp) Line 144  BOOST_PYTHON_MODULE(finleycpp)
144  ":param periodic0:  whether or not boundary conditions are periodic\n"  ":param periodic0:  whether or not boundary conditions are periodic\n"
145  ":param periodic1:\n:param periodic2:\n"  ":param periodic1:\n:param periodic2:\n"
146  ":param useFullElementOrder:\n:param optimize:\n"  ":param useFullElementOrder:\n:param optimize:\n"
147    ":param optimize: Enable optimisation of node labels\n:type optimize: ``bool``"
148  );  );
149    
150    def ("Rectangle",finley::rectangle,    def ("Rectangle",finley::rectangle,
# Line 150  BOOST_PYTHON_MODULE(finleycpp) Line 158  BOOST_PYTHON_MODULE(finleycpp)
158  //       ,return_value_policy<manage_new_object>());  //       ,return_value_policy<manage_new_object>());
159  ,"Creates a rectangular mesh with n0 x n1 elements over the brick [0,l0] x [0,l1]."  ,"Creates a rectangular mesh with n0 x n1 elements over the brick [0,l0] x [0,l1]."
160  "\n\n:param n0:\n:type n0:\n:param n1:\n:type n1:\n"  "\n\n:param n0:\n:type n0:\n:param n1:\n:type n1:\n"
161  ":param order: =1 or =2 gives the order of shape function\n"  ":param order: =1, =-1 or =2 gives the order of shape function. If -1 macro elements of order 1 are used.\n"
162  ":param l0: length of side 0\n:param l1:\n"  ":param l0: length of side 0\n:param l1:\n"
163  ":param integrationOrder: order of the quadrature scheme. If integrationOrder<0 the integration order is selected independently.\n"  ":param integrationOrder: order of the quadrature scheme. If integrationOrder<0 the integration order is selected independently.\n"
164  ":param reducedIntegrationOrder: order of the quadrature scheme. If reducedIntegrationOrder<0 the integration order is selected independently.\n"  ":param reducedIntegrationOrder: order of the quadrature scheme. If reducedIntegrationOrder<0 the integration order is selected independently.\n"
# Line 158  BOOST_PYTHON_MODULE(finleycpp) Line 166  BOOST_PYTHON_MODULE(finleycpp)
166  ":type useElementsOnFace: ``int``"  ":type useElementsOnFace: ``int``"
167  ":param periodic0:  whether or not boundary conditions are periodic\n"  ":param periodic0:  whether or not boundary conditions are periodic\n"
168  ":param periodic1:\n"  ":param periodic1:\n"
169  ":param useFullElementOrder:\n:param optimize:\n");  ":param useFullElementOrder:\n:param optimize:\n"
170    ":param useMacroElements: Enable the usage of first order macro elements.\n:type useMacroElements: ``bool``\n"
171    ":param optimize: Enable optimisation of node labels\n:type optimize: ``bool``"
172    );
173    
174    def("Merge",finley::meshMerge,args("meshList")    def("Merge",finley::meshMerge,args("meshList")
175  //       ,return_value_policy<manage_new_object>());  //       ,return_value_policy<manage_new_object>());

Legend:
Removed from v.2625  
changed lines
  Added in v.3259

  ViewVC Help
Powered by ViewVC 1.1.26