/[escript]/trunk/finley/py_src/factorywrappers.py
ViewVC logotype

Diff of /trunk/finley/py_src/factorywrappers.py

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

revision 4934 by jfenwick, Tue May 13 00:28:11 2014 UTC revision 4945 by jfenwick, Thu May 15 09:07:06 2014 UTC
# Line 22  http://www.opensource.org/licenses/osl-3 Line 22  http://www.opensource.org/licenses/osl-3
22  __url__="https://launchpad.net/escript-finley"  __url__="https://launchpad.net/escript-finley"
23    
24    
25  from .finleycpp import __Brick_driver, __Rectangle_driver  from .finleycpp import __Brick_driver, __Rectangle_driver, __ReadMesh_driver, __ReadGmsh_driver
26    
27    
28    def ReadMesh(filename, integrationOrder=-1, reducedIntegrationOrder=-1, optimize=True, **kwargs):
29        points=[]
30        tags=[]
31        if 'diracPoints' in kwargs:
32            points=kwargs['diracPoints']
33        if 'diracTags' in kwargs:
34            tags=kwargs['diracTags']
35        args=[filename, integrationOrder, reducedIntegrationOrder, optimize, points, tags];
36        if 'escriptworld' in kwargs:
37          args+=[kwargs['escriptworld']]
38        else:
39          args+=[None]
40        return __ReadMesh_driver(args)
41      
42      
43      
44    def ReadGmsh(fileName, numDim, integrationOrder=-1, reducedIntegrationOrder=-1, optimize=True,  
45          useMacroElements=False, **kwargs):
46        points=[]
47        tags=[]
48        if 'diracPoints' in kwargs:
49            points=kwargs['diracPoints']
50        if 'diracTags' in kwargs:
51            tags=kwargs['diracTags']
52        args=[fileName, numDim, integrationOrder, reducedIntegrationOrder, optimize,  
53          useMacroElements, points, tags];
54        if 'escriptworld' in kwargs:
55          args+=[kwargs['escriptworld']]
56        else:
57          args+=[None]
58        return __ReadGmsh_driver(args)      
59    
60    
61  def Rectangle(n0=1, n1=1, order=1, l0=1.0, l1=1.0, periodic0=False, periodic1=False, integrationOrder=-1,  def Rectangle(n0=1, n1=1, order=1, l0=1.0, l1=1.0, periodic0=False, periodic1=False, integrationOrder=-1,

Legend:
Removed from v.4934  
changed lines
  Added in v.4945

  ViewVC Help
Powered by ViewVC 1.1.26