yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #06671
[Branch ~yade-dev/yade/trunk] Rev 2641: Add missing includes, thanks to Klaus for reporting.
------------------------------------------------------------
revno: 2641
committer: Václav Šmilauer <eu@xxxxxxxx>
branch nick: yade
timestamp: Mon 2011-01-10 09:08:23 +0100
message:
Add missing includes, thanks to Klaus for reporting.
modified:
pkg/common/Gl1_Aabb.hpp
pkg/common/Gl1_Box.hpp
pkg/common/Gl1_NormPhys.hpp
pkg/common/InsertionSortCollider.cpp
pkg/dem/Dem3DofGeom_FacetSphere.hpp
pkg/dem/ElasticContactLaw.hpp
pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.hpp
pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp
pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp
pkg/dem/ViscoelasticPM.hpp
--
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 'pkg/common/Gl1_Aabb.hpp'
--- pkg/common/Gl1_Aabb.hpp 2010-11-07 11:46:20 +0000
+++ pkg/common/Gl1_Aabb.hpp 2011-01-10 08:08:23 +0000
@@ -9,6 +9,7 @@
#pragma once
#include<yade/pkg/common/GLDrawFunctors.hpp>
+#include<yade/pkg/common/Aabb.hpp>
class Gl1_Aabb: public GlBoundFunctor{
public:
=== modified file 'pkg/common/Gl1_Box.hpp'
--- pkg/common/Gl1_Box.hpp 2010-11-07 11:46:20 +0000
+++ pkg/common/Gl1_Box.hpp 2011-01-10 08:08:23 +0000
@@ -9,6 +9,7 @@
#pragma once
#include<yade/pkg/common/GLDrawFunctors.hpp>
+#include<yade/pkg/common/Box.hpp>
class Gl1_Box : public GlShapeFunctor{
public :
=== modified file 'pkg/common/Gl1_NormPhys.hpp'
--- pkg/common/Gl1_NormPhys.hpp 2010-11-07 11:46:20 +0000
+++ pkg/common/Gl1_NormPhys.hpp 2011-01-10 08:08:23 +0000
@@ -3,6 +3,7 @@
#include<yade/lib/opengl/OpenGLWrapper.hpp>
#include<yade/lib/opengl/GLUtils.hpp>
#include<yade/pkg/common/GLDrawFunctors.hpp>
+#include<yade/pkg/common/NormShearPhys.hpp>
#include<GL/glu.h>
=== modified file 'pkg/common/InsertionSortCollider.cpp'
--- pkg/common/InsertionSortCollider.cpp 2011-01-09 16:34:50 +0000
+++ pkg/common/InsertionSortCollider.cpp 2011-01-10 08:08:23 +0000
@@ -7,6 +7,7 @@
#include<yade/pkg/common/Dispatching.hpp>
#include<yade/pkg/common/VelocityBins.hpp>
#include<yade/pkg/dem/NewtonIntegrator.hpp>
+#include<yade/pkg/common/Sphere.hpp>
#include<algorithm>
#include<vector>
=== modified file 'pkg/dem/Dem3DofGeom_FacetSphere.hpp'
--- pkg/dem/Dem3DofGeom_FacetSphere.hpp 2010-12-13 12:11:43 +0000
+++ pkg/dem/Dem3DofGeom_FacetSphere.hpp 2011-01-10 08:08:23 +0000
@@ -2,6 +2,8 @@
#include<yade/pkg/dem/DemXDofGeom.hpp>
// for static roll/unroll functions in Dem3DofGeom_SphereSphere
#include<yade/pkg/dem/Dem3DofGeom_SphereSphere.hpp>
+#include<yade/pkg/common/Sphere.hpp>
+#include<yade/pkg/common/Facet.hpp>
class Dem3DofGeom_FacetSphere: public Dem3DofGeom{
//! turn planePt in plane with normal0 around line passing through origin to plane with normal1
=== modified file 'pkg/dem/ElasticContactLaw.hpp'
--- pkg/dem/ElasticContactLaw.hpp 2010-12-31 14:35:21 +0000
+++ pkg/dem/ElasticContactLaw.hpp 2011-01-10 08:08:23 +0000
@@ -9,11 +9,13 @@
#include<yade/core/GlobalEngine.hpp>
#include<yade/pkg/common/Dispatching.hpp>
-
-#include <set>
-#include <boost/tuple/tuple.hpp>
+#include<yade/pkg/dem/FrictPhys.hpp>
+#include<yade/pkg/dem/ScGeom.hpp>
#include<yade/lib/base/openmp-accu.hpp>
+#include<set>
+#include<boost/tuple/tuple.hpp>
+
class Law2_ScGeom_FrictPhys_CundallStrack: public LawFunctor{
public:
OpenMPAccumulator<Real> plasticDissipation;
=== modified file 'pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.hpp'
--- pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.hpp 2010-11-07 11:46:20 +0000
+++ pkg/dem/Ip2_2xNormalInelasticMat_NormalInelasticityPhys.hpp 2011-01-10 08:08:23 +0000
@@ -9,6 +9,7 @@
#pragma once
#include<yade/pkg/common/Dispatching.hpp>
+#include<yade/pkg/dem/NormalInelasticMat.hpp>
/*! \brief The RelationShips for using Law2_ScGeom6D_NormalInelasticityPhys_NormalInelasticity
=== modified file 'pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp'
--- pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp 2010-11-07 11:46:20 +0000
+++ pkg/dem/Ip2_FrictMat_FrictMat_CapillaryPhys.hpp 2011-01-10 08:08:23 +0000
@@ -9,6 +9,7 @@
#pragma once
#include<yade/pkg/common/Dispatching.hpp>
+#include<yade/pkg/common/ElastMat.hpp>
class Ip2_FrictMat_FrictMat_CapillaryPhys : public IPhysFunctor
{
=== modified file 'pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp'
--- pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp 2010-12-15 10:11:41 +0000
+++ pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.hpp 2011-01-10 08:08:23 +0000
@@ -10,6 +10,7 @@
#include<yade/pkg/common/Dispatching.hpp>
#include<yade/pkg/common/MatchMaker.hpp>
+#include<yade/pkg/common/ElastMat.hpp>
class Ip2_FrictMat_FrictMat_FrictPhys: public IPhysFunctor{
public:
=== modified file 'pkg/dem/ViscoelasticPM.hpp'
--- pkg/dem/ViscoelasticPM.hpp 2010-12-31 14:35:21 +0000
+++ pkg/dem/ViscoelasticPM.hpp 2011-01-10 08:08:23 +0000
@@ -7,6 +7,7 @@
#include<yade/core/Material.hpp>
#include<yade/pkg/dem/FrictPhys.hpp>
#include<yade/pkg/common/Dispatching.hpp>
+#include<yade/pkg/dem/ScGeom.hpp>
/* Simple viscoelastic model */