------------------------------------------------------------ revno: 3883 committer: Anton Gladky <[email protected]> timestamp: Wed 2016-06-01 21:16:04 +0200 message: Remove numpy.hpp. Move implementation of MATRIX3R_TO_NUMPY into the cpp-file. removed: lib/pyutil/numpy.hpp modified: pkg/dem/TesselationWrapper.cpp
-- 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
=== removed file 'lib/pyutil/numpy.hpp' --- lib/pyutil/numpy.hpp 2015-11-09 20:26:06 +0000 +++ lib/pyutil/numpy.hpp 1970-01-01 00:00:00 +0000 @@ -1,6 +0,0 @@ -// 2009 © Václav Šmilauer <[email protected] -#pragma once -#include"numpy_boost.hpp" - -// helper macro do assign Matrix3r values to subarrays -#define MATRIX3R_TO_NUMPY(mat,arr) arr[0]=mat(0,0);arr[1]=mat(0,1);arr[2]=mat(0,2);arr[3]=mat(1,0);arr[4]=mat(1,1);arr[5]=mat(1,2);arr[6]=mat(2,0);arr[7]=mat(2,1);arr[8]=mat(2,2); === modified file 'pkg/dem/TesselationWrapper.cpp' --- pkg/dem/TesselationWrapper.cpp 2016-04-14 11:01:04 +0000 +++ pkg/dem/TesselationWrapper.cpp 2016-06-01 19:16:04 +0000 @@ -8,15 +8,18 @@ #ifdef YADE_CGAL -#include<pkg/dem/Shop.hpp> -#include"TesselationWrapper.hpp" -#include<lib/triangulation/Timer.h> -#include<pkg/dem/SpherePack.hpp> -#include<lib/pyutil/numpy.hpp> +#include <pkg/dem/Shop.hpp> +#include "TesselationWrapper.hpp" +#include <lib/triangulation/Timer.h> +#include <pkg/dem/SpherePack.hpp> +#include <lib/pyutil/numpy_boost.hpp> YADE_PLUGIN((TesselationWrapper)); CREATE_LOGGER(TesselationWrapper); +// helper macro do assign Matrix3r values to subarrays +#define MATRIX3R_TO_NUMPY(mat,arr) arr[0]=mat(0,0);arr[1]=mat(0,1);arr[2]=mat(0,2);arr[3]=mat(1,0);arr[4]=mat(1,1);arr[5]=mat(1,2);arr[6]=mat(2,0);arr[7]=mat(2,1);arr[8]=mat(2,2); + //spatial sort traits to use with a pair of CGAL::sphere pointers and integer. //template<class _Triangulation> struct RTraits_for_spatial_sort : public CGT::SimpleTriangulationTypes::RTriangulation::Geom_traits {
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
