yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #03019
Re: [Branch ~yade-dev/yade/trunk] Rev 1956: 1. gmsh.ymport function is fixes to be more universal
> Vaclav, please, check "Bad" bug #505783 fix.
> I tried to find the problem, but no success, so I had to comment those
> strings.
Please just put #pragma once to gil.hpp, that should do the trick. Sorry
for inconvenience. Thanks, Vaclav
>
> Thank you
> ______________________________
>
> Anton Gladkyy
>
>
> 2010/1/11 <noreply@xxxxxxxxxxxxx>
> ------------------------------------------------------------
> revno: 1956
> committer: Anton Gladky <gladky.anton@xxxxxxxxx>
> branch nick: trunk
> timestamp: Mon 2010-01-11 15:47:47 +0100
> message:
> 1. gmsh.ymport function is fixes to be more universal
> 2. "Bad" bug #505783 fix
> modified:
> lib/pyutil/gil.cpp
> lib/pyutil/gil.hpp
> py/ymport.py
>
>
> --
> lp:yade
> https://code.launchpad.net/~yade-dev/yade/trunk
>
> Your team Yade developers is subscribed to branch lp:yade.
> To unsubscribe from this branch go to
> https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.
>
> === modified file 'lib/pyutil/gil.cpp'
> --- lib/pyutil/gil.cpp 2010-01-03 20:30:24 +0000
> +++ lib/pyutil/gil.cpp 2010-01-11 14:47:47 +0000
> @@ -1,5 +1,6 @@
> #include<yade/lib-pyutil/gil.hpp>
> void pyRunString(const std::string& cmd){
> - gilLock lock; PyRun_SimpleString(cmd.c_str());
> + //gilLock lock;
> + PyRun_SimpleString(cmd.c_str());
> };
>
>
> === modified file 'lib/pyutil/gil.hpp'
> --- lib/pyutil/gil.hpp 2010-01-03 20:30:24 +0000
> +++ lib/pyutil/gil.hpp 2010-01-11 14:47:47 +0000
> @@ -2,12 +2,14 @@
>
> #include<Python.h>
> //! class (scoped lock) managing python's Global Interpreter
> Lock (gil)
> +/*
> class gilLock{
> PyGILState_STATE state;
> public:
> gilLock(){ state=PyGILState_Ensure(); }
> ~gilLock(){ PyGILState_Release(state); }
> };
> -
> +*/
> //! run string as python command; locks & unlocks GIL
> automatically
> void pyRunString(const std::string& cmd);
> +
>
> === modified file 'py/ymport.py'
> --- py/ymport.py 2009-12-11 07:27:29 +0000
> +++ py/ymport.py 2010-01-11 14:47:47 +0000
> @@ -46,30 +46,41 @@
>
> Remaining **kw arguments are passed to utils.facet;
> mesh files can be easily created with GMSH
> http://www.geuz.org/gmsh/
> - Example added to
> scripts/test/regular-sphere-pack.py"""
> + Example added to scripts/test/regular-sphere-pack.py
> +
> + Additional examples of mesh-files can be downloaded
> here
> + http://www-roc.inria.fr/gamma/download/download.php
> + """
> infile = open(meshfile,"r")
> lines = infile.readlines()
> infile.close()
>
> nodelistVector3=[]
> - numNodes = int(lines[4].split()[0])
> + findVerticesString=0
> +
> + while
> (lines[findVerticesString].split()[0]<>'Vertices'): #Find the
> string with the number of Vertices
> + findVerticesString+=1
> + findVerticesString+=1
> + numNodes = int(lines[findVerticesString].split()[0])
> +
> for i in range(numNodes):
> nodelistVector3.append(Vector3(0.0,0.0,0.0))
> id = 0
> - for line in lines[5:numNodes+5]:
> +
> + for line in lines[findVerticesString+1:numNodes
> +findVerticesString+1]:
> data = line.split()
> X = shift[0]+float(data[0])*scale
> Y = shift[1]+float(data[1])*scale
> Z = shift[2]+float(data[2])*scale
> nodelistVector3[id] = Vector3(X,Y,Z)
> id += 1
> - numTriangles = int(lines[numNodes+6].split()[0])
> + numTriangles = int(lines[numNodes+findVerticesString
> +2].split()[0])
> triList = []
> for i in range(numTriangles):
> triList.append([0,0,0,0])
> -
> +
> tid = 0
> - for line in lines[numNodes+7:numNodes+7+numTriangles]:
> + for line in lines[numNodes+findVerticesString
> +3:numNodes+findVerticesString+3+numTriangles]:
> data = line.split()
> id1 = int(data[0])-1
> id2 = int(data[1])-1
> @@ -100,6 +111,7 @@
> Example added to scripts/test/regular-sphere-pack.py
> Example of LSMGenGeo library using is added to
> genCylLSM.py
>
> + https://answers.launchpad.net/esys-particle/+faq/877
>
> http://www.access.edu.au/lsmgengeo_python_doc/current/pythonapi/html/GenGeo-module.html
>
> https://svn.esscc.uq.edu.au/svn/esys3/lsm/contrib/LSMGenGeo/""";
> from yade.utils import sphere
> @@ -127,6 +139,7 @@
> Example added to scripts/test/regular-sphere-pack.py
> Example of LSMGenGeo library using is added to
> genCylLSM.py
>
> + https://answers.launchpad.net/esys-particle/+faq/877
>
> http://www.access.edu.au/lsmgengeo_python_doc/current/pythonapi/html/GenGeo-module.html
>
> https://svn.esscc.uq.edu.au/svn/esys3/lsm/contrib/LSMGenGeo/""";
> from GenGeo import MNTable3D,Sphere
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev
> Post to : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help : https://help.launchpad.net/ListHelp
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev
> Post to : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help : https://help.launchpad.net/ListHelp
Follow ups
References
