Merge authors: Anton Gladky (gladky-anton) ------------------------------------------------------------ revno: 3851 [merge] committer: Jan Stransky <jan.stran...@fsv.cvut.cz> timestamp: Wed 2016-04-20 10:56:53 +0200 message: Merge branch 'master' of github.com:yade/trunk modified: pkg/dem/Polyhedra.cpp pkg/dem/Polyhedra_Ig2.cpp pkg/dem/Polyhedra_splitter.cpp pkg/dem/Polyhedra_support.cpp scripts/checks-and-tests/checks/checkSaveLoadClumps.py
-- lp:yade https://code.launchpad.net/~yade-pkg/yade/git-trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'pkg/dem/Polyhedra.cpp' --- pkg/dem/Polyhedra.cpp 2016-04-20 08:54:55 +0000 +++ pkg/dem/Polyhedra.cpp 2016-04-20 08:56:53 +0000 @@ -2,7 +2,10 @@ // https://www.vutbr.cz/www_base/gigadisk.php?i=95194aa9a #ifdef YADE_CGAL - +// NDEBUG causes crashes in CGAL sometimes. Anton +#ifdef NDEBUG + #undef NDEBUG +#endif #include "Polyhedra.hpp" YADE_PLUGIN(/* self-contained in hpp: */ (Polyhedra) (PolyhedraGeom) (Bo1_Polyhedra_Aabb) (PolyhedraPhys) (PolyhedraMat) (Ip2_PolyhedraMat_PolyhedraMat_PolyhedraPhys) (Ip2_FrictMat_PolyhedraMat_FrictPhys) (Law2_PolyhedraGeom_PolyhedraPhys_Volumetric) === modified file 'pkg/dem/Polyhedra_Ig2.cpp' --- pkg/dem/Polyhedra_Ig2.cpp 2016-04-13 16:42:10 +0000 +++ pkg/dem/Polyhedra_Ig2.cpp 2016-04-19 20:18:46 +0000 @@ -2,7 +2,10 @@ // https://www.vutbr.cz/www_base/gigadisk.php?i=95194aa9a #ifdef YADE_CGAL - +// NDEBUG causes crashes in CGAL sometimes. Anton +#ifdef NDEBUG + #undef NDEBUG +#endif #include "Polyhedra_Ig2.hpp" YADE_PLUGIN(/* self-contained in hpp: */ (Ig2_Polyhedra_Polyhedra_PolyhedraGeom) (Ig2_Wall_Polyhedra_PolyhedraGeom) (Ig2_Facet_Polyhedra_PolyhedraGeom) (Ig2_Sphere_Polyhedra_ScGeom) === modified file 'pkg/dem/Polyhedra_splitter.cpp' --- pkg/dem/Polyhedra_splitter.cpp 2016-03-24 22:08:26 +0000 +++ pkg/dem/Polyhedra_splitter.cpp 2016-04-19 20:18:46 +0000 @@ -3,6 +3,11 @@ #ifdef YADE_CGAL +// NDEBUG causes crashes in CGAL sometimes. Anton +#ifdef NDEBUG + #undef NDEBUG +#endif + #include <pkg/dem/Polyhedra_splitter.hpp> YADE_PLUGIN((PolyhedraSplitter)); === modified file 'pkg/dem/Polyhedra_support.cpp' --- pkg/dem/Polyhedra_support.cpp 2016-04-12 04:37:00 +0000 +++ pkg/dem/Polyhedra_support.cpp 2016-04-19 20:18:46 +0000 @@ -2,6 +2,10 @@ // https://www.vutbr.cz/www_base/gigadisk.php?i=95194aa9a #ifdef YADE_CGAL +// NDEBUG causes crashes in CGAL sometimes. Anton +#ifdef NDEBUG + #undef NDEBUG +#endif #include "Polyhedra.hpp" === modified file 'scripts/checks-and-tests/checks/checkSaveLoadClumps.py' --- scripts/checks-and-tests/checks/checkSaveLoadClumps.py 2016-03-24 22:54:47 +0000 +++ scripts/checks-and-tests/checks/checkSaveLoadClumps.py 2016-04-19 20:19:21 +0000 @@ -9,6 +9,7 @@ from yade import pack import tempfile, shutil +import time #define material for all bodies: id_Mat=O.materials.append(FrictMat(young=1e6,poisson=0.3,density=1000,frictionAngle=1)) @@ -51,7 +52,8 @@ O.save(tmp_dir + '/restartMinWorkEx_'+partType+'_Initial') O.run(100000,True) O.save(tmp_dir + '/restartMinWorkEx_'+partType+str(O.iter)) - +time.sleep(1) O.reset() +time.sleep(1) O.load(tmp_dir + '/restartMinWorkEx_'+partType +'100000') O.run(1000, True)
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : yade-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
