yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #11512
[Branch ~yade-pkg/yade/git-trunk] Rev 3473: Drop including "yade/" folder in cpp and hpp files.
------------------------------------------------------------
revno: 3473
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Wed 2014-10-15 08:44:01 +0200
message:
Drop including "yade/" folder in cpp and hpp files.
Many years we had a symlink in build-dir "yade" which
points to a source dir. It was neccessary for scons build
system, which is not the case at the moment. All headers
must be included directly without "yade/" prefix, e.g.:
<core/Scene.hpp>
<pkg/common/Sphere.hpp>
modified:
CMakeLists.txt
ChangeLog
core/Body.cpp
core/Body.hpp
core/BodyContainer.hpp
core/Bound.hpp
core/Cell.cpp
core/Cell.hpp
core/Clump.cpp
core/Clump.hpp
core/Dispatcher.hpp
core/EnergyTracker.hpp
core/Engine.hpp
core/FileGenerator.cpp
core/FileGenerator.hpp
core/ForceContainer.hpp
core/FrontEnd.hpp
core/Functor.hpp
core/GLConfig.hpp
core/IGeom.hpp
core/IPhys.hpp
core/Interaction.cpp
core/Interaction.hpp
core/InteractionContainer.hpp
core/Material.cpp
core/Material.hpp
core/Omega.cpp
core/Omega.hpp
core/PartialEngine.hpp
core/Scene.cpp
core/Scene.hpp
core/Shape.hpp
core/SimulationFlow.cpp
core/State.cpp
core/State.hpp
core/ThreadRunner.cpp
core/corePlugins.cpp
core/main/pyboot.cpp
doc/sphinx/prog.rst
gui/qt4/GLViewer.cpp
gui/qt4/GLViewer.hpp
gui/qt4/GLViewerDisplay.cpp
gui/qt4/GLViewerMouse.cpp
gui/qt4/_GLViewer.cpp
lib/base/Math.cpp
lib/base/openmp-accu.hpp
lib/factory/ClassFactory.cpp
lib/factory/ClassFactory.hpp
lib/factory/DynLibManager.hpp
lib/multimethods/DynLibDispatcher.hpp
lib/multimethods/FunctorWrapper.hpp
lib/opengl/GLUtils.hpp
lib/opengl/OpenGLWrapper.hpp
lib/pyutil/gil.cpp
lib/serialization/Serializable.hpp
lib/smoothing/WeightedAverage2d.hpp
lib/triangulation/FlowBoundingSphere.hpp
lib/triangulation/PeriodicFlow.hpp
lib/triangulation/RegularTriangulation.h
pkg/common/Aabb.hpp
pkg/common/Bo1_Aabb.cpp
pkg/common/Bo1_Aabb.hpp
pkg/common/BoundaryController.hpp
pkg/common/Box.hpp
pkg/common/Callbacks.hpp
pkg/common/Collider.cpp
pkg/common/Collider.hpp
pkg/common/CylScGeom6D.hpp
pkg/common/Cylinder.cpp
pkg/common/Cylinder.hpp
pkg/common/Dispatching.cpp
pkg/common/Dispatching.hpp
pkg/common/ElastMat.hpp
pkg/common/Facet.hpp
pkg/common/FieldApplier.hpp
pkg/common/ForceEngine.cpp
pkg/common/ForceEngine.hpp
pkg/common/ForceResetter.hpp
pkg/common/GLDrawFunctors.hpp
pkg/common/Gl1_NormPhys.cpp
pkg/common/Gl1_NormPhys.hpp
pkg/common/Gl1_Primitives.cpp
pkg/common/Gl1_Primitives.hpp
pkg/common/GravityEngines.cpp
pkg/common/GravityEngines.hpp
pkg/common/Grid.hpp
pkg/common/Grid_GUI.cpp
pkg/common/InsertionSortCollider.cpp
pkg/common/InsertionSortCollider.hpp
pkg/common/InteractionLoop.hpp
pkg/common/KinematicEngines.cpp
pkg/common/KinematicEngines.hpp
pkg/common/MatchMaker.cpp
pkg/common/MatchMaker.hpp
pkg/common/NormShearPhys.hpp
pkg/common/OpenGLRenderer.cpp
pkg/common/OpenGLRenderer.hpp
pkg/common/ParallelEngine.cpp
pkg/common/ParallelEngine.hpp
pkg/common/PeriodicEngines.hpp
pkg/common/PersistentTriangulationCollider.cpp
pkg/common/PersistentTriangulationCollider.hpp
pkg/common/PyRunner.hpp
pkg/common/Recorder.hpp
pkg/common/ResetRandomPosition.cpp
pkg/common/ResetRandomPosition.hpp
pkg/common/SPHEngine.cpp
pkg/common/SPHEngine.hpp
pkg/common/SpatialQuickSortCollider.cpp
pkg/common/SpatialQuickSortCollider.hpp
pkg/common/Sphere.hpp
pkg/common/StepDisplacer.hpp
pkg/common/TorqueEngine.hpp
pkg/common/Wall.cpp
pkg/common/Wall.hpp
pkg/common/ZECollider.cpp
pkg/common/ZECollider.hpp
pkg/common/common.cpp
pkg/dem/BubbleMat.hpp
pkg/dem/CapillaryPhys.cpp
pkg/dem/CapillaryPhys.hpp
pkg/dem/CapillaryStressRecorder.cpp
pkg/dem/CapillaryStressRecorder.hpp
pkg/dem/CapillaryTriaxialTest.cpp
pkg/dem/CapillaryTriaxialTest.hpp
pkg/dem/CohesiveFrictionalContactLaw.cpp
pkg/dem/CohesiveFrictionalContactLaw.hpp
pkg/dem/CohesiveTriaxialTest.cpp
pkg/dem/CohesiveTriaxialTest.hpp
pkg/dem/ConcretePM.cpp
pkg/dem/ConcretePM.hpp
pkg/dem/DemXDofGeom.hpp
pkg/dem/Disp2DPropLoadEngine.cpp
pkg/dem/Disp2DPropLoadEngine.hpp
pkg/dem/DomainLimiter.cpp
pkg/dem/DomainLimiter.hpp
pkg/dem/ElasticContactLaw.cpp
pkg/dem/ElasticContactLaw.hpp
pkg/dem/FacetTopologyAnalyzer.cpp
pkg/dem/FacetTopologyAnalyzer.hpp
pkg/dem/FlatGridCollider.cpp
pkg/dem/FlatGridCollider.hpp
pkg/dem/ForceTorqueRecorder.hpp
pkg/dem/FrictPhys.cpp
pkg/dem/FrictPhys.hpp
pkg/dem/FrictViscoPM.cpp
pkg/dem/FrictViscoPM.hpp
pkg/dem/GeneralIntegratorInsertionSortCollider.cpp
pkg/dem/GeneralIntegratorInsertionSortCollider.hpp
pkg/dem/GlobalStiffnessTimeStepper.cpp
pkg/dem/GlobalStiffnessTimeStepper.hpp
pkg/dem/HertzMindlin.cpp
pkg/dem/HertzMindlin.hpp
pkg/dem/Ig2_Box_Sphere_ScGeom.cpp
pkg/dem/Ig2_Box_Sphere_ScGeom.hpp
pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp
pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp
pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp
pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp
pkg/dem/InelastCohFrictPM.hpp
pkg/dem/Integrator.cpp
pkg/dem/Integrator.hpp
pkg/dem/Ip2_ElastMat.cpp
pkg/dem/Ip2_ElastMat.hpp
pkg/dem/JointedCohesiveFrictionalPM.cpp
pkg/dem/JointedCohesiveFrictionalPM.hpp
pkg/dem/KinemC__Engine.cpp
pkg/dem/KinemC__Engine.hpp
pkg/dem/KinemSimpleShearBox.cpp
pkg/dem/KinemSimpleShearBox.hpp
pkg/dem/L3Geom.cpp
pkg/dem/L3Geom.hpp
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp
pkg/dem/LudingPM.cpp
pkg/dem/LudingPM.hpp
pkg/dem/MicroMacroAnalyser.cpp
pkg/dem/MicroMacroAnalyser.hpp
pkg/dem/NewtonIntegrator.cpp
pkg/dem/NewtonIntegrator.hpp
pkg/dem/NormalInelasticPM.cpp
pkg/dem/NormalInelasticPM.hpp
pkg/dem/PeriIsoCompressor.cpp
pkg/dem/PeriIsoCompressor.hpp
pkg/dem/Polyhedra.cpp
pkg/dem/Polyhedra.hpp
pkg/dem/Polyhedra_Ig2.hpp
pkg/dem/Polyhedra_splitter.cpp
pkg/dem/Polyhedra_splitter.hpp
pkg/dem/RungeKuttaCashKarp54Integrator.cpp
pkg/dem/RungeKuttaCashKarp54Integrator.hpp
pkg/dem/STLImporter.cpp
pkg/dem/STLImporter.hpp
pkg/dem/SampleCapillaryPressureEngine.cpp
pkg/dem/SampleCapillaryPressureEngine.hpp
pkg/dem/ScGeom.cpp
pkg/dem/ScGeom.hpp
pkg/dem/Shop.hpp
pkg/dem/Shop_01.cpp
pkg/dem/Shop_02.cpp
pkg/dem/SimpleShear.cpp
pkg/dem/SimpleShear.hpp
pkg/dem/SnapshotEngine.hpp
pkg/dem/SpherePack.cpp
pkg/dem/SpherePack.hpp
pkg/dem/SpheresFactory.cpp
pkg/dem/SpheresFactory.hpp
pkg/dem/TesselationWrapper.cpp
pkg/dem/TesselationWrapper.hpp
pkg/dem/Tetra.cpp
pkg/dem/Tetra.hpp
pkg/dem/ThreeDTriaxialEngine.cpp
pkg/dem/ThreeDTriaxialEngine.hpp
pkg/dem/TriaxialCompressionEngine.cpp
pkg/dem/TriaxialCompressionEngine.hpp
pkg/dem/TriaxialStateRecorder.cpp
pkg/dem/TriaxialStateRecorder.hpp
pkg/dem/TriaxialStressController.cpp
pkg/dem/TriaxialStressController.hpp
pkg/dem/TriaxialTest.cpp
pkg/dem/TriaxialTest.hpp
pkg/dem/UnbalancedForceCallbacks.cpp
pkg/dem/UnbalancedForceCallbacks.hpp
pkg/dem/UniaxialStrainer.cpp
pkg/dem/UniaxialStrainer.hpp
pkg/dem/VTKRecorder.cpp
pkg/dem/VTKRecorder.hpp
pkg/dem/ViscoelasticCapillarPM.cpp
pkg/dem/ViscoelasticCapillarPM.hpp
pkg/dem/ViscoelasticPM.cpp
pkg/dem/ViscoelasticPM.hpp
pkg/dem/WirePM.cpp
pkg/dem/WirePM.hpp
pkg/lbm/HydrodynamicsLawLBM.cpp
pkg/lbm/HydrodynamicsLawLBM.hpp
pkg/lbm/LBMbody.hpp
pkg/lbm/LBMlink.hpp
pkg/lbm/LBMnode.hpp
pkg/pfv/DFNFlow.cpp
pkg/pfv/FlowEngine.hpp.in
pkg/pfv/FlowEngine.ipp.in
py/WeightedAverage2d.cpp
py/_polyhedra_utils.cpp
py/_utils.cpp
py/_utils.hpp
py/mathWrap/miniEigen.cpp
py/pack/_packObb.cpp
py/pack/_packPredicates.cpp
py/pack/_packSpheres.cpp
py/wrapper/customConverters.cpp
py/wrapper/yadeWrapper.cpp
scripts/linkdeps.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 'CMakeLists.txt'
--- CMakeLists.txt 2014-10-14 12:08:13 +0000
+++ CMakeLists.txt 2014-10-15 06:44:01 +0000
@@ -63,6 +63,8 @@
#===========================================================
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR})
+#===========================================================
#===========================================================
@@ -426,13 +428,6 @@
ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/py")
#===========================================================
-# this is only a temporary hack, headers should be installed in the build-dir directly
-# perhaps there is a proper way, have to ask
-IF(NOT EXISTS "${CMAKE_BINARY_DIR}/yade")
- EXECUTE_PROCESS(COMMAND ln -s ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/yade)
-ENDIF ()
-#===========================================================
-
FILE(GLOB SRC_CORE "core/*.cpp")
FILE(GLOB_RECURSE SRC_PKG "pkg/*.cpp")
FILE(GLOB SRC_LIB "lib/*.cpp")
=== modified file 'ChangeLog'
--- ChangeLog 2014-08-04 16:55:34 +0000
+++ ChangeLog 2014-10-15 06:44:01 +0000
@@ -4346,7 +4346,7 @@
Quick fix for recently discovered segfault. Wondering why it didn't surface before. Valgrind still complains about PhysicalActionVectorVectorIterator::increment using an unitialized value, but that may be unrelated (probably is) to this one.
SCons update, please use it and report any problems to yade-dev or yade-users. Thanks.
Iterations/sec display added to simulation controller (someone more sensible may redesign the layout in the future). Line ending changed from CRLF to CR.
- Scons accepts additional POSTFIX parameter, which will alter installation so that PREFIX/{bin,lib}/yade becomes PREFIX/{bin,lib}/yadePOSTFIX (similar to EXTRAVERSION of Linux). Further, configuration files will be searched for in ~/.yadePOSTFIX instead of ~/.yade. Unfortunately, headers installed in PREFIX will still be overwritten by newer version, even with different POSTFIX, since most files do something like #include<yade/...>. This is meant to ease simultaneous installations of different variants of yade. To achieve full independence, PREFIX and POSTFIX should be different. Note that you don't need to set LD_LIBRARY_PATH, since scons uses linker's -rpath option (hint: man ld). If someone has better solution, please let me know.
+ Scons accepts additional POSTFIX parameter, which will alter installation so that PREFIX/{bin,lib}/yade becomes PREFIX/{bin,lib}/yadePOSTFIX (similar to EXTRAVERSION of Linux). Further, configuration files will be searched for in ~/.yadePOSTFIX instead of ~/.yade. Unfortunately, headers installed in PREFIX will still be overwritten by newer version, even with different POSTFIX, since most files do something like #include<...>. This is meant to ease simultaneous installations of different variants of yade. To achieve full independence, PREFIX and POSTFIX should be different. Note that you don't need to set LD_LIBRARY_PATH, since scons uses linker's -rpath option (hint: man ld). If someone has better solution, please let me know.
Microchange to comment on naming of scons configuration options.
SConscruct file update - make it work with older scons, remove -floop-optimize2 that doesn't exist for older gcc (<4.0).
Hunted down the bugwith node enumeration, now should be reliable. Added some checks so that configuration is not done when cleaning, likewise for installable nodes (so we do NOT uninstall upon cleaning). If you use g++-3.3, you need to set e.g. CXX="distcc g++-3.3 -pthread". This will be fixed perhaps in the future but for now the default is to keep it simple.
=== modified file 'core/Body.cpp'
--- core/Body.cpp 2014-07-03 17:20:40 +0000
+++ core/Body.cpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
-#include<yade/core/Body.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/InteractionContainer.hpp>
+#include<core/Body.hpp>
+#include<core/Scene.hpp>
+#include<core/Omega.hpp>
+#include<core/InteractionContainer.hpp>
//! This could be -1 if id_t is re-typedef'ed as `int'
const Body::id_t Body::ID_NONE=Body::id_t(-1);
=== modified file 'core/Body.hpp'
--- core/Body.hpp 2014-07-03 17:20:40 +0000
+++ core/Body.hpp 2014-10-15 06:44:01 +0000
@@ -14,9 +14,9 @@
#include"State.hpp"
#include"Material.hpp"
-#include<yade/lib/base/Math.hpp>
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
+#include<lib/base/Math.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/Indexable.hpp>
=== modified file 'core/BodyContainer.hpp'
--- core/BodyContainer.hpp 2014-07-17 06:34:00 +0000
+++ core/BodyContainer.hpp 2014-10-15 06:44:01 +0000
@@ -4,7 +4,7 @@
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
+#include<lib/serialization/Serializable.hpp>
#include<boost/tuple/tuple.hpp>
class Body;
=== modified file 'core/Bound.hpp'
--- core/Bound.hpp 2014-04-28 11:49:53 +0000
+++ core/Bound.hpp 2014-10-15 06:44:01 +0000
@@ -7,10 +7,10 @@
*************************************************************************/
#pragma once
-#include<yade/lib/base/Math.hpp>
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
-#include<yade/core/Dispatcher.hpp>
+#include<lib/base/Math.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/Indexable.hpp>
+#include<core/Dispatcher.hpp>
/*! Interface for approximate body locations in space
=== modified file 'core/Cell.cpp'
--- core/Cell.cpp 2013-04-09 11:46:11 +0000
+++ core/Cell.cpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
-#include<yade/core/Cell.hpp>
+#include<core/Cell.hpp>
CREATE_LOGGER(Cell);
=== modified file 'core/Cell.hpp'
--- core/Cell.hpp 2014-03-24 12:23:56 +0000
+++ core/Cell.hpp 2014-10-15 06:44:01 +0000
@@ -13,10 +13,10 @@
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/base/Math.hpp>
-//#include<yade/pkg/dem/Shop.hpp>
+//#include<pkg/dem/Shop.hpp>
class Cell: public Serializable{
public:
=== modified file 'core/Clump.cpp'
--- core/Clump.cpp 2014-07-03 17:20:40 +0000
+++ core/Clump.cpp 2014-10-15 06:44:01 +0000
@@ -1,10 +1,10 @@
// (c) 2007-2010 Vaclav Smilauer <eudoxos@xxxxxxxx>
#include"Clump.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/core/BodyContainer.hpp>
-#include<yade/core/State.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<core/Scene.hpp>
+#include<core/BodyContainer.hpp>
+#include<core/State.hpp>
+#include<pkg/common/Sphere.hpp>
YADE_PLUGIN((Clump));
CREATE_LOGGER(Clump);
=== modified file 'core/Clump.hpp'
--- core/Clump.hpp 2014-07-03 17:20:40 +0000
+++ core/Clump.hpp 2014-10-15 06:44:01 +0000
@@ -2,10 +2,10 @@
#pragma once
-#include<yade/core/Body.hpp>
-#include<yade/lib/base/Logging.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/core/PartialEngine.hpp>
+#include<core/Body.hpp>
+#include<lib/base/Logging.hpp>
+#include<lib/base/Math.hpp>
+#include<core/PartialEngine.hpp>
/*! Body representing clump (rigid aggregate) composed by other existing bodies.
=== modified file 'core/Dispatcher.hpp'
--- core/Dispatcher.hpp 2014-07-19 19:52:41 +0000
+++ core/Dispatcher.hpp 2014-10-15 06:44:01 +0000
@@ -9,10 +9,10 @@
#pragma once
-#include<yade/core/Engine.hpp>
-#include<yade/core/Functor.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/lib/multimethods/DynLibDispatcher.hpp>
+#include<core/Engine.hpp>
+#include<core/Functor.hpp>
+#include<core/Omega.hpp>
+#include<lib/multimethods/DynLibDispatcher.hpp>
#include<boost/preprocessor/cat.hpp>
=== modified file 'core/EnergyTracker.hpp'
--- core/EnergyTracker.hpp 2014-07-19 19:52:41 +0000
+++ core/EnergyTracker.hpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
#pragma once
-#include<yade/lib/base/openmp-accu.hpp>
-#include<yade/lib/serialization/Serializable.hpp>
+#include<lib/base/openmp-accu.hpp>
+#include<lib/serialization/Serializable.hpp>
namespace py=boost::python;
=== modified file 'core/Engine.hpp'
--- core/Engine.hpp 2014-07-19 19:52:41 +0000
+++ core/Engine.hpp 2014-10-15 06:44:01 +0000
@@ -10,10 +10,10 @@
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Timing.hpp>
-#include<yade/lib/base/Logging.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<core/Omega.hpp>
+#include<core/Timing.hpp>
+#include<lib/base/Logging.hpp>
class Body;
class Scene;
=== modified file 'core/FileGenerator.cpp'
--- core/FileGenerator.cpp 2014-07-03 17:20:40 +0000
+++ core/FileGenerator.cpp 2014-10-15 06:44:01 +0000
@@ -3,10 +3,10 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
-#include<yade/core/Omega.hpp>
+#include<core/Omega.hpp>
#include<boost/date_time/posix_time/posix_time.hpp>
-#include<yade/lib/pyutil/gil.hpp>
-#include<yade/lib/serialization/ObjectIO.hpp>
+#include<lib/pyutil/gil.hpp>
+#include<lib/serialization/ObjectIO.hpp>
#include"FileGenerator.hpp"
=== modified file 'core/FileGenerator.hpp'
--- core/FileGenerator.hpp 2014-05-23 13:05:19 +0000
+++ core/FileGenerator.hpp 2014-10-15 06:44:01 +0000
@@ -8,8 +8,8 @@
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/base/Logging.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/base/Logging.hpp>
#include "Scene.hpp"
#include "ThreadWorker.hpp"
=== modified file 'core/ForceContainer.hpp'
--- core/ForceContainer.hpp 2014-07-03 17:20:40 +0000
+++ core/ForceContainer.hpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/lib/base/Math.hpp>
-#include<yade/core/Body.hpp>
+#include<lib/base/Math.hpp>
+#include<core/Body.hpp>
#include<boost/static_assert.hpp>
// make sure that (void*)&vec[0]==(void*)&vec
=== modified file 'core/FrontEnd.hpp'
--- core/FrontEnd.hpp 2014-07-19 19:52:41 +0000
+++ core/FrontEnd.hpp 2014-10-15 06:44:01 +0000
@@ -10,7 +10,7 @@
#include "Omega.hpp"
-#include<yade/lib/factory/Factorable.hpp>
+#include<lib/factory/Factorable.hpp>
class FrontEnd : public Factorable
{
=== modified file 'core/Functor.hpp'
--- core/Functor.hpp 2014-07-19 19:52:41 +0000
+++ core/Functor.hpp 2014-10-15 06:44:01 +0000
@@ -10,9 +10,9 @@
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/FunctorWrapper.hpp>
-#include<yade/core/Timing.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/FunctorWrapper.hpp>
+#include<core/Timing.hpp>
class TimingDeltas;
class Scene;
=== modified file 'core/GLConfig.hpp'
--- core/GLConfig.hpp 2010-08-15 05:27:53 +0000
+++ core/GLConfig.hpp 2014-10-15 06:44:01 +0000
@@ -2,7 +2,7 @@
//
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/core/Serializable.hpp>
+#include<core/Serializable.hpp>
/*! Storage for general 3d view settings.
Is saved along with simulation and passed to every call to render(...).
=== modified file 'core/IGeom.hpp'
--- core/IGeom.hpp 2010-11-07 11:46:20 +0000
+++ core/IGeom.hpp 2014-10-15 06:44:01 +0000
@@ -8,10 +8,10 @@
#pragma once
-#include<yade/lib/base/Math.hpp>
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
-#include<yade/core/Dispatcher.hpp>
+#include<lib/base/Math.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/Indexable.hpp>
+#include<core/Dispatcher.hpp>
class IGeom : public Serializable, public Indexable
{
=== modified file 'core/IPhys.hpp'
--- core/IPhys.hpp 2010-11-07 11:46:20 +0000
+++ core/IPhys.hpp 2014-10-15 06:44:01 +0000
@@ -8,10 +8,10 @@
#pragma once
-#include<yade/lib/base/Math.hpp>
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
-#include<yade/core/Dispatcher.hpp>
+#include<lib/base/Math.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/Indexable.hpp>
+#include<core/Dispatcher.hpp>
class IPhys : public Serializable, public Indexable
{
=== modified file 'core/Interaction.cpp'
--- core/Interaction.cpp 2012-04-23 16:02:46 +0000
+++ core/Interaction.cpp 2014-10-15 06:44:01 +0000
@@ -10,7 +10,7 @@
#include"Interaction.hpp"
-#include<yade/core/Scene.hpp>
+#include<core/Scene.hpp>
Interaction::Interaction(Body::id_t newId1,Body::id_t newId2): id1(newId1), id2(newId2), cellDist(Vector3i(0,0,0)){ reset(); }
=== modified file 'core/Interaction.hpp'
--- core/Interaction.hpp 2012-07-17 18:35:43 +0000
+++ core/Interaction.hpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
+#include<lib/serialization/Serializable.hpp>
// keep those two here, template instantiation & boost::python gets broken otherwise, e.g. https://bugs.launchpad.net/bugs/618766
-#include<yade/core/IGeom.hpp>
-#include<yade/core/IPhys.hpp>
-#include<yade/core/Body.hpp>
+#include<core/IGeom.hpp>
+#include<core/IPhys.hpp>
+#include<core/Body.hpp>
class IGeomFunctor;
=== modified file 'core/InteractionContainer.hpp'
--- core/InteractionContainer.hpp 2014-09-15 10:27:11 +0000
+++ core/InteractionContainer.hpp 2014-10-15 06:44:01 +0000
@@ -4,15 +4,15 @@
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
+#include<lib/serialization/Serializable.hpp>
#include<boost/thread/mutex.hpp>
#ifdef YADE_OPENMP
#include<omp.h>
#endif
-#include<yade/core/Interaction.hpp>
-#include<yade/core/BodyContainer.hpp>
+#include<core/Interaction.hpp>
+#include<core/BodyContainer.hpp>
/* This InteractionContainer implementation has reference to the body container and
stores interactions in 2 places:
=== modified file 'core/Material.cpp'
--- core/Material.cpp 2014-07-19 19:52:41 +0000
+++ core/Material.cpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
#include<stdexcept>
-#include<yade/core/Material.hpp>
-#include<yade/core/Scene.hpp>
+#include<core/Material.hpp>
+#include<core/Scene.hpp>
const shared_ptr<Material> Material::byId(int id, Scene* w_){
Scene* w=w_?w_:Omega::instance().getScene().get();
=== modified file 'core/Material.hpp'
--- core/Material.hpp 2014-07-19 19:52:41 +0000
+++ core/Material.hpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
-#include<yade/core/State.hpp>
-#include<yade/core/Dispatcher.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/Indexable.hpp>
+#include<core/State.hpp>
+#include<core/Dispatcher.hpp>
class Scene;
=== modified file 'core/Omega.cpp'
--- core/Omega.cpp 2014-07-14 20:08:34 +0000
+++ core/Omega.cpp 2014-10-15 06:44:01 +0000
@@ -12,13 +12,13 @@
#include"Scene.hpp"
#include"TimeStepper.hpp"
#include"ThreadRunner.hpp"
-#include<yade/lib/base/Math.hpp>
-#include<yade/lib/multimethods/FunctorWrapper.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
+#include<lib/base/Math.hpp>
+#include<lib/multimethods/FunctorWrapper.hpp>
+#include<lib/multimethods/Indexable.hpp>
#include<boost/algorithm/string.hpp>
#include<boost/thread/mutex.hpp>
-#include<yade/lib/serialization/ObjectIO.hpp>
+#include<lib/serialization/ObjectIO.hpp>
#include<cxxabi.h>
=== modified file 'core/Omega.hpp'
--- core/Omega.hpp 2014-07-14 20:08:34 +0000
+++ core/Omega.hpp 2014-10-15 06:44:01 +0000
@@ -17,10 +17,10 @@
#include <boost/thread/thread.hpp>
#include <iostream>
-#include <yade/lib/base/Math.hpp>
-#include <yade/lib/factory/ClassFactory.hpp>
+#include <lib/base/Math.hpp>
+#include <lib/factory/ClassFactory.hpp>
-#include <yade/lib/base/Singleton.hpp>
+#include <lib/base/Singleton.hpp>
#include "SimulationFlow.hpp"
=== modified file 'core/PartialEngine.hpp'
--- core/PartialEngine.hpp 2010-11-30 13:51:41 +0000
+++ core/PartialEngine.hpp 2014-10-15 06:44:01 +0000
@@ -8,8 +8,8 @@
#pragma once
#include <vector>
-#include<yade/core/Engine.hpp>
-#include<yade/core/Body.hpp>
+#include<core/Engine.hpp>
+#include<core/Body.hpp>
class PartialEngine: public Engine{
public:
=== modified file 'core/Scene.cpp'
--- core/Scene.cpp 2014-07-03 17:20:40 +0000
+++ core/Scene.cpp 2014-10-15 06:44:01 +0000
@@ -9,16 +9,16 @@
*************************************************************************/
#include"Scene.hpp"
-#include<yade/core/Engine.hpp>
-#include<yade/core/Timing.hpp>
-#include<yade/core/TimeStepper.hpp>
+#include<core/Engine.hpp>
+#include<core/Timing.hpp>
+#include<core/TimeStepper.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<lib/base/Math.hpp>
#include<boost/date_time/posix_time/posix_time.hpp>
#include<boost/algorithm/string.hpp>
-#include<yade/core/BodyContainer.hpp>
-#include<yade/core/InteractionContainer.hpp>
+#include<core/BodyContainer.hpp>
+#include<core/InteractionContainer.hpp>
// POSIX-only
=== modified file 'core/Scene.hpp'
--- core/Scene.hpp 2014-05-08 05:57:04 +0000
+++ core/Scene.hpp 2014-10-15 06:44:01 +0000
@@ -10,15 +10,15 @@
#pragma once
-#include<yade/core/Body.hpp>
-#include<yade/core/Cell.hpp>
-#include<yade/core/BodyContainer.hpp>
-#include<yade/core/Engine.hpp>
-#include<yade/core/Material.hpp>
-#include<yade/core/DisplayParameters.hpp>
-#include<yade/core/ForceContainer.hpp>
-#include<yade/core/InteractionContainer.hpp>
-#include<yade/core/EnergyTracker.hpp>
+#include<core/Body.hpp>
+#include<core/Cell.hpp>
+#include<core/BodyContainer.hpp>
+#include<core/Engine.hpp>
+#include<core/Material.hpp>
+#include<core/DisplayParameters.hpp>
+#include<core/ForceContainer.hpp>
+#include<core/InteractionContainer.hpp>
+#include<core/EnergyTracker.hpp>
#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX 255
=== modified file 'core/Shape.hpp'
--- core/Shape.hpp 2014-07-19 19:52:41 +0000
+++ core/Shape.hpp 2014-10-15 06:44:01 +0000
@@ -8,9 +8,9 @@
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
-#include<yade/core/Dispatcher.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/Indexable.hpp>
+#include<core/Dispatcher.hpp>
#define BV_FUNCTOR_CACHE
=== modified file 'core/SimulationFlow.cpp'
--- core/SimulationFlow.cpp 2012-07-16 20:13:46 +0000
+++ core/SimulationFlow.cpp 2014-10-15 06:44:01 +0000
@@ -6,7 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
-#include <yade/lib/base/Logging.hpp>
+#include <lib/base/Logging.hpp>
#include "SimulationFlow.hpp"
#include "Scene.hpp"
#include "Omega.hpp"
=== modified file 'core/State.cpp'
--- core/State.cpp 2014-07-03 17:20:40 +0000
+++ core/State.cpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/core/State.hpp>
+#include<core/State.hpp>
CREATE_LOGGER(State);
=== modified file 'core/State.hpp'
--- core/State.hpp 2014-06-12 16:54:31 +0000
+++ core/State.hpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
-#include<yade/core/Dispatcher.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/Indexable.hpp>
+#include<core/Dispatcher.hpp>
// delete later and remove relevant code, to not support old State.blockedDOFs=['x','y','rz'] syntax anymore
//#define YADE_DEPREC_DOF_LIST
=== modified file 'core/ThreadRunner.cpp'
--- core/ThreadRunner.cpp 2014-07-03 17:20:40 +0000
+++ core/ThreadRunner.cpp 2014-10-15 06:44:01 +0000
@@ -6,7 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
-#include <yade/lib/base/Logging.hpp>
+#include <lib/base/Logging.hpp>
#include "ThreadRunner.hpp"
#include "ThreadWorker.hpp"
=== modified file 'core/corePlugins.cpp'
--- core/corePlugins.cpp 2014-07-03 17:20:40 +0000
+++ core/corePlugins.cpp 2014-10-15 06:44:01 +0000
@@ -1,24 +1,24 @@
-#include<yade/lib/factory/ClassFactory.hpp>
+#include<lib/factory/ClassFactory.hpp>
// make core classes known to the class factory
-#include<yade/core/Body.hpp>
-#include<yade/core/BodyContainer.hpp>
-#include<yade/core/Bound.hpp>
-#include<yade/core/Cell.hpp>
-#include<yade/core/Dispatcher.hpp>
-#include<yade/core/EnergyTracker.hpp>
-#include<yade/core/Engine.hpp>
-#include<yade/core/FileGenerator.hpp>
-#include<yade/core/Functor.hpp>
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/InteractionContainer.hpp>
-#include<yade/core/IGeom.hpp>
-#include<yade/core/IPhys.hpp>
-#include<yade/core/Material.hpp>
-#include<yade/core/PartialEngine.hpp>
-#include<yade/core/Shape.hpp>
-#include<yade/core/State.hpp>
-#include<yade/core/TimeStepper.hpp>
+#include<core/Body.hpp>
+#include<core/BodyContainer.hpp>
+#include<core/Bound.hpp>
+#include<core/Cell.hpp>
+#include<core/Dispatcher.hpp>
+#include<core/EnergyTracker.hpp>
+#include<core/Engine.hpp>
+#include<core/FileGenerator.hpp>
+#include<core/Functor.hpp>
+#include<core/GlobalEngine.hpp>
+#include<core/Interaction.hpp>
+#include<core/InteractionContainer.hpp>
+#include<core/IGeom.hpp>
+#include<core/IPhys.hpp>
+#include<core/Material.hpp>
+#include<core/PartialEngine.hpp>
+#include<core/Shape.hpp>
+#include<core/State.hpp>
+#include<core/TimeStepper.hpp>
// these two are not accessible from python directly (though they should be in the future, perhaps)
=== modified file 'core/main/pyboot.cpp'
--- core/main/pyboot.cpp 2014-07-14 20:08:34 +0000
+++ core/main/pyboot.cpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
-#include<yade/core/Omega.hpp>
-#include<yade/lib/base/Logging.hpp>
+#include<core/Omega.hpp>
+#include<lib/base/Logging.hpp>
#include<signal.h>
=== modified file 'doc/sphinx/prog.rst'
--- doc/sphinx/prog.rst 2014-09-18 09:28:42 +0000
+++ doc/sphinx/prog.rst 2014-10-15 06:44:01 +0000
@@ -42,14 +42,14 @@
============================================================= =========================
Original header location Included as
============================================================= =========================
-``core/Scene.hpp`` ``<yade/core/Scene.hpp>``
-``lib/base/Logging.hpp`` ``<yade/lib-base/Logging.hpp>``
-``lib/serialization/Serializable.hpp`` ``<yade/lib-serialization/Serializable.hpp>``
-``pkg/dem/DataClass/SpherePack.hpp`` ``<yade/pkg-dem/SpherePack.hpp>``
-``gui/qt3/QtGUI.hpp`` ``<yade/gui-qt3/QtGUI.hpp>``
+``core/Scene.hpp`` ``<core/Scene.hpp>``
+``lib/base/Logging.hpp`` ``<lib-base/Logging.hpp>``
+``lib/serialization/Serializable.hpp`` ``<lib-serialization/Serializable.hpp>``
+``pkg/dem/DataClass/SpherePack.hpp`` ``<pkg-dem/SpherePack.hpp>``
+``gui/qt3/QtGUI.hpp`` ``<gui-qt3/QtGUI.hpp>``
============================================================= =========================
-It is advised to use ``#include<yade/module/Class.hpp>`` style of inclusion rather than ``#include"Class.hpp`` even if you are in the same directory.
+It is advised to use ``#include<module/Class.hpp>`` style of inclusion rather than ``#include"Class.hpp`` even if you are in the same directory.
Automatic compilation
@@ -541,8 +541,8 @@
.. code-block:: c++
- #include<yade/pkg-common/GravityEngine.hpp>
- #include<yade/core/Scene.hpp>
+ #include<pkg-common/GravityEngine.hpp>
+ #include<core/Scene.hpp>
// registering the plugin
YADE_PLUGIN((GravityEngine));
@@ -756,7 +756,7 @@
.. code-block: c++
/* in the .cpp file */
- #include<yade/pkg-something/HeaderFile.hpp>
+ #include<pkg-something/HeaderFile.hpp>
/* allocate memory for static attrs;
no need to assign initial value, that is done from
(hidden) initialization function at class registration
=== modified file 'gui/qt4/GLViewer.cpp'
--- gui/qt4/GLViewer.cpp 2014-07-14 20:08:34 +0000
+++ gui/qt4/GLViewer.cpp 2014-10-15 06:44:01 +0000
@@ -11,17 +11,17 @@
#include"GLViewer.hpp"
#include"OpenGLManager.hpp"
-#include<yade/lib/opengl/OpenGLWrapper.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/DisplayParameters.hpp>
+#include<lib/opengl/OpenGLWrapper.hpp>
+#include<core/Body.hpp>
+#include<core/Scene.hpp>
+#include<core/Interaction.hpp>
+#include<core/DisplayParameters.hpp>
#include<boost/algorithm/string.hpp>
#include<sstream>
#include<iomanip>
#include<boost/algorithm/string/case_conv.hpp>
-#include<yade/lib/serialization/ObjectIO.hpp>
-#include<yade/lib/pyutil/gil.hpp>
+#include<lib/serialization/ObjectIO.hpp>
+#include<lib/pyutil/gil.hpp>
#include<QtGui/qevent.h>
#ifdef YADE_GL2PS
=== modified file 'gui/qt4/GLViewer.hpp'
--- gui/qt4/GLViewer.hpp 2014-07-14 20:08:34 +0000
+++ gui/qt4/GLViewer.hpp 2014-10-15 06:44:01 +0000
@@ -3,9 +3,9 @@
#pragma once
#ifndef Q_MOC_RUN
-#include<yade/core/Omega.hpp>
-#include<yade/pkg/common/OpenGLRenderer.hpp>
-#include<yade/pkg/common/PeriodicEngines.hpp>
+#include<core/Omega.hpp>
+#include<pkg/common/OpenGLRenderer.hpp>
+#include<pkg/common/PeriodicEngines.hpp>
#include<boost/date_time/posix_time/posix_time.hpp>
#endif
=== modified file 'gui/qt4/GLViewerDisplay.cpp'
--- gui/qt4/GLViewerDisplay.cpp 2014-07-14 20:08:34 +0000
+++ gui/qt4/GLViewerDisplay.cpp 2014-10-15 06:44:01 +0000
@@ -11,17 +11,17 @@
#include"GLViewer.hpp"
#include"OpenGLManager.hpp"
-#include<yade/lib/opengl/OpenGLWrapper.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/DisplayParameters.hpp>
+#include<lib/opengl/OpenGLWrapper.hpp>
+#include<core/Body.hpp>
+#include<core/Scene.hpp>
+#include<core/Interaction.hpp>
+#include<core/DisplayParameters.hpp>
#include<boost/algorithm/string.hpp>
#include<sstream>
#include<iomanip>
#include<boost/algorithm/string/case_conv.hpp>
-#include<yade/lib/serialization/ObjectIO.hpp>
-#include<yade/lib/pyutil/gil.hpp>
+#include<lib/serialization/ObjectIO.hpp>
+#include<lib/pyutil/gil.hpp>
#include<QtGui/qevent.h>
=== modified file 'gui/qt4/GLViewerMouse.cpp'
--- gui/qt4/GLViewerMouse.cpp 2014-07-14 20:08:34 +0000
+++ gui/qt4/GLViewerMouse.cpp 2014-10-15 06:44:01 +0000
@@ -11,17 +11,17 @@
#include"GLViewer.hpp"
#include"OpenGLManager.hpp"
-#include<yade/lib/opengl/OpenGLWrapper.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/DisplayParameters.hpp>
+#include<lib/opengl/OpenGLWrapper.hpp>
+#include<core/Body.hpp>
+#include<core/Scene.hpp>
+#include<core/Interaction.hpp>
+#include<core/DisplayParameters.hpp>
#include<boost/algorithm/string.hpp>
#include<sstream>
#include<iomanip>
#include<boost/algorithm/string/case_conv.hpp>
-#include<yade/lib/serialization/ObjectIO.hpp>
-#include<yade/lib/pyutil/gil.hpp>
+#include<lib/serialization/ObjectIO.hpp>
+#include<lib/pyutil/gil.hpp>
#include<QGLViewer/manipulatedCameraFrame.h>
#include<QtGui/qevent.h>
=== modified file 'gui/qt4/_GLViewer.cpp'
--- gui/qt4/_GLViewer.cpp 2014-07-03 17:20:40 +0000
+++ gui/qt4/_GLViewer.cpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
#include"GLViewer.hpp"
#include"OpenGLManager.hpp"
-#include<yade/pkg/common/OpenGLRenderer.hpp>
-#include<yade/lib/pyutil/doc_opts.hpp>
+#include<pkg/common/OpenGLRenderer.hpp>
+#include<lib/pyutil/doc_opts.hpp>
#include<QApplication>
#include<QCloseEvent>
=== modified file 'lib/base/Math.cpp'
--- lib/base/Math.cpp 2014-08-01 16:00:13 +0000
+++ lib/base/Math.cpp 2014-10-15 06:44:01 +0000
@@ -1,4 +1,4 @@
-#include<yade/lib/base/Math.hpp>
+#include<lib/base/Math.hpp>
template<> const Real Math<Real>::EPSILON = DBL_EPSILON;
template<> const Real Math<Real>::ZERO_TOLERANCE = 1e-20;
template<> const Real Math<Real>::MAX_REAL = DBL_MAX;
=== modified file 'lib/base/openmp-accu.hpp'
--- lib/base/openmp-accu.hpp 2014-07-03 17:20:40 +0000
+++ lib/base/openmp-accu.hpp 2014-10-15 06:44:01 +0000
@@ -2,7 +2,7 @@
#pragma once
// for ZeroInitializer template
-#include <yade/lib/base/Math.hpp>
+#include <lib/base/Math.hpp>
#include <boost/serialization/split_free.hpp>
#include <cstdlib>
=== modified file 'lib/factory/ClassFactory.cpp'
--- lib/factory/ClassFactory.cpp 2010-11-07 11:46:20 +0000
+++ lib/factory/ClassFactory.cpp 2014-10-15 06:44:01 +0000
@@ -11,7 +11,7 @@
#include "ClassFactory.hpp"
#include<boost/algorithm/string/regex.hpp>
-#include<yade/lib/base/Logging.hpp>
+#include<lib/base/Logging.hpp>
CREATE_LOGGER(ClassFactory);
SINGLETON_SELF(ClassFactory);
=== modified file 'lib/factory/ClassFactory.hpp'
--- lib/factory/ClassFactory.hpp 2014-07-03 17:20:40 +0000
+++ lib/factory/ClassFactory.hpp 2014-10-15 06:44:01 +0000
@@ -10,8 +10,8 @@
#pragma once
-#include <yade/lib/base/Math.hpp>
-#include <yade/lib/base/Singleton.hpp>
+#include <lib/base/Math.hpp>
+#include <lib/base/Singleton.hpp>
#include "DynLibManager.hpp"
/*! define the following macro to enable experimenta boost::serialization support
=== modified file 'lib/factory/DynLibManager.hpp'
--- lib/factory/DynLibManager.hpp 2014-07-03 17:20:40 +0000
+++ lib/factory/DynLibManager.hpp 2014-10-15 06:44:01 +0000
@@ -11,8 +11,8 @@
#include <dlfcn.h>
-#include<yade/lib/base/Logging.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<lib/base/Logging.hpp>
+#include<lib/base/Math.hpp>
class DynLibManager
{
=== modified file 'lib/multimethods/DynLibDispatcher.hpp'
--- lib/multimethods/DynLibDispatcher.hpp 2014-07-02 16:18:24 +0000
+++ lib/multimethods/DynLibDispatcher.hpp 2014-10-15 06:44:01 +0000
@@ -12,8 +12,8 @@
#include "Indexable.hpp"
-#include<yade/lib/factory/ClassFactory.hpp>
-#include<yade/lib/serialization/Serializable.hpp>
+#include<lib/factory/ClassFactory.hpp>
+#include<lib/serialization/Serializable.hpp>
#include<loki/Functor.h>
#include<loki/Typelist.h>
=== modified file 'lib/multimethods/FunctorWrapper.hpp'
--- lib/multimethods/FunctorWrapper.hpp 2014-07-03 17:20:40 +0000
+++ lib/multimethods/FunctorWrapper.hpp 2014-10-15 06:44:01 +0000
@@ -9,7 +9,7 @@
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
+#include<lib/serialization/Serializable.hpp>
#include<loki/Typelist.h>
#include<loki/Functor.h>
=== modified file 'lib/opengl/GLUtils.hpp'
--- lib/opengl/GLUtils.hpp 2014-07-03 17:20:40 +0000
+++ lib/opengl/GLUtils.hpp 2014-10-15 06:44:01 +0000
@@ -4,7 +4,7 @@
//
#pragma once
-#include<yade/lib/opengl/OpenGLWrapper.hpp>
+#include<lib/opengl/OpenGLWrapper.hpp>
#include<sstream>
#include<iomanip>
#include<string>
=== modified file 'lib/opengl/OpenGLWrapper.hpp'
--- lib/opengl/OpenGLWrapper.hpp 2013-09-08 11:12:42 +0000
+++ lib/opengl/OpenGLWrapper.hpp 2014-10-15 06:44:01 +0000
@@ -12,7 +12,7 @@
#error "This build doesn't support openGL. Therefore, this header must not be used."
#endif
-#include<yade/lib/base/Math.hpp>
+#include<lib/base/Math.hpp>
// disable temporarily
=== modified file 'lib/pyutil/gil.cpp'
--- lib/pyutil/gil.cpp 2010-11-07 11:46:20 +0000
+++ lib/pyutil/gil.cpp 2014-10-15 06:44:01 +0000
@@ -1,4 +1,4 @@
-#include<yade/lib/pyutil/gil.hpp>
+#include<lib/pyutil/gil.hpp>
void pyRunString(const std::string& cmd){
gilLock lock; PyRun_SimpleString(cmd.c_str());
};
=== modified file 'lib/serialization/Serializable.hpp'
--- lib/serialization/Serializable.hpp 2014-07-11 17:39:21 +0000
+++ lib/serialization/Serializable.hpp 2014-10-15 06:44:01 +0000
@@ -12,10 +12,10 @@
#include <boost/type_traits/integral_constant.hpp>
-#include <yade/lib/base/Math.hpp>
-#include <yade/lib/factory/Factorable.hpp>
-#include <yade/lib/pyutil/raw_constructor.hpp>
-#include <yade/lib/pyutil/doc_opts.hpp>
+#include <lib/base/Math.hpp>
+#include <lib/factory/Factorable.hpp>
+#include <lib/pyutil/raw_constructor.hpp>
+#include <lib/pyutil/doc_opts.hpp>
// empty functions for ADL
//namespace{
=== modified file 'lib/smoothing/WeightedAverage2d.hpp'
--- lib/smoothing/WeightedAverage2d.hpp 2014-07-03 17:20:40 +0000
+++ lib/smoothing/WeightedAverage2d.hpp 2014-10-15 06:44:01 +0000
@@ -2,7 +2,7 @@
#pragma once
-#include<yade/lib/base/Math.hpp>
+#include<lib/base/Math.hpp>
#include<boost/math/distributions/normal.hpp>
=== modified file 'lib/triangulation/FlowBoundingSphere.hpp'
--- lib/triangulation/FlowBoundingSphere.hpp 2014-10-10 11:45:21 +0000
+++ lib/triangulation/FlowBoundingSphere.hpp 2014-10-15 06:44:01 +0000
@@ -166,12 +166,12 @@
};
} //namespace CGT
-#include <yade/lib/triangulation/FlowBoundingSphere.ipp>
+#include <lib/triangulation/FlowBoundingSphere.ipp>
#ifdef LINSOLV
-#include "yade/lib/triangulation/FlowBoundingSphereLinSolv.hpp"
+#include "lib/triangulation/FlowBoundingSphereLinSolv.hpp"
#endif
/// _____ Template Implementation ____
-// #include "yade/lib/triangulation/FlowBoundingSphereLinSolv.ipp"
+// #include "lib/triangulation/FlowBoundingSphereLinSolv.ipp"
#endif //FLOW_ENGINE
=== modified file 'lib/triangulation/PeriodicFlow.hpp'
--- lib/triangulation/PeriodicFlow.hpp 2014-10-14 11:57:20 +0000
+++ lib/triangulation/PeriodicFlow.hpp 2014-10-15 06:44:01 +0000
@@ -2,7 +2,7 @@
#pragma once
-#include <yade/lib/triangulation/FlowBoundingSphere.hpp>//include after #define XVIEW
+#include <lib/triangulation/FlowBoundingSphere.hpp>//include after #define XVIEW
// #include "Timer.h"
// #include "PeriodicTesselation.h"
// #include "basicVTKwritter.hpp"
=== modified file 'lib/triangulation/RegularTriangulation.h'
--- lib/triangulation/RegularTriangulation.h 2014-03-21 18:47:45 +0000
+++ lib/triangulation/RegularTriangulation.h 2014-10-15 06:44:01 +0000
@@ -20,7 +20,7 @@
#include <boost/static_assert.hpp>
//This include from yade let us use Eigen types
-#include <yade/lib/base/Math.hpp>
+#include <lib/base/Math.hpp>
const int facetVertices [4][3] = {{1,2,3},{0,2,3},{0,1,3},{0,1,2}};
=== modified file 'pkg/common/Aabb.hpp'
--- pkg/common/Aabb.hpp 2014-07-19 19:52:41 +0000
+++ pkg/common/Aabb.hpp 2014-10-15 06:44:01 +0000
@@ -8,7 +8,7 @@
#pragma once
-#include<yade/core/Bound.hpp>
+#include<core/Bound.hpp>
/*! Representation of bound by min and max points.
=== modified file 'pkg/common/Bo1_Aabb.cpp'
--- pkg/common/Bo1_Aabb.cpp 2014-07-19 19:52:41 +0000
+++ pkg/common/Bo1_Aabb.cpp 2014-10-15 06:44:01 +0000
@@ -6,7 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
-#include <yade/pkg/common/Bo1_Aabb.hpp>
+#include <pkg/common/Bo1_Aabb.hpp>
YADE_PLUGIN((Bo1_Sphere_Aabb)(Bo1_Facet_Aabb)(Bo1_Box_Aabb));
=== modified file 'pkg/common/Bo1_Aabb.hpp'
--- pkg/common/Bo1_Aabb.hpp 2014-07-19 19:52:41 +0000
+++ pkg/common/Bo1_Aabb.hpp 2014-10-15 06:44:01 +0000
@@ -8,11 +8,11 @@
#pragma once
-#include <yade/pkg/common/Dispatching.hpp>
-#include <yade/pkg/common/Aabb.hpp>
-#include <yade/pkg/common/Sphere.hpp>
-#include <yade/pkg/common/Facet.hpp>
-#include <yade/pkg/common/Box.hpp>
+#include <pkg/common/Dispatching.hpp>
+#include <pkg/common/Aabb.hpp>
+#include <pkg/common/Sphere.hpp>
+#include <pkg/common/Facet.hpp>
+#include <pkg/common/Box.hpp>
class Bo1_Sphere_Aabb : public BoundFunctor
{
=== modified file 'pkg/common/BoundaryController.hpp'
--- pkg/common/BoundaryController.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/BoundaryController.hpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
#pragma once
-#include<yade/core/GlobalEngine.hpp>
+#include<core/GlobalEngine.hpp>
class BoundaryController: public GlobalEngine{
virtual void action() {
{ throw std::runtime_error("BoundaryController must not be used in simulations directly (BoundaryController::action called)."); }
=== modified file 'pkg/common/Box.hpp'
--- pkg/common/Box.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/Box.hpp 2014-10-15 06:44:01 +0000
@@ -8,7 +8,7 @@
#pragma once
-#include<yade/core/Shape.hpp>
+#include<core/Shape.hpp>
class Box: public Shape{
=== modified file 'pkg/common/Callbacks.hpp'
--- pkg/common/Callbacks.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/Callbacks.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
// 2010 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
+#include<lib/serialization/Serializable.hpp>
class Interaction;
class Body;
=== modified file 'pkg/common/Collider.cpp'
--- pkg/common/Collider.cpp 2014-07-02 16:11:24 +0000
+++ pkg/common/Collider.cpp 2014-10-15 06:44:01 +0000
@@ -5,7 +5,7 @@
* This program is free software; it is licensed under the terms of the *
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
-#include<yade/pkg/common/Collider.hpp>
+#include<pkg/common/Collider.hpp>
YADE_PLUGIN((Collider));
=== modified file 'pkg/common/Collider.hpp'
--- pkg/common/Collider.hpp 2014-05-23 13:05:19 +0000
+++ pkg/common/Collider.hpp 2014-10-15 06:44:01 +0000
@@ -8,11 +8,11 @@
#pragma once
-#include<yade/core/Bound.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/GlobalEngine.hpp>
+#include<core/Bound.hpp>
+#include<core/Interaction.hpp>
+#include<core/GlobalEngine.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
+#include<pkg/common/Dispatching.hpp>
class Collider: public GlobalEngine {
public:
=== modified file 'pkg/common/CylScGeom6D.hpp'
--- pkg/common/CylScGeom6D.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/CylScGeom6D.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
// 2011 © Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
// 2012 © Kneib Francois <francois.kneib@xxxxxxxxx>
#pragma once
-#include<yade/pkg/dem/ScGeom.hpp>
+#include<pkg/dem/ScGeom.hpp>
class CylScGeom: public ScGeom {
=== modified file 'pkg/common/Cylinder.cpp'
--- pkg/common/Cylinder.cpp 2014-07-18 18:18:50 +0000
+++ pkg/common/Cylinder.cpp 2014-10-15 06:44:01 +0000
@@ -2,11 +2,11 @@
// 2012 © Kneib Francois <francois.kneib@xxxxxxxxx>
#include "Cylinder.hpp"
-#include<yade/pkg/common/Sphere.hpp>
+#include<pkg/common/Sphere.hpp>
#ifdef YADE_OPENGL
- #include<yade/lib/opengl/OpenGLWrapper.hpp>
+ #include<lib/opengl/OpenGLWrapper.hpp>
#endif
-#include<yade/pkg/common/Aabb.hpp>
+#include<pkg/common/Aabb.hpp>
Cylinder::~Cylinder(){}
ChainedCylinder::~ChainedCylinder(){}
=== modified file 'pkg/common/Cylinder.hpp'
--- pkg/common/Cylinder.hpp 2014-07-18 18:18:50 +0000
+++ pkg/common/Cylinder.hpp 2014-10-15 06:44:01 +0000
@@ -2,16 +2,16 @@
// 2012 © Kneib Francois <francois.kneib@xxxxxxxxx>
#pragma once
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/core/Shape.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<core/Shape.hpp>
+#include<core/Body.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/common/Sphere.hpp>
#ifdef YADE_OPENGL
- #include<yade/pkg/common/GLDrawFunctors.hpp>
+ #include<pkg/common/GLDrawFunctors.hpp>
#endif
-#include<yade/pkg/dem/CohesiveFrictionalContactLaw.hpp>
-#include<yade/pkg/common/CylScGeom6D.hpp>
+#include<pkg/dem/CohesiveFrictionalContactLaw.hpp>
+#include<pkg/common/CylScGeom6D.hpp>
class Cylinder: public Sphere{
public:
=== modified file 'pkg/common/Dispatching.cpp'
--- pkg/common/Dispatching.cpp 2014-10-14 15:52:06 +0000
+++ pkg/common/Dispatching.cpp 2014-10-15 06:44:01 +0000
@@ -1,4 +1,4 @@
-#include<yade/pkg/common/Dispatching.hpp>
+#include<pkg/common/Dispatching.hpp>
YADE_PLUGIN((BoundFunctor)(IGeomFunctor)(IPhysFunctor)(LawFunctor)(BoundDispatcher)(IGeomDispatcher)(IPhysDispatcher)(LawDispatcher));
BoundFunctor::~BoundFunctor(){};
=== modified file 'pkg/common/Dispatching.hpp'
--- pkg/common/Dispatching.hpp 2014-07-18 18:18:50 +0000
+++ pkg/common/Dispatching.hpp 2014-10-15 06:44:01 +0000
@@ -1,15 +1,15 @@
#pragma once
-#include<yade/core/Shape.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/State.hpp>
-#include<yade/core/Shape.hpp>
-#include<yade/core/IGeom.hpp>
-#include<yade/core/IPhys.hpp>
-#include<yade/core/Functor.hpp>
-#include<yade/core/Dispatcher.hpp>
-#include<yade/pkg/common/Aabb.hpp>
+#include<core/Shape.hpp>
+#include<lib/base/Math.hpp>
+#include<core/Interaction.hpp>
+#include<core/Scene.hpp>
+#include<core/State.hpp>
+#include<core/Shape.hpp>
+#include<core/IGeom.hpp>
+#include<core/IPhys.hpp>
+#include<core/Functor.hpp>
+#include<core/Dispatcher.hpp>
+#include<pkg/common/Aabb.hpp>
/********
functors
=== modified file 'pkg/common/ElastMat.hpp'
--- pkg/common/ElastMat.hpp 2014-07-19 19:52:41 +0000
+++ pkg/common/ElastMat.hpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/core/Material.hpp>
+#include<core/Material.hpp>
/*! Elastic material */
class ElastMat: public Material{
=== modified file 'pkg/common/Facet.hpp'
--- pkg/common/Facet.hpp 2013-09-08 11:12:42 +0000
+++ pkg/common/Facet.hpp 2014-10-15 06:44:01 +0000
@@ -8,8 +8,8 @@
#pragma once
-#include<yade/core/Shape.hpp>
-#include<yade/core/Body.hpp>
+#include<core/Shape.hpp>
+#include<core/Body.hpp>
// define this to have topology information about facets enabled;
// it is necessary for FacetTopologyAnalyzer
=== modified file 'pkg/common/FieldApplier.hpp'
--- pkg/common/FieldApplier.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/FieldApplier.hpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
#pragma once
-#include <yade/core/GlobalEngine.hpp>
+#include <core/GlobalEngine.hpp>
#include <stdexcept>
class FieldApplier: public GlobalEngine{
=== modified file 'pkg/common/ForceEngine.cpp'
--- pkg/common/ForceEngine.cpp 2014-08-19 13:59:12 +0000
+++ pkg/common/ForceEngine.cpp 2014-10-15 06:44:01 +0000
@@ -3,13 +3,13 @@
// 2014 © Raphael Maurin <raphael.maurin@xxxxxxxxx>
#include"ForceEngine.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/lib/smoothing/LinearInterpolate.hpp>
-#include<yade/pkg/dem/Shop.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<lib/smoothing/LinearInterpolate.hpp>
+#include<pkg/dem/Shop.hpp>
-#include<yade/core/IGeom.hpp>
-#include<yade/core/IPhys.hpp>
+#include<core/IGeom.hpp>
+#include<core/IPhys.hpp>
#include <boost/random/linear_congruential.hpp>
#include <boost/random/normal_distribution.hpp>
=== modified file 'pkg/common/ForceEngine.hpp'
--- pkg/common/ForceEngine.hpp 2014-08-19 13:59:12 +0000
+++ pkg/common/ForceEngine.hpp 2014-10-15 06:44:01 +0000
@@ -4,7 +4,7 @@
#pragma once
-#include<yade/core/PartialEngine.hpp>
+#include<core/PartialEngine.hpp>
class ForceEngine: public PartialEngine{
public:
=== modified file 'pkg/common/ForceResetter.hpp'
--- pkg/common/ForceResetter.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/ForceResetter.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
#pragma once
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/core/Scene.hpp>
+#include<core/GlobalEngine.hpp>
+#include<core/Scene.hpp>
class Scene;
class ForceResetter: public GlobalEngine{
=== modified file 'pkg/common/GLDrawFunctors.hpp'
--- pkg/common/GLDrawFunctors.hpp 2011-02-27 13:54:43 +0000
+++ pkg/common/GLDrawFunctors.hpp 2014-10-15 06:44:01 +0000
@@ -3,16 +3,16 @@
#pragma once
-#include<yade/lib/multimethods/FunctorWrapper.hpp>
-#include<yade/core/Bound.hpp>
-#include<yade/core/State.hpp>
-#include<yade/core/Shape.hpp>
-#include<yade/core/Functor.hpp>
-#include<yade/core/Dispatcher.hpp>
-#include<yade/core/IGeom.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/IPhys.hpp>
+#include<lib/multimethods/FunctorWrapper.hpp>
+#include<core/Bound.hpp>
+#include<core/State.hpp>
+#include<core/Shape.hpp>
+#include<core/Functor.hpp>
+#include<core/Dispatcher.hpp>
+#include<core/IGeom.hpp>
+#include<core/Body.hpp>
+#include<core/Interaction.hpp>
+#include<core/IPhys.hpp>
#define RENDERS(name) public: virtual string renders() const { return #name;}; FUNCTOR1D(name);
=== modified file 'pkg/common/Gl1_NormPhys.cpp'
--- pkg/common/Gl1_NormPhys.cpp 2014-07-03 07:16:58 +0000
+++ pkg/common/Gl1_NormPhys.cpp 2014-10-15 06:44:01 +0000
@@ -1,11 +1,11 @@
#ifdef YADE_OPENGL
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/Gl1_NormPhys.hpp>
-#include<yade/pkg/common/OpenGLRenderer.hpp>
-#include<yade/pkg/common/NormShearPhys.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/pkg/dem/Shop.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/Gl1_NormPhys.hpp>
+#include<pkg/common/OpenGLRenderer.hpp>
+#include<pkg/common/NormShearPhys.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<pkg/dem/Shop.hpp>
YADE_PLUGIN((Gl1_NormPhys));
=== modified file 'pkg/common/Gl1_NormPhys.hpp'
--- pkg/common/Gl1_NormPhys.hpp 2014-04-02 15:19:41 +0000
+++ pkg/common/Gl1_NormPhys.hpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
#pragma once
-#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<lib/opengl/OpenGLWrapper.hpp>
+#include<lib/opengl/GLUtils.hpp>
+#include<pkg/common/GLDrawFunctors.hpp>
+#include<pkg/common/NormShearPhys.hpp>
#include<GL/glu.h>
=== modified file 'pkg/common/Gl1_Primitives.cpp'
--- pkg/common/Gl1_Primitives.cpp 2014-07-19 21:36:19 +0000
+++ pkg/common/Gl1_Primitives.cpp 2014-10-15 06:44:01 +0000
@@ -16,8 +16,8 @@
#ifdef YADE_OPENGL
#include "Gl1_Primitives.hpp"
-#include <yade/lib/opengl/OpenGLWrapper.hpp>
-#include <yade/core/Scene.hpp>
+#include <lib/opengl/OpenGLWrapper.hpp>
+#include <core/Scene.hpp>
YADE_PLUGIN((Gl1_Aabb)(Gl1_Box)(Gl1_Facet));
YADE_PLUGIN((GlBoundFunctor)(GlShapeFunctor)(GlIGeomFunctor)(GlIPhysFunctor)(GlStateFunctor)
=== modified file 'pkg/common/Gl1_Primitives.hpp'
--- pkg/common/Gl1_Primitives.hpp 2014-07-19 21:36:19 +0000
+++ pkg/common/Gl1_Primitives.hpp 2014-10-15 06:44:01 +0000
@@ -15,11 +15,11 @@
#pragma once
-#include<yade/pkg/common/GLDrawFunctors.hpp>
-#include<yade/pkg/common/Aabb.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<pkg/common/GLDrawFunctors.hpp>
+#include<pkg/common/Aabb.hpp>
+#include<pkg/common/Box.hpp>
+#include<pkg/common/Facet.hpp>
+#include<pkg/common/Sphere.hpp>
class Gl1_Aabb: public GlBoundFunctor{
public:
=== modified file 'pkg/common/GravityEngines.cpp'
--- pkg/common/GravityEngines.cpp 2014-09-15 10:27:11 +0000
+++ pkg/common/GravityEngines.cpp 2014-10-15 06:44:01 +0000
@@ -6,10 +6,10 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
-#include<yade/pkg/common/GravityEngines.hpp>
-#include<yade/pkg/common/PeriodicEngines.hpp>
-#include<yade/core/BodyContainer.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/common/GravityEngines.hpp>
+#include<pkg/common/PeriodicEngines.hpp>
+#include<core/BodyContainer.hpp>
+#include<core/Scene.hpp>
#include<boost/regex.hpp>
YADE_PLUGIN((GravityEngine)(CentralGravityEngine)(AxialGravityEngine)(HdapsGravityEngine));
=== modified file 'pkg/common/GravityEngines.hpp'
--- pkg/common/GravityEngines.hpp 2012-01-30 20:53:49 +0000
+++ pkg/common/GravityEngines.hpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
// 2004 © Janek Kozicki <cosurgi@xxxxxxxxxx>
// 2007,2008 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/pkg/common/FieldApplier.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/Body.hpp>
+#include<pkg/common/FieldApplier.hpp>
+#include<core/Interaction.hpp>
+#include<core/Body.hpp>
/*! Homogeneous gravity field; applies gravity×mass force on all bodies. */
class GravityEngine: public FieldApplier{
=== modified file 'pkg/common/Grid.hpp'
--- pkg/common/Grid.hpp 2014-07-18 18:18:50 +0000
+++ pkg/common/Grid.hpp 2014-10-15 06:44:01 +0000
@@ -22,15 +22,15 @@
#pragma once
#include "Sphere.hpp"
-#include <yade/pkg/dem/FrictPhys.hpp>
-#include <yade/pkg/dem/CohesiveFrictionalContactLaw.hpp>
-#include <yade/pkg/dem/ScGeom.hpp>
-#include <yade/core/Body.hpp>
-#include <yade/pkg/common/Dispatching.hpp>
-#include <yade/pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
-#include <yade/pkg/dem/ElasticContactLaw.hpp>
+#include <pkg/dem/FrictPhys.hpp>
+#include <pkg/dem/CohesiveFrictionalContactLaw.hpp>
+#include <pkg/dem/ScGeom.hpp>
+#include <core/Body.hpp>
+#include <pkg/common/Dispatching.hpp>
+#include <pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
+#include <pkg/dem/ElasticContactLaw.hpp>
#ifdef YADE_OPENGL
- #include<yade/pkg/common/GLDrawFunctors.hpp>
+ #include<pkg/common/GLDrawFunctors.hpp>
#endif
=== modified file 'pkg/common/Grid_GUI.cpp'
--- pkg/common/Grid_GUI.cpp 2013-11-12 08:29:26 +0000
+++ pkg/common/Grid_GUI.cpp 2014-10-15 06:44:01 +0000
@@ -7,7 +7,7 @@
#include "Grid.hpp"
#ifdef YADE_OPENGL
- #include<yade/lib/opengl/OpenGLWrapper.hpp>
+ #include<lib/opengl/OpenGLWrapper.hpp>
//!################## Rendering #####################
=== modified file 'pkg/common/InsertionSortCollider.cpp'
--- pkg/common/InsertionSortCollider.cpp 2014-09-15 10:27:11 +0000
+++ pkg/common/InsertionSortCollider.cpp 2014-10-15 06:44:01 +0000
@@ -2,12 +2,12 @@
// 2013 © Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
#include"InsertionSortCollider.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/InteractionContainer.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/dem/NewtonIntegrator.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<core/Scene.hpp>
+#include<core/Interaction.hpp>
+#include<core/InteractionContainer.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/dem/NewtonIntegrator.hpp>
+#include<pkg/common/Sphere.hpp>
#include<boost/static_assert.hpp>
#ifdef YADE_OPENMP
=== modified file 'pkg/common/InsertionSortCollider.hpp'
--- pkg/common/InsertionSortCollider.hpp 2014-05-23 13:05:19 +0000
+++ pkg/common/InsertionSortCollider.hpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
// 2013 © Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
#pragma once
-#include<yade/pkg/common/Collider.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/common/Collider.hpp>
+#include<core/Scene.hpp>
class InteractionContainer;
=== modified file 'pkg/common/InteractionLoop.hpp'
--- pkg/common/InteractionLoop.hpp 2014-05-23 13:05:19 +0000
+++ pkg/common/InteractionLoop.hpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/pkg/common/Callbacks.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
+#include<core/GlobalEngine.hpp>
+#include<pkg/common/Callbacks.hpp>
+#include<pkg/common/Dispatching.hpp>
#ifdef USE_TIMING_DELTAS
#define TIMING_DELTAS_CHECKPOINT(cpt) timingDeltas->checkpoint(cpt)
=== modified file 'pkg/common/KinematicEngines.cpp'
--- pkg/common/KinematicEngines.cpp 2014-07-03 07:16:58 +0000
+++ pkg/common/KinematicEngines.cpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/KinematicEngines.hpp>
-#include<yade/pkg/dem/Shop.hpp>
-#include<yade/lib/smoothing/LinearInterpolate.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/KinematicEngines.hpp>
+#include<pkg/dem/Shop.hpp>
+#include<lib/smoothing/LinearInterpolate.hpp>
YADE_PLUGIN((KinematicEngine)(CombinedKinematicEngine)(TranslationEngine)(HarmonicMotionEngine)(RotationEngine)(HelixEngine)(InterpolatingHelixEngine)(HarmonicRotationEngine)(ServoPIDController)(BicyclePedalEngine));
=== modified file 'pkg/common/KinematicEngines.hpp'
--- pkg/common/KinematicEngines.hpp 2014-04-23 13:38:24 +0000
+++ pkg/common/KinematicEngines.hpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
#pragma once
-#include<yade/core/PartialEngine.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<core/PartialEngine.hpp>
+#include<lib/base/Math.hpp>
struct KinematicEngine;
=== modified file 'pkg/common/MatchMaker.cpp'
--- pkg/common/MatchMaker.cpp 2014-07-23 09:11:35 +0000
+++ pkg/common/MatchMaker.cpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
// 2010 © Václav Šmilauer <eudoxos@xxxxxxxx>
-#include <yade/pkg/common/MatchMaker.hpp>
+#include <pkg/common/MatchMaker.hpp>
YADE_PLUGIN((MatchMaker));
=== modified file 'pkg/common/MatchMaker.hpp'
--- pkg/common/MatchMaker.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/MatchMaker.hpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
// 2010 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
+#include<lib/serialization/Serializable.hpp>
namespace py = boost::python;
=== modified file 'pkg/common/NormShearPhys.hpp'
--- pkg/common/NormShearPhys.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/NormShearPhys.hpp 2014-10-15 06:44:01 +0000
@@ -2,7 +2,7 @@
// © 2008 Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/core/IPhys.hpp>
+#include<core/IPhys.hpp>
class NormPhys:public IPhys {
public:
=== modified file 'pkg/common/OpenGLRenderer.cpp'
--- pkg/common/OpenGLRenderer.cpp 2014-07-31 16:09:05 +0000
+++ pkg/common/OpenGLRenderer.cpp 2014-10-15 06:44:01 +0000
@@ -4,12 +4,12 @@
#ifdef YADE_OPENGL
#include"OpenGLRenderer.hpp"
-#include<yade/lib/opengl/OpenGLWrapper.hpp>
-#include<yade/lib/opengl/GLUtils.hpp>
-#include<yade/core/Timing.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/Aabb.hpp>
-#include<yade/lib/pyutil/gil.hpp>
+#include<lib/opengl/OpenGLWrapper.hpp>
+#include<lib/opengl/GLUtils.hpp>
+#include<core/Timing.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/Aabb.hpp>
+#include<lib/pyutil/gil.hpp>
#ifdef __APPLE__
# include <OpenGL/glu.h>
=== modified file 'pkg/common/OpenGLRenderer.hpp'
--- pkg/common/OpenGLRenderer.hpp 2014-05-23 13:05:19 +0000
+++ pkg/common/OpenGLRenderer.hpp 2014-10-15 06:44:01 +0000
@@ -2,12 +2,12 @@
// © 2008 Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/lib/multimethods/DynLibDispatcher.hpp>
-#include<yade/core/Dispatcher.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/lib/opengl/OpenGLWrapper.hpp>
+#include<lib/multimethods/DynLibDispatcher.hpp>
+#include<core/Dispatcher.hpp>
+#include<core/Body.hpp>
+#include<lib/opengl/OpenGLWrapper.hpp>
-#include<yade/pkg/common/GLDrawFunctors.hpp>
+#include<pkg/common/GLDrawFunctors.hpp>
struct GlExtraDrawer: public Serializable{
Scene* scene;
=== modified file 'pkg/common/ParallelEngine.cpp'
--- pkg/common/ParallelEngine.cpp 2014-07-23 09:11:35 +0000
+++ pkg/common/ParallelEngine.cpp 2014-10-15 06:44:01 +0000
@@ -1,4 +1,4 @@
-#include <yade/pkg/common/ParallelEngine.hpp>
+#include <pkg/common/ParallelEngine.hpp>
YADE_PLUGIN((ParallelEngine));
#ifdef YADE_OPENMP
=== modified file 'pkg/common/ParallelEngine.hpp'
--- pkg/common/ParallelEngine.hpp 2014-07-03 17:20:40 +0000
+++ pkg/common/ParallelEngine.hpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
#pragma once
-#include<yade/core/GlobalEngine.hpp>
+#include<core/GlobalEngine.hpp>
class ParallelEngine;
shared_ptr<ParallelEngine> ParallelEngine_ctor_list(const boost::python::list& slaves);
=== modified file 'pkg/common/PeriodicEngines.hpp'
--- pkg/common/PeriodicEngines.hpp 2014-09-29 15:31:49 +0000
+++ pkg/common/PeriodicEngines.hpp 2014-10-15 06:44:01 +0000
@@ -2,9 +2,9 @@
#pragma once
#include<time.h>
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
+#include<core/GlobalEngine.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
class PeriodicEngine: public GlobalEngine {
public:
=== modified file 'pkg/common/PersistentTriangulationCollider.cpp'
--- pkg/common/PersistentTriangulationCollider.cpp 2014-07-03 17:20:40 +0000
+++ pkg/common/PersistentTriangulationCollider.cpp 2014-10-15 06:44:01 +0000
@@ -7,11 +7,11 @@
#ifdef YADE_CGAL
#include"PersistentTriangulationCollider.hpp"
-#include<yade/core/Body.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/BodyContainer.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
+#include<core/Body.hpp>
+#include<core/Scene.hpp>
+#include<core/BodyContainer.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/ElastMat.hpp>
// PersistentTriangulationCollider::PersistentTriangulationCollider() : Collider()
// {
=== modified file 'pkg/common/PersistentTriangulationCollider.hpp'
--- pkg/common/PersistentTriangulationCollider.hpp 2014-07-14 20:08:34 +0000
+++ pkg/common/PersistentTriangulationCollider.hpp 2014-10-15 06:44:01 +0000
@@ -7,9 +7,9 @@
*************************************************************************/
#pragma once
-#include<yade/pkg/common/Collider.hpp>
-#include<yade/core/InteractionContainer.hpp>
-#include<yade/pkg/dem/TesselationWrapper.hpp>
+#include<pkg/common/Collider.hpp>
+#include<core/InteractionContainer.hpp>
+#include<pkg/dem/TesselationWrapper.hpp>
/*! \brief Collision detection engine based on regular triangulation.
=== modified file 'pkg/common/PyRunner.hpp'
--- pkg/common/PyRunner.hpp 2014-07-19 19:52:41 +0000
+++ pkg/common/PyRunner.hpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
// 2008 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/PeriodicEngines.hpp>
-#include<yade/lib/pyutil/gil.hpp>
+#include<core/GlobalEngine.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/PeriodicEngines.hpp>
+#include<lib/pyutil/gil.hpp>
class PyRunner: public PeriodicEngine {
public :
=== modified file 'pkg/common/Recorder.hpp'
--- pkg/common/Recorder.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/Recorder.hpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/pkg/common/PeriodicEngines.hpp>
+#include<pkg/common/PeriodicEngines.hpp>
class Recorder: public PeriodicEngine{
void openAndCheck() {
assert(!out.is_open());
=== modified file 'pkg/common/ResetRandomPosition.cpp'
--- pkg/common/ResetRandomPosition.cpp 2014-07-03 17:20:40 +0000
+++ pkg/common/ResetRandomPosition.cpp 2014-10-15 06:44:01 +0000
@@ -11,12 +11,12 @@
#endif
#include<boost/random.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/pkg/common/Aabb.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/pkg/common/InteractionLoop.hpp>
-//#include<yade/pkg/dem/BodyMacroParameters.hpp>
+#include<core/Body.hpp>
+#include<pkg/common/Aabb.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Facet.hpp>
+#include<pkg/common/InteractionLoop.hpp>
+//#include<pkg/dem/BodyMacroParameters.hpp>
#include"ResetRandomPosition.hpp"
YADE_PLUGIN((ResetRandomPosition));
=== modified file 'pkg/common/ResetRandomPosition.hpp'
--- pkg/common/ResetRandomPosition.hpp 2014-07-02 16:18:24 +0000
+++ pkg/common/ResetRandomPosition.hpp 2014-10-15 06:44:01 +0000
@@ -7,10 +7,10 @@
*************************************************************************/
#pragma once
-#include <yade/pkg/common/PeriodicEngines.hpp>
-#include <yade/pkg/common/Dispatching.hpp>
-#include <yade/pkg/common/Collider.hpp>
-#include <yade/core/Scene.hpp>
+#include <pkg/common/PeriodicEngines.hpp>
+#include <pkg/common/Dispatching.hpp>
+#include <pkg/common/Collider.hpp>
+#include <core/Scene.hpp>
#include <vector>
#include <string>
=== modified file 'pkg/common/SPHEngine.cpp'
--- pkg/common/SPHEngine.cpp 2014-05-30 13:24:10 +0000
+++ pkg/common/SPHEngine.cpp 2014-10-15 06:44:01 +0000
@@ -1,11 +1,11 @@
#ifdef YADE_SPH
#include"SPHEngine.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/dem/ViscoelasticPM.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<core/Scene.hpp>
+#include<pkg/dem/ViscoelasticPM.hpp>
+#include<pkg/common/Sphere.hpp>
-#include<yade/core/State.hpp>
-#include<yade/core/Omega.hpp>
+#include<core/State.hpp>
+#include<core/Omega.hpp>
void SPHEngine::action(){
{
=== modified file 'pkg/common/SPHEngine.hpp'
--- pkg/common/SPHEngine.hpp 2014-04-09 14:03:16 +0000
+++ pkg/common/SPHEngine.hpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
#ifdef YADE_SPH
#pragma once
-#include<yade/core/PartialEngine.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
+#include<core/PartialEngine.hpp>
+#include<pkg/dem/ScGeom.hpp>
typedef Real (* KernelFunction)(const double & r, const double & h);
=== modified file 'pkg/common/SpatialQuickSortCollider.cpp'
--- pkg/common/SpatialQuickSortCollider.cpp 2014-07-02 18:26:05 +0000
+++ pkg/common/SpatialQuickSortCollider.cpp 2014-10-15 06:44:01 +0000
@@ -6,8 +6,8 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#include "SpatialQuickSortCollider.hpp"
-#include <yade/core/Scene.hpp>
-#include <yade/core/BodyContainer.hpp>
+#include <core/Scene.hpp>
+#include <core/BodyContainer.hpp>
#include <cmath>
#include <algorithm>
=== modified file 'pkg/common/SpatialQuickSortCollider.hpp'
--- pkg/common/SpatialQuickSortCollider.hpp 2014-07-02 16:18:24 +0000
+++ pkg/common/SpatialQuickSortCollider.hpp 2014-10-15 06:44:01 +0000
@@ -7,8 +7,8 @@
*************************************************************************/
#pragma once
-#include <yade/pkg/common/Collider.hpp>
-#include <yade/core/InteractionContainer.hpp>
+#include <pkg/common/Collider.hpp>
+#include <core/InteractionContainer.hpp>
#include <vector>
class SpatialQuickSortCollider : public Collider {
=== modified file 'pkg/common/Sphere.hpp'
--- pkg/common/Sphere.hpp 2014-07-19 19:52:41 +0000
+++ pkg/common/Sphere.hpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
#pragma once
-#include<yade/core/Shape.hpp>
+#include<core/Shape.hpp>
// HACK to work around https://bugs.launchpad.net/yade/+bug/528509
// see comments there for explanation
=== modified file 'pkg/common/StepDisplacer.hpp'
--- pkg/common/StepDisplacer.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/StepDisplacer.hpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
// 2008 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/core/PartialEngine.hpp>
-#include<yade/core/State.hpp>
-#include<yade/core/Scene.hpp>
+#include<core/PartialEngine.hpp>
+#include<core/State.hpp>
+#include<core/Scene.hpp>
class StepDisplacer: public PartialEngine {
public:
=== modified file 'pkg/common/TorqueEngine.hpp'
--- pkg/common/TorqueEngine.hpp 2014-07-21 09:09:14 +0000
+++ pkg/common/TorqueEngine.hpp 2014-10-15 06:44:01 +0000
@@ -8,8 +8,8 @@
#pragma once
-#include <yade/core/PartialEngine.hpp>
-#include <yade/core/Scene.hpp>
+#include <core/PartialEngine.hpp>
+#include <core/Scene.hpp>
class TorqueEngine: public PartialEngine{
public:
=== modified file 'pkg/common/Wall.cpp'
--- pkg/common/Wall.cpp 2014-07-03 17:20:40 +0000
+++ pkg/common/Wall.cpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
// © 2009 Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/pkg/common/Wall.hpp>
-#include<yade/pkg/common/Aabb.hpp>
+#include<pkg/common/Wall.hpp>
+#include<pkg/common/Aabb.hpp>
YADE_PLUGIN((Wall)(Bo1_Wall_Aabb)
#ifdef YADE_OPENGL
@@ -22,7 +22,7 @@
#ifdef YADE_OPENGL
- #include<yade/lib/opengl/OpenGLWrapper.hpp>
+ #include<lib/opengl/OpenGLWrapper.hpp>
int Gl1_Wall::div=20;
void Gl1_Wall::go(const shared_ptr<Shape>& cm, const shared_ptr<State>& pp, bool, const GLViewInfo& glinfo){
=== modified file 'pkg/common/Wall.hpp'
--- pkg/common/Wall.hpp 2010-11-07 11:46:20 +0000
+++ pkg/common/Wall.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
// © 2009 Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/core/Shape.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
+#include<core/Shape.hpp>
+#include<pkg/common/Dispatching.hpp>
/*! Object representing infinite plane aligned with the coordinate system (axis-aligned wall). */
@@ -27,7 +27,7 @@
};
REGISTER_SERIALIZABLE(Bo1_Wall_Aabb);
#ifdef YADE_OPENGL
- #include<yade/pkg/common/GLDrawFunctors.hpp>
+ #include<pkg/common/GLDrawFunctors.hpp>
class Gl1_Wall: public GlShapeFunctor{
public:
virtual void go(const shared_ptr<Shape>&, const shared_ptr<State>&,bool,const GLViewInfo&);
=== modified file 'pkg/common/ZECollider.cpp'
--- pkg/common/ZECollider.cpp 2014-07-03 17:20:40 +0000
+++ pkg/common/ZECollider.cpp 2014-10-15 06:44:01 +0000
@@ -3,12 +3,12 @@
#ifdef YADE_CGAL
#include"ZECollider.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/InteractionContainer.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/dem/NewtonIntegrator.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<core/Scene.hpp>
+#include<core/Interaction.hpp>
+#include<core/InteractionContainer.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/dem/NewtonIntegrator.hpp>
+#include<pkg/common/Sphere.hpp>
#include<boost/static_assert.hpp>
=== modified file 'pkg/common/ZECollider.hpp'
--- pkg/common/ZECollider.hpp 2014-07-03 17:20:40 +0000
+++ pkg/common/ZECollider.hpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
// 2011 © Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
#pragma once
-#include<yade/pkg/common/Collider.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/common/Collider.hpp>
+#include<core/Scene.hpp>
class InteractionContainer;
// #define this macro to enable timing within this engine
=== modified file 'pkg/common/common.cpp'
--- pkg/common/common.cpp 2014-07-23 09:11:35 +0000
+++ pkg/common/common.cpp 2014-10-15 06:44:01 +0000
@@ -1,22 +1,22 @@
// =======================================================
// Some plugins from removed CPP-fiels
-#include <yade/pkg/dem/DemXDofGeom.hpp>
-#include <yade/pkg/common/TorqueEngine.hpp>
-#include <yade/pkg/common/ForceResetter.hpp>
-#include <yade/pkg/common/FieldApplier.hpp>
-#include <yade/pkg/common/Callbacks.hpp>
-#include <yade/pkg/common/BoundaryController.hpp>
-#include <yade/pkg/common/NormShearPhys.hpp>
-#include <yade/pkg/common/Recorder.hpp>
-#include <yade/pkg/common/CylScGeom6D.hpp>
-#include <yade/pkg/common/Box.hpp>
-#include <yade/pkg/common/StepDisplacer.hpp>
-#include <yade/pkg/common/PeriodicEngines.hpp>
-#include <yade/pkg/common/ElastMat.hpp>
-#include <yade/pkg/common/PyRunner.hpp>
-#include <yade/pkg/common/Sphere.hpp>
-#include <yade/pkg/common/Aabb.hpp>
+#include <pkg/dem/DemXDofGeom.hpp>
+#include <pkg/common/TorqueEngine.hpp>
+#include <pkg/common/ForceResetter.hpp>
+#include <pkg/common/FieldApplier.hpp>
+#include <pkg/common/Callbacks.hpp>
+#include <pkg/common/BoundaryController.hpp>
+#include <pkg/common/NormShearPhys.hpp>
+#include <pkg/common/Recorder.hpp>
+#include <pkg/common/CylScGeom6D.hpp>
+#include <pkg/common/Box.hpp>
+#include <pkg/common/StepDisplacer.hpp>
+#include <pkg/common/PeriodicEngines.hpp>
+#include <pkg/common/ElastMat.hpp>
+#include <pkg/common/PyRunner.hpp>
+#include <pkg/common/Sphere.hpp>
+#include <pkg/common/Aabb.hpp>
YADE_PLUGIN((IntrCallback)
#ifdef YADE_BODY_CALLBACK
=== modified file 'pkg/dem/BubbleMat.hpp'
--- pkg/dem/BubbleMat.hpp 2014-07-28 06:24:36 +0000
+++ pkg/dem/BubbleMat.hpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
#pragma once
-#include<yade/core/Material.hpp>
-#include<yade/core/IPhys.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
+#include<core/Material.hpp>
+#include<core/IPhys.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/common/Dispatching.hpp>
namespace py=boost::python;
=== modified file 'pkg/dem/CapillaryPhys.cpp'
--- pkg/dem/CapillaryPhys.cpp 2014-07-14 20:08:34 +0000
+++ pkg/dem/CapillaryPhys.cpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
-#include <yade/pkg/dem/CapillaryPhys.hpp>
-#include <yade/pkg/dem/ScGeom.hpp>
+#include <pkg/dem/CapillaryPhys.hpp>
+#include <pkg/dem/ScGeom.hpp>
YADE_PLUGIN((CapillaryPhys)(Ip2_FrictMat_FrictMat_CapillaryPhys));
=== modified file 'pkg/dem/CapillaryPhys.hpp'
--- pkg/dem/CapillaryPhys.hpp 2014-10-01 17:33:13 +0000
+++ pkg/dem/CapillaryPhys.hpp 2014-10-15 06:44:01 +0000
@@ -6,9 +6,9 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#pragma once
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/common/Dispatching.hpp>
class CapillaryPhys : public FrictPhys
{
=== modified file 'pkg/dem/CapillaryStressRecorder.cpp'
--- pkg/dem/CapillaryStressRecorder.cpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/CapillaryStressRecorder.cpp 2014-10-15 06:44:01 +0000
@@ -7,14 +7,14 @@
*************************************************************************/
#include "CapillaryStressRecorder.hpp"
-#include <yade/pkg/common/Sphere.hpp>
-#include <yade/pkg/common/ElastMat.hpp>
-#include <yade/pkg/dem/CapillaryPhys.hpp>
-#include <yade/pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp>
-#include <yade/pkg/dem/TriaxialCompressionEngine.hpp>
+#include <pkg/common/Sphere.hpp>
+#include <pkg/common/ElastMat.hpp>
+#include <pkg/dem/CapillaryPhys.hpp>
+#include <pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp>
+#include <pkg/dem/TriaxialCompressionEngine.hpp>
-#include <yade/core/Omega.hpp>
-#include <yade/core/Scene.hpp>
+#include <core/Omega.hpp>
+#include <core/Scene.hpp>
YADE_PLUGIN((CapillaryStressRecorder));
CREATE_LOGGER(CapillaryStressRecorder);
=== modified file 'pkg/dem/CapillaryStressRecorder.hpp'
--- pkg/dem/CapillaryStressRecorder.hpp 2011-01-21 08:14:28 +0000
+++ pkg/dem/CapillaryStressRecorder.hpp 2014-10-15 06:44:01 +0000
@@ -7,7 +7,7 @@
*************************************************************************/
#pragma once
-#include <yade/pkg/common/Recorder.hpp>
+#include <pkg/common/Recorder.hpp>
#include <string>
#include <fstream>
=== modified file 'pkg/dem/CapillaryTriaxialTest.cpp'
--- pkg/dem/CapillaryTriaxialTest.cpp 2014-07-19 19:52:41 +0000
+++ pkg/dem/CapillaryTriaxialTest.cpp 2014-10-15 06:44:01 +0000
@@ -9,36 +9,36 @@
*************************************************************************/
#include "CapillaryTriaxialTest.hpp"
-#include<yade/pkg/dem/ElasticContactLaw.hpp>
-#include <yade/pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp>
-#include<yade/pkg/dem/CapillaryPhys.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/dem/GlobalStiffnessTimeStepper.hpp>
-
-#include<yade/pkg/dem/TriaxialStressController.hpp>
-#include<yade/pkg/dem/TriaxialCompressionEngine.hpp>
-#include <yade/pkg/dem/TriaxialStateRecorder.hpp>
-#include <yade/pkg/dem/CapillaryStressRecorder.hpp>
-
-#include<yade/pkg/common/Aabb.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/InsertionSortCollider.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/Bo1_Aabb.hpp>
-
-#include<yade/pkg/common/GravityEngines.hpp>
-#include<yade/pkg/dem/NewtonIntegrator.hpp>
-
-#include<yade/core/Body.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
-#include<yade/pkg/dem/Ig2_Box_Sphere_ScGeom.hpp>
-
-#include<yade/pkg/common/ForceResetter.hpp>
-
-#include<yade/pkg/dem/Shop.hpp>
+#include<pkg/dem/ElasticContactLaw.hpp>
+#include <pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp>
+#include<pkg/dem/CapillaryPhys.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/dem/GlobalStiffnessTimeStepper.hpp>
+
+#include<pkg/dem/TriaxialStressController.hpp>
+#include<pkg/dem/TriaxialCompressionEngine.hpp>
+#include <pkg/dem/TriaxialStateRecorder.hpp>
+#include <pkg/dem/CapillaryStressRecorder.hpp>
+
+#include<pkg/common/Aabb.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/InsertionSortCollider.hpp>
+#include<core/Interaction.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/Bo1_Aabb.hpp>
+
+#include<pkg/common/GravityEngines.hpp>
+#include<pkg/dem/NewtonIntegrator.hpp>
+
+#include<core/Body.hpp>
+#include<pkg/common/Box.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
+#include<pkg/dem/Ig2_Box_Sphere_ScGeom.hpp>
+
+#include<pkg/common/ForceResetter.hpp>
+
+#include<pkg/dem/Shop.hpp>
#include <boost/numeric/conversion/bounds.hpp>
#include <boost/limits.hpp>
=== modified file 'pkg/dem/CapillaryTriaxialTest.hpp'
--- pkg/dem/CapillaryTriaxialTest.hpp 2013-05-30 20:17:45 +0000
+++ pkg/dem/CapillaryTriaxialTest.hpp 2014-10-15 06:44:01 +0000
@@ -10,8 +10,8 @@
#pragma once
-#include<yade/core/FileGenerator.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<core/FileGenerator.hpp>
+#include<lib/base/Math.hpp>
class ForceRecorder;
class AveragePositionRecorder;
=== modified file 'pkg/dem/CohesiveFrictionalContactLaw.cpp'
--- pkg/dem/CohesiveFrictionalContactLaw.cpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/CohesiveFrictionalContactLaw.cpp 2014-10-15 06:44:01 +0000
@@ -7,9 +7,9 @@
*************************************************************************/
#include "CohesiveFrictionalContactLaw.hpp"
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
YADE_PLUGIN((CohesiveFrictionalContactLaw)(Law2_ScGeom6D_CohFrictPhys_CohesionMoment)(CohFrictMat)(CohFrictPhys)(Ip2_CohFrictMat_CohFrictMat_CohFrictPhys));
CREATE_LOGGER(Law2_ScGeom6D_CohFrictPhys_CohesionMoment);
=== modified file 'pkg/dem/CohesiveFrictionalContactLaw.hpp'
--- pkg/dem/CohesiveFrictionalContactLaw.hpp 2014-09-17 16:40:57 +0000
+++ pkg/dem/CohesiveFrictionalContactLaw.hpp 2014-10-15 06:44:01 +0000
@@ -8,13 +8,13 @@
#pragma once
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
+#include<core/GlobalEngine.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/dem/ScGeom.hpp>
#include<boost/tuple/tuple.hpp>
-#include<yade/pkg/common/NormShearPhys.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
+#include<pkg/common/NormShearPhys.hpp>
+#include<pkg/dem/FrictPhys.hpp>
// The following code was moved from CohFrictMat.hpp
=== modified file 'pkg/dem/CohesiveTriaxialTest.cpp'
--- pkg/dem/CohesiveTriaxialTest.cpp 2014-07-19 19:52:41 +0000
+++ pkg/dem/CohesiveTriaxialTest.cpp 2014-10-15 06:44:01 +0000
@@ -8,32 +8,32 @@
#include "CohesiveTriaxialTest.hpp"
-#include<yade/pkg/dem/CohesiveFrictionalContactLaw.hpp>
-#include<yade/pkg/dem/GlobalStiffnessTimeStepper.hpp>
-
-#include<yade/pkg/dem/TriaxialStressController.hpp>
-#include<yade/pkg/dem/TriaxialCompressionEngine.hpp>
-#include <yade/pkg/dem/TriaxialStateRecorder.hpp>
-
-#include<yade/pkg/common/Aabb.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/InsertionSortCollider.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-
-#include<yade/pkg/common/GravityEngines.hpp>
-#include<yade/pkg/dem/NewtonIntegrator.hpp>
-#include<yade/pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
-#include<yade/pkg/dem/Ig2_Box_Sphere_ScGeom.hpp>
-
-#include<yade/core/Body.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Bo1_Aabb.hpp>
-
-#include<yade/pkg/common/ForceResetter.hpp>
-
-#include<yade/pkg/dem/Shop.hpp>
+#include<pkg/dem/CohesiveFrictionalContactLaw.hpp>
+#include<pkg/dem/GlobalStiffnessTimeStepper.hpp>
+
+#include<pkg/dem/TriaxialStressController.hpp>
+#include<pkg/dem/TriaxialCompressionEngine.hpp>
+#include <pkg/dem/TriaxialStateRecorder.hpp>
+
+#include<pkg/common/Aabb.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/InsertionSortCollider.hpp>
+#include<core/Interaction.hpp>
+#include<pkg/common/Dispatching.hpp>
+
+#include<pkg/common/GravityEngines.hpp>
+#include<pkg/dem/NewtonIntegrator.hpp>
+#include<pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
+#include<pkg/dem/Ig2_Box_Sphere_ScGeom.hpp>
+
+#include<core/Body.hpp>
+#include<pkg/common/Box.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Bo1_Aabb.hpp>
+
+#include<pkg/common/ForceResetter.hpp>
+
+#include<pkg/dem/Shop.hpp>
#include <boost/limits.hpp>
=== modified file 'pkg/dem/CohesiveTriaxialTest.hpp'
--- pkg/dem/CohesiveTriaxialTest.hpp 2011-01-21 08:14:28 +0000
+++ pkg/dem/CohesiveTriaxialTest.hpp 2014-10-15 06:44:01 +0000
@@ -8,8 +8,8 @@
#pragma once
-#include<yade/core/FileGenerator.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<core/FileGenerator.hpp>
+#include<lib/base/Math.hpp>
class TriaxialStressController;
class TriaxialCompressionEngine;
=== modified file 'pkg/dem/ConcretePM.cpp'
--- pkg/dem/ConcretePM.cpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/ConcretePM.cpp 2014-10-15 06:44:01 +0000
@@ -1,11 +1,11 @@
// 2007,2008 © Václav Šmilauer <eudoxos@xxxxxxxx>
#include"ConcretePM.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/pkg/dem/Shop.hpp>
-#include<yade/pkg/common/InteractionLoop.hpp>
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/pkg/common/Wall.hpp>
+#include<core/Scene.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<pkg/dem/Shop.hpp>
+#include<pkg/common/InteractionLoop.hpp>
+#include<pkg/common/Facet.hpp>
+#include<pkg/common/Wall.hpp>
YADE_PLUGIN((CpmState)(CpmMat)(Ip2_CpmMat_CpmMat_CpmPhys)(Ip2_FrictMat_CpmMat_FrictPhys)(CpmPhys)(Law2_ScGeom_CpmPhys_Cpm)
@@ -449,8 +449,8 @@
#ifdef YADE_OPENGL
/********************** Gl1_CpmPhys ****************************/
- #include<yade/lib/opengl/OpenGLWrapper.hpp>
- #include<yade/lib/opengl/GLUtils.hpp>
+ #include<lib/opengl/OpenGLWrapper.hpp>
+ #include<lib/opengl/GLUtils.hpp>
CREATE_LOGGER(Gl1_CpmPhys);
=== modified file 'pkg/dem/ConcretePM.hpp'
--- pkg/dem/ConcretePM.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/ConcretePM.hpp 2014-10-15 06:44:01 +0000
@@ -46,14 +46,14 @@
#pragma once
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/PeriodicEngines.hpp>
-#include<yade/pkg/common/NormShearPhys.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/PeriodicEngines.hpp>
+#include<pkg/common/NormShearPhys.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/dem/FrictPhys.hpp>
namespace py=boost::python;
@@ -302,7 +302,7 @@
*********************************************************************************/
#ifdef YADE_OPENGL
- #include<yade/pkg/common/GLDrawFunctors.hpp>
+ #include<pkg/common/GLDrawFunctors.hpp>
class Gl1_CpmPhys: public GlIPhysFunctor {
public: virtual void go(const shared_ptr<IPhys>&,const shared_ptr<Interaction>&,const shared_ptr<Body>&,const shared_ptr<Body>&,bool wireFrame);
virtual ~Gl1_CpmPhys() {};
=== modified file 'pkg/dem/DemXDofGeom.hpp'
--- pkg/dem/DemXDofGeom.hpp 2014-07-21 09:09:14 +0000
+++ pkg/dem/DemXDofGeom.hpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/core/IGeom.hpp>
+#include<core/IGeom.hpp>
/*! Abstract class that unites ScGeom and L3Geom,
created for the purposes of GlobalStiffnessTimeStepper.
=== modified file 'pkg/dem/Disp2DPropLoadEngine.cpp'
--- pkg/dem/Disp2DPropLoadEngine.cpp 2014-05-23 13:05:19 +0000
+++ pkg/dem/Disp2DPropLoadEngine.cpp 2014-10-15 06:44:01 +0000
@@ -8,10 +8,10 @@
#include "Disp2DPropLoadEngine.hpp"
-#include<yade/core/State.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<core/State.hpp>
+#include<pkg/common/Box.hpp>
+#include<core/Scene.hpp>
+#include<lib/base/Math.hpp>
YADE_PLUGIN((Disp2DPropLoadEngine));
=== modified file 'pkg/dem/Disp2DPropLoadEngine.hpp'
--- pkg/dem/Disp2DPropLoadEngine.hpp 2011-04-12 22:06:51 +0000
+++ pkg/dem/Disp2DPropLoadEngine.hpp 2014-10-15 06:44:01 +0000
@@ -8,9 +8,9 @@
#pragma once
-#include<yade/core/Omega.hpp>
-#include<yade/pkg/common/BoundaryController.hpp>
-#include<yade/core/Body.hpp>
+#include<core/Omega.hpp>
+#include<pkg/common/BoundaryController.hpp>
+#include<core/Body.hpp>
=== modified file 'pkg/dem/DomainLimiter.cpp'
--- pkg/dem/DomainLimiter.cpp 2014-07-23 09:11:35 +0000
+++ pkg/dem/DomainLimiter.cpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
-#include<yade/pkg/dem/DomainLimiter.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/pkg/dem/Shop.hpp>
+#include<pkg/dem/DomainLimiter.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<pkg/dem/Shop.hpp>
YADE_PLUGIN((DomainLimiter)(LawTester)
#ifdef YADE_OPENGL
@@ -28,12 +28,12 @@
}
}
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/dem/L3Geom.hpp>
-#include<yade/pkg/common/NormShearPhys.hpp>
-#include<yade/lib/smoothing/LinearInterpolate.hpp>
-#include<yade/lib/pyutil/gil.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/dem/L3Geom.hpp>
+#include<pkg/common/NormShearPhys.hpp>
+#include<lib/smoothing/LinearInterpolate.hpp>
+#include<lib/pyutil/gil.hpp>
CREATE_LOGGER(LawTester);
@@ -226,10 +226,10 @@
}
#ifdef YADE_OPENGL
-#include<yade/lib/opengl/OpenGLWrapper.hpp>
-#include<yade/lib/opengl/GLUtils.hpp>
-#include<yade/pkg/common/GLDrawFunctors.hpp>
-#include<yade/pkg/common/OpenGLRenderer.hpp>
+#include<lib/opengl/OpenGLWrapper.hpp>
+#include<lib/opengl/GLUtils.hpp>
+#include<pkg/common/GLDrawFunctors.hpp>
+#include<pkg/common/OpenGLRenderer.hpp>
#include<GL/glu.h>
CREATE_LOGGER(GlExtra_LawTester);
=== modified file 'pkg/dem/DomainLimiter.hpp'
--- pkg/dem/DomainLimiter.hpp 2013-03-07 18:28:01 +0000
+++ pkg/dem/DomainLimiter.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
-#include<yade/pkg/common/PeriodicEngines.hpp>
-#include<yade/core/PartialEngine.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<pkg/common/PeriodicEngines.hpp>
+#include<core/PartialEngine.hpp>
+#include<pkg/common/Sphere.hpp>
class DomainLimiter: public PeriodicEngine{
public:
@@ -67,7 +67,7 @@
REGISTER_SERIALIZABLE(LawTester);
#ifdef YADE_OPENGL
-#include<yade/pkg/common/OpenGLRenderer.hpp>
+#include<pkg/common/OpenGLRenderer.hpp>
class GlExtra_LawTester: public GlExtraDrawer{
public:
=== modified file 'pkg/dem/ElasticContactLaw.cpp'
--- pkg/dem/ElasticContactLaw.cpp 2014-07-19 14:26:26 +0000
+++ pkg/dem/ElasticContactLaw.cpp 2014-10-15 06:44:01 +0000
@@ -6,11 +6,11 @@
*************************************************************************/
#include"ElasticContactLaw.hpp"
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
YADE_PLUGIN((Law2_ScGeom_FrictPhys_CundallStrack)(Law2_ScGeom_ViscoFrictPhys_CundallStrack)(ElasticContactLaw));
=== modified file 'pkg/dem/ElasticContactLaw.hpp'
--- pkg/dem/ElasticContactLaw.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/ElasticContactLaw.hpp 2014-10-15 06:44:01 +0000
@@ -7,11 +7,11 @@
#pragma once
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/lib/base/openmp-accu.hpp>
+#include<core/GlobalEngine.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<lib/base/openmp-accu.hpp>
class Law2_ScGeom_FrictPhys_CundallStrack: public LawFunctor{
public:
=== modified file 'pkg/dem/FacetTopologyAnalyzer.cpp'
--- pkg/dem/FacetTopologyAnalyzer.cpp 2014-07-03 07:16:58 +0000
+++ pkg/dem/FacetTopologyAnalyzer.cpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
#include"FacetTopologyAnalyzer.hpp"
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/Body.hpp>
+#include<pkg/common/Facet.hpp>
+#include<core/Scene.hpp>
+#include<core/Body.hpp>
CREATE_LOGGER(FacetTopologyAnalyzer);
YADE_PLUGIN((FacetTopologyAnalyzer));
=== modified file 'pkg/dem/FacetTopologyAnalyzer.hpp'
--- pkg/dem/FacetTopologyAnalyzer.hpp 2010-10-13 16:23:08 +0000
+++ pkg/dem/FacetTopologyAnalyzer.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/core/Interaction.hpp>
+#include<core/GlobalEngine.hpp>
+#include<core/Interaction.hpp>
/*! Initializer for filling adjacency geometry data for facets.
*
* Common vertices and common edges are identified and mutual angle between facet faces
=== modified file 'pkg/dem/FlatGridCollider.cpp'
--- pkg/dem/FlatGridCollider.cpp 2014-07-01 18:14:18 +0000
+++ pkg/dem/FlatGridCollider.cpp 2014-10-15 06:44:01 +0000
@@ -1,10 +1,10 @@
// 2010 © Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/pkg/dem/FlatGridCollider.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/dem/FlatGridCollider.hpp>
+#include<core/Scene.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/dem/NewtonIntegrator.hpp>
-//#include<yade/pkg/common/Facet.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/dem/NewtonIntegrator.hpp>
+//#include<pkg/common/Facet.hpp>
YADE_PLUGIN((FlatGridCollider));
CREATE_LOGGER(FlatGridCollider);
=== modified file 'pkg/dem/FlatGridCollider.hpp'
--- pkg/dem/FlatGridCollider.hpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/FlatGridCollider.hpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/pkg/common/Collider.hpp>
+#include<pkg/common/Collider.hpp>
class NewtonIntegrator;
class FlatGridCollider: public Collider{
struct Grid{
=== modified file 'pkg/dem/ForceTorqueRecorder.hpp'
--- pkg/dem/ForceTorqueRecorder.hpp 2011-03-02 09:00:04 +0000
+++ pkg/dem/ForceTorqueRecorder.hpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
#pragma once
-#include <yade/pkg/common/Recorder.hpp>
-#include <yade/core/Scene.hpp>
+#include <pkg/common/Recorder.hpp>
+#include <core/Scene.hpp>
class ForceRecorder: public Recorder {
public:
=== modified file 'pkg/dem/FrictPhys.cpp'
--- pkg/dem/FrictPhys.cpp 2014-07-14 20:08:34 +0000
+++ pkg/dem/FrictPhys.cpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
#include "FrictPhys.hpp"
-#include <yade/pkg/dem/ScGeom.hpp>
+#include <pkg/dem/ScGeom.hpp>
YADE_PLUGIN((FrictPhys)(ViscoFrictPhys)(Ip2_FrictMat_FrictMat_ViscoFrictPhys)(Ip2_FrictMat_FrictMat_FrictPhys));
// The following code was moved from Ip2_FrictMat_FrictMat_FrictPhys.hpp
=== modified file 'pkg/dem/FrictPhys.hpp'
--- pkg/dem/FrictPhys.hpp 2014-07-14 20:08:34 +0000
+++ pkg/dem/FrictPhys.hpp 2014-10-15 06:44:01 +0000
@@ -7,10 +7,10 @@
*************************************************************************/
#pragma once
-#include<yade/pkg/common/NormShearPhys.hpp>
-#include<yade/pkg/common/MatchMaker.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
+#include<pkg/common/NormShearPhys.hpp>
+#include<pkg/common/MatchMaker.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/common/Dispatching.hpp>
class FrictPhys: public NormShearPhys
{
=== modified file 'pkg/dem/FrictViscoPM.cpp'
--- pkg/dem/FrictViscoPM.cpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/FrictViscoPM.cpp 2014-10-15 06:44:01 +0000
@@ -7,9 +7,9 @@
*************************************************************************/
#include"FrictViscoPM.hpp"
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
YADE_PLUGIN((FrictViscoMat)(FrictViscoPhys)(Ip2_FrictViscoMat_FrictViscoMat_FrictViscoPhys)(Ip2_FrictMat_FrictViscoMat_FrictViscoPhys)(Law2_ScGeom_FrictViscoPhys_CundallStrackVisco));
=== modified file 'pkg/dem/FrictViscoPM.hpp'
--- pkg/dem/FrictViscoPM.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/FrictViscoPM.hpp 2014-10-15 06:44:01 +0000
@@ -19,12 +19,12 @@
#pragma once
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/MatchMaker.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/lib/base/openmp-accu.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/MatchMaker.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<lib/base/openmp-accu.hpp>
/** This class holds information associated with each body */
class FrictViscoMat: public FrictMat {
=== modified file 'pkg/dem/GeneralIntegratorInsertionSortCollider.cpp'
--- pkg/dem/GeneralIntegratorInsertionSortCollider.cpp 2014-07-03 07:16:58 +0000
+++ pkg/dem/GeneralIntegratorInsertionSortCollider.cpp 2014-10-15 06:44:01 +0000
@@ -1,12 +1,12 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#include"GeneralIntegratorInsertionSortCollider.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/InteractionContainer.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/dem/Integrator.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<core/Scene.hpp>
+#include<core/Interaction.hpp>
+#include<core/InteractionContainer.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/dem/Integrator.hpp>
+#include<pkg/common/Sphere.hpp>
#include<algorithm>
#include<vector>
=== modified file 'pkg/dem/GeneralIntegratorInsertionSortCollider.hpp'
--- pkg/dem/GeneralIntegratorInsertionSortCollider.hpp 2014-02-17 14:31:35 +0000
+++ pkg/dem/GeneralIntegratorInsertionSortCollider.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
// 2014 Burak ER <burak.er@xxxxxxxxxx>
#pragma once
-#include<yade/pkg/common/InsertionSortCollider.hpp>
+#include<pkg/common/InsertionSortCollider.hpp>
/*!
=== modified file 'pkg/dem/GlobalStiffnessTimeStepper.cpp'
--- pkg/dem/GlobalStiffnessTimeStepper.cpp 2014-06-16 08:13:21 +0000
+++ pkg/dem/GlobalStiffnessTimeStepper.cpp 2014-10-15 06:44:01 +0000
@@ -7,14 +7,14 @@
*************************************************************************/
#include"GlobalStiffnessTimeStepper.hpp"
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/Clump.hpp>
-#include<yade/pkg/dem/Shop.hpp>
-#include<yade/pkg/dem/ViscoelasticPM.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<core/Interaction.hpp>
+#include<core/Scene.hpp>
+#include<core/Clump.hpp>
+#include<pkg/dem/Shop.hpp>
+#include<pkg/dem/ViscoelasticPM.hpp>
CREATE_LOGGER(GlobalStiffnessTimeStepper);
YADE_PLUGIN((GlobalStiffnessTimeStepper));
=== modified file 'pkg/dem/GlobalStiffnessTimeStepper.hpp'
--- pkg/dem/GlobalStiffnessTimeStepper.hpp 2013-09-27 15:51:12 +0000
+++ pkg/dem/GlobalStiffnessTimeStepper.hpp 2014-10-15 06:44:01 +0000
@@ -8,7 +8,7 @@
#pragma once
-#include<yade/core/TimeStepper.hpp>
+#include<core/TimeStepper.hpp>
/*! \brief Compute the critical timestep of the leap-frog scheme based on global stiffness of bodies
=== modified file 'pkg/dem/HertzMindlin.cpp'
--- pkg/dem/HertzMindlin.cpp 2014-07-25 16:12:46 +0000
+++ pkg/dem/HertzMindlin.cpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
// 2010 © Chiara Modenese <c.modenese@xxxxxxxxx>
#include"HertzMindlin.hpp"
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
YADE_PLUGIN(
(MindlinPhys)
=== modified file 'pkg/dem/HertzMindlin.hpp'
--- pkg/dem/HertzMindlin.hpp 2014-10-01 17:33:13 +0000
+++ pkg/dem/HertzMindlin.hpp 2014-10-15 06:44:01 +0000
@@ -10,16 +10,16 @@
#pragma once
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/common/PeriodicEngines.hpp>
-#include<yade/pkg/common/NormShearPhys.hpp>
-#include<yade/pkg/common/MatchMaker.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/common/PeriodicEngines.hpp>
+#include<pkg/common/NormShearPhys.hpp>
+#include<pkg/common/MatchMaker.hpp>
#include <boost/tuple/tuple.hpp>
-#include<yade/lib/base/openmp-accu.hpp>
+#include<lib/base/openmp-accu.hpp>
/******************** MindlinPhys *********************************/
=== modified file 'pkg/dem/Ig2_Box_Sphere_ScGeom.cpp'
--- pkg/dem/Ig2_Box_Sphere_ScGeom.cpp 2014-07-03 07:16:58 +0000
+++ pkg/dem/Ig2_Box_Sphere_ScGeom.cpp 2014-10-15 06:44:01 +0000
@@ -11,11 +11,11 @@
*************************************************************************/
#include"Ig2_Box_Sphere_ScGeom.hpp"
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Box.hpp>
+#include<core/Scene.hpp>
+#include<lib/base/Math.hpp>
=== modified file 'pkg/dem/Ig2_Box_Sphere_ScGeom.hpp'
--- pkg/dem/Ig2_Box_Sphere_ScGeom.hpp 2011-01-09 16:34:50 +0000
+++ pkg/dem/Ig2_Box_Sphere_ScGeom.hpp 2014-10-15 06:44:01 +0000
@@ -11,9 +11,9 @@
*************************************************************************/
#pragma once
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Box.hpp>
+#include<pkg/common/Dispatching.hpp>
class Ig2_Box_Sphere_ScGeom : public IGeomFunctor
=== modified file 'pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp'
--- pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp 2014-07-03 07:16:58 +0000
+++ pkg/dem/Ig2_Facet_Sphere_ScGeom.cpp 2014-10-15 06:44:01 +0000
@@ -7,13 +7,13 @@
*************************************************************************/
#include"Ig2_Facet_Sphere_ScGeom.hpp"
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/pkg/common/Wall.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/pkg/common/InteractionLoop.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Facet.hpp>
+#include<pkg/common/Wall.hpp>
+#include<core/Scene.hpp>
+#include<lib/base/Math.hpp>
+#include<pkg/common/InteractionLoop.hpp>
YADE_PLUGIN((Ig2_Facet_Sphere_ScGeom)(Ig2_Facet_Sphere_ScGeom6D)(Ig2_Wall_Sphere_ScGeom));
=== modified file 'pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp'
--- pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp 2013-04-25 11:35:51 +0000
+++ pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp 2014-10-15 06:44:01 +0000
@@ -8,11 +8,11 @@
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Wall.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/Facet.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Wall.hpp>
class Ig2_Facet_Sphere_ScGeom : public IGeomFunctor
{
=== modified file 'pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp'
--- pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp 2014-05-23 13:05:19 +0000
+++ pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp 2014-10-15 06:44:01 +0000
@@ -3,12 +3,12 @@
// © 2008 Václav Šmilauer <eudoxos@xxxxxxxx>
#include"Ig2_Sphere_Sphere_ScGeom.hpp"
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/pkg/common/InteractionLoop.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<core/Scene.hpp>
+#include<lib/base/Math.hpp>
+#include<core/Omega.hpp>
+#include<pkg/common/InteractionLoop.hpp>
bool Ig2_Sphere_Sphere_ScGeom::go( const shared_ptr<Shape>& cm1, const shared_ptr<Shape>& cm2, const State& state1, const State& state2, const Vector3r& shift2, const bool& force, const shared_ptr<Interaction>& c)
{
=== modified file 'pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp'
--- pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp 2012-11-22 14:32:53 +0000
+++ pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp 2014-10-15 06:44:01 +0000
@@ -4,8 +4,8 @@
#pragma once
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/Sphere.hpp>
class Ig2_Sphere_Sphere_ScGeom: public IGeomFunctor{
public:
=== modified file 'pkg/dem/InelastCohFrictPM.hpp'
--- pkg/dem/InelastCohFrictPM.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/InelastCohFrictPM.hpp 2014-10-15 06:44:01 +0000
@@ -8,9 +8,9 @@
#pragma once
-#include <yade/pkg/common/ElastMat.hpp>
-#include <yade/pkg/dem/ScGeom.hpp>
-#include <yade/pkg/dem/FrictPhys.hpp>
+#include <pkg/common/ElastMat.hpp>
+#include <pkg/dem/ScGeom.hpp>
+#include <pkg/dem/FrictPhys.hpp>
#include "CohesiveFrictionalContactLaw.hpp"
class InelastCohFrictMat : public FrictMat
=== modified file 'pkg/dem/Integrator.cpp'
--- pkg/dem/Integrator.cpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/Integrator.cpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
-#include<yade/core/Clump.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/dem/Integrator.hpp>
+#include<core/Clump.hpp>
+#include<core/Scene.hpp>
+#include<pkg/dem/Integrator.hpp>
#ifdef YADE_OPENMP
#include<omp.h>
=== modified file 'pkg/dem/Integrator.hpp'
--- pkg/dem/Integrator.hpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/Integrator.hpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
#pragma once
-#include<yade/core/TimeStepper.hpp>
+#include<core/TimeStepper.hpp>
class Integrator;
=== modified file 'pkg/dem/Ip2_ElastMat.cpp'
--- pkg/dem/Ip2_ElastMat.cpp 2014-07-14 20:08:34 +0000
+++ pkg/dem/Ip2_ElastMat.cpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
#include "Ip2_ElastMat.hpp"
-#include <yade/pkg/common/NormShearPhys.hpp>
-#include <yade/pkg/dem/DemXDofGeom.hpp>
+#include <pkg/common/NormShearPhys.hpp>
+#include <pkg/dem/DemXDofGeom.hpp>
YADE_PLUGIN((Ip2_ElastMat_ElastMat_NormPhys)(Ip2_ElastMat_ElastMat_NormShearPhys));
=== modified file 'pkg/dem/Ip2_ElastMat.hpp'
--- pkg/dem/Ip2_ElastMat.hpp 2013-09-08 11:12:42 +0000
+++ pkg/dem/Ip2_ElastMat.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/MatchMaker.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/MatchMaker.hpp>
+#include<pkg/common/ElastMat.hpp>
class Ip2_ElastMat_ElastMat_NormPhys: public IPhysFunctor{
public:
=== modified file 'pkg/dem/JointedCohesiveFrictionalPM.cpp'
--- pkg/dem/JointedCohesiveFrictionalPM.cpp 2014-10-09 21:03:29 +0000
+++ pkg/dem/JointedCohesiveFrictionalPM.cpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
/* LucScholtes2010 */
#include"JointedCohesiveFrictionalPM.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<core/Omega.hpp>
YADE_PLUGIN((JCFpmMat)(JCFpmState)(JCFpmPhys)(Ip2_JCFpmMat_JCFpmMat_JCFpmPhys)(Law2_ScGeom_JCFpmPhys_JointedCohesiveFrictionalPM));
=== modified file 'pkg/dem/JointedCohesiveFrictionalPM.hpp'
--- pkg/dem/JointedCohesiveFrictionalPM.hpp 2014-10-14 17:59:23 +0000
+++ pkg/dem/JointedCohesiveFrictionalPM.hpp 2014-10-15 06:44:01 +0000
@@ -2,10 +2,10 @@
#pragma once
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/NormShearPhys.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/NormShearPhys.hpp>
+#include<pkg/dem/ScGeom.hpp>
/** This class holds information associated with each body state*/
class JCFpmState: public State {
=== modified file 'pkg/dem/KinemC__Engine.cpp'
--- pkg/dem/KinemC__Engine.cpp 2014-07-14 20:08:34 +0000
+++ pkg/dem/KinemC__Engine.cpp 2014-10-15 06:44:01 +0000
@@ -6,7 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
-#include<yade/pkg/dem/KinemC__Engine.hpp>
+#include<pkg/dem/KinemC__Engine.hpp>
YADE_PLUGIN((KinemCTDEngine)(KinemCNDEngine)(KinemCNLEngine)(KinemCNSEngine));
=== modified file 'pkg/dem/KinemC__Engine.hpp'
--- pkg/dem/KinemC__Engine.hpp 2014-07-14 20:08:34 +0000
+++ pkg/dem/KinemC__Engine.hpp 2014-10-15 06:44:01 +0000
@@ -8,7 +8,7 @@
#pragma once
-#include<yade/pkg/dem/KinemSimpleShearBox.hpp>
+#include<pkg/dem/KinemSimpleShearBox.hpp>
class KinemCTDEngine : public KinemSimpleShearBox
{
=== modified file 'pkg/dem/KinemSimpleShearBox.cpp'
--- pkg/dem/KinemSimpleShearBox.cpp 2014-07-03 07:16:58 +0000
+++ pkg/dem/KinemSimpleShearBox.cpp 2014-10-15 06:44:01 +0000
@@ -6,11 +6,11 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
-#include<yade/pkg/dem/KinemSimpleShearBox.hpp>
+#include<pkg/dem/KinemSimpleShearBox.hpp>
-#include<yade/core/State.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/common/Box.hpp>
+#include<core/State.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/common/Box.hpp>
YADE_PLUGIN((KinemSimpleShearBox))
=== modified file 'pkg/dem/KinemSimpleShearBox.hpp'
--- pkg/dem/KinemSimpleShearBox.hpp 2011-05-12 15:13:50 +0000
+++ pkg/dem/KinemSimpleShearBox.hpp 2014-10-15 06:44:01 +0000
@@ -8,10 +8,10 @@
#pragma once
-#include<yade/pkg/common/BoundaryController.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/lib/base/Math.hpp>
-#include <yade/core/Scene.hpp>
+#include<pkg/common/BoundaryController.hpp>
+#include<core/Body.hpp>
+#include<lib/base/Math.hpp>
+#include <core/Scene.hpp>
=== modified file 'pkg/dem/L3Geom.cpp'
--- pkg/dem/L3Geom.cpp 2014-07-25 16:12:46 +0000
+++ pkg/dem/L3Geom.cpp 2014-10-15 06:44:01 +0000
@@ -1,12 +1,12 @@
-#include<yade/pkg/dem/L3Geom.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Wall.hpp>
-#include<yade/pkg/common/Facet.hpp>
+#include<pkg/dem/L3Geom.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Wall.hpp>
+#include<pkg/common/Facet.hpp>
#ifdef YADE_OPENGL
- #include<yade/lib/opengl/OpenGLWrapper.hpp>
- #include<yade/lib/opengl/GLUtils.hpp>
+ #include<lib/opengl/OpenGLWrapper.hpp>
+ #include<lib/opengl/GLUtils.hpp>
#include<GL/glu.h>
#endif
=== modified file 'pkg/dem/L3Geom.hpp'
--- pkg/dem/L3Geom.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/L3Geom.hpp 2014-10-15 06:44:01 +0000
@@ -1,17 +1,17 @@
#pragma once
-#include<yade/core/IGeom.hpp>
-#include<yade/core/IPhys.hpp>
-#include<yade/core/Shape.hpp>
-#include<yade/core/State.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/pkg/common/Wall.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
+#include<core/IGeom.hpp>
+#include<core/IPhys.hpp>
+#include<core/Shape.hpp>
+#include<core/State.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Facet.hpp>
+#include<pkg/common/Wall.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<pkg/dem/FrictPhys.hpp>
#ifdef YADE_OPENGL
- #include<yade/pkg/common/GLDrawFunctors.hpp>
+ #include<pkg/common/GLDrawFunctors.hpp>
#endif
/*
=== modified file 'pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp'
--- pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp 2014-07-14 20:08:33 +0000
+++ pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp 2014-10-15 06:44:01 +0000
@@ -12,14 +12,14 @@
//FIXME : needs "requestErase" somewhere
#include "Law2_ScGeom_CapillaryPhys_Capillarity.hpp"
-#include <yade/pkg/common/ElastMat.hpp>
-#include <yade/pkg/dem/ScGeom.hpp>
+#include <pkg/common/ElastMat.hpp>
+#include <pkg/dem/ScGeom.hpp>
-#include <yade/pkg/dem/CapillaryPhys.hpp>
-#include <yade/pkg/dem/HertzMindlin.hpp>
-#include <yade/core/Omega.hpp>
-#include <yade/core/Scene.hpp>
-#include <yade/lib/base/Math.hpp>
+#include <pkg/dem/CapillaryPhys.hpp>
+#include <pkg/dem/HertzMindlin.hpp>
+#include <core/Omega.hpp>
+#include <core/Scene.hpp>
+#include <lib/base/Math.hpp>
YADE_PLUGIN((Law2_ScGeom_CapillaryPhys_Capillarity));
=== modified file 'pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp'
--- pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp 2014-10-01 17:33:13 +0000
+++ pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp 2014-10-15 06:44:01 +0000
@@ -10,7 +10,7 @@
#pragma once
-#include <yade/core/GlobalEngine.hpp>
+#include <core/GlobalEngine.hpp>
/**
This law allows one to take into account capillary forces/effects between spheres coming from the presence of interparticular liquid bridges (menisci).
=== modified file 'pkg/dem/LudingPM.cpp'
--- pkg/dem/LudingPM.cpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/LudingPM.cpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
#include"LudingPM.hpp"
-#include<yade/core/State.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<core/State.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/Sphere.hpp>
YADE_PLUGIN((LudingMat)(LudingPhys)(Ip2_LudingMat_LudingMat_LudingPhys)(Law2_ScGeom_LudingPhys_Basic));
=== modified file 'pkg/dem/LudingPM.hpp'
--- pkg/dem/LudingPM.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/LudingPM.hpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
#pragma once
-#include<yade/core/Material.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
+#include<core/Material.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/dem/ScGeom.hpp>
class LudingMat : public Material {
=== modified file 'pkg/dem/MicroMacroAnalyser.cpp'
--- pkg/dem/MicroMacroAnalyser.cpp 2014-03-21 18:47:45 +0000
+++ pkg/dem/MicroMacroAnalyser.cpp 2014-10-15 06:44:01 +0000
@@ -7,19 +7,19 @@
*************************************************************************/
#ifdef YADE_CGAL
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
-#include <yade/pkg/common/Sphere.hpp>
-#include<yade/lib/triangulation/KinematicLocalisationAnalyser.hpp>
-#include<yade/lib/triangulation/TriaxialState.h>
-#include <yade/lib/triangulation/Tenseur3.h>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
+#include <pkg/common/Sphere.hpp>
+#include<lib/triangulation/KinematicLocalisationAnalyser.hpp>
+#include<lib/triangulation/TriaxialState.h>
+#include <lib/triangulation/Tenseur3.h>
#include<boost/iostreams/filtering_stream.hpp>
#include<boost/iostreams/filter/bzip2.hpp>
#include<boost/iostreams/device/file.hpp>
-#include<yade/pkg/dem/TriaxialCompressionEngine.hpp>
+#include<pkg/dem/TriaxialCompressionEngine.hpp>
#include "MicroMacroAnalyser.hpp"
YADE_PLUGIN((MicroMacroAnalyser));
=== modified file 'pkg/dem/MicroMacroAnalyser.hpp'
--- pkg/dem/MicroMacroAnalyser.hpp 2014-07-14 20:08:34 +0000
+++ pkg/dem/MicroMacroAnalyser.hpp 2014-10-15 06:44:01 +0000
@@ -8,8 +8,8 @@
#pragma once
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/lib/triangulation/KinematicLocalisationAnalyser.hpp>
+#include<core/GlobalEngine.hpp>
+#include<lib/triangulation/KinematicLocalisationAnalyser.hpp>
/*! \brief compute fabric tensor, local porosity, local deformation, and other micromechanicaly defined quantities based on triangulation/tesselation of the packing.
=== modified file 'pkg/dem/NewtonIntegrator.cpp'
--- pkg/dem/NewtonIntegrator.cpp 2014-10-08 05:24:38 +0000
+++ pkg/dem/NewtonIntegrator.cpp 2014-10-15 06:44:01 +0000
@@ -6,10 +6,10 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
-#include<yade/pkg/dem/NewtonIntegrator.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/Clump.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<pkg/dem/NewtonIntegrator.hpp>
+#include<core/Scene.hpp>
+#include<core/Clump.hpp>
+#include<lib/base/Math.hpp>
YADE_PLUGIN((NewtonIntegrator));
=== modified file 'pkg/dem/NewtonIntegrator.hpp'
--- pkg/dem/NewtonIntegrator.hpp 2014-05-15 14:47:33 +0000
+++ pkg/dem/NewtonIntegrator.hpp 2014-10-15 06:44:01 +0000
@@ -7,11 +7,11 @@
*************************************************************************/
#pragma once
-#include<yade/pkg/common/FieldApplier.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/pkg/common/Callbacks.hpp>
-#include<yade/pkg/dem/GlobalStiffnessTimeStepper.hpp>
+#include<pkg/common/FieldApplier.hpp>
+#include<core/Interaction.hpp>
+#include<lib/base/Math.hpp>
+#include<pkg/common/Callbacks.hpp>
+#include<pkg/dem/GlobalStiffnessTimeStepper.hpp>
#ifdef YADE_OPENMP
#include<omp.h>
=== modified file 'pkg/dem/NormalInelasticPM.cpp'
--- pkg/dem/NormalInelasticPM.cpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/NormalInelasticPM.cpp 2014-10-15 06:44:01 +0000
@@ -7,9 +7,9 @@
*************************************************************************/
#include "NormalInelasticPM.hpp"
-#include <yade/pkg/dem/ScGeom.hpp>
-#include <yade/core/Omega.hpp>
-#include <yade/core/Scene.hpp>
+#include <pkg/dem/ScGeom.hpp>
+#include <core/Omega.hpp>
+#include <core/Scene.hpp>
YADE_PLUGIN((NormalInelasticMat)(NormalInelasticityPhys)(Law2_ScGeom6D_NormalInelasticityPhys_NormalInelasticity)(Ip2_2xNormalInelasticMat_NormalInelasticityPhys));
=== modified file 'pkg/dem/NormalInelasticPM.hpp'
--- pkg/dem/NormalInelasticPM.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/NormalInelasticPM.hpp 2014-10-15 06:44:01 +0000
@@ -7,10 +7,10 @@
#pragma once
-#include <yade/pkg/common/ElastMat.hpp>
-#include <yade/pkg/dem/FrictPhys.hpp>
-#include <yade/pkg/common/Dispatching.hpp>
-#include <yade/pkg/dem/ScGeom.hpp>
+#include <pkg/common/ElastMat.hpp>
+#include <pkg/dem/FrictPhys.hpp>
+#include <pkg/common/Dispatching.hpp>
+#include <pkg/dem/ScGeom.hpp>
class NormalInelasticMat : public FrictMat
{
=== modified file 'pkg/dem/PeriIsoCompressor.cpp'
--- pkg/dem/PeriIsoCompressor.cpp 2014-07-03 07:16:58 +0000
+++ pkg/dem/PeriIsoCompressor.cpp 2014-10-15 06:44:01 +0000
@@ -1,12 +1,12 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/pkg/dem/PeriIsoCompressor.hpp>
-#include<yade/pkg/dem/Shop.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/NormShearPhys.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/lib/pyutil/gil.hpp>
+#include<pkg/dem/PeriIsoCompressor.hpp>
+#include<pkg/dem/Shop.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/NormShearPhys.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<lib/pyutil/gil.hpp>
YADE_PLUGIN((PeriIsoCompressor)(PeriTriaxController)(Peri3dController))
=== modified file 'pkg/dem/PeriIsoCompressor.hpp'
--- pkg/dem/PeriIsoCompressor.hpp 2014-07-21 09:09:14 +0000
+++ pkg/dem/PeriIsoCompressor.hpp 2014-10-15 06:44:01 +0000
@@ -2,7 +2,7 @@
#pragma once
-#include<yade/pkg/common/BoundaryController.hpp>
+#include<pkg/common/BoundaryController.hpp>
class PeriIsoCompressor: public BoundaryController{
Real avgStiffness; Real maxDisplPerStep; Vector3r sumForces, sigma;
=== modified file 'pkg/dem/Polyhedra.cpp'
--- pkg/dem/Polyhedra.cpp 2014-09-22 12:28:50 +0000
+++ pkg/dem/Polyhedra.cpp 2014-10-15 06:44:01 +0000
@@ -3,12 +3,12 @@
#ifdef YADE_CGAL
-#include<yade/core/Interaction.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/State.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/common/Aabb.hpp>
+#include<core/Interaction.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<core/State.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/common/Aabb.hpp>
#include"Polyhedra.hpp"
#define _USE_MATH_DEFINES
@@ -256,7 +256,7 @@
/* Plotting */
#ifdef YADE_OPENGL
- #include<yade/lib/opengl/OpenGLWrapper.hpp>
+ #include<lib/opengl/OpenGLWrapper.hpp>
bool Gl1_Polyhedra::wire;
void Gl1_Polyhedra::go(const shared_ptr<Shape>& cm, const shared_ptr<State>&,bool wire2,const GLViewInfo&)
{
=== modified file 'pkg/dem/Polyhedra.hpp'
--- pkg/dem/Polyhedra.hpp 2014-09-22 12:28:50 +0000
+++ pkg/dem/Polyhedra.hpp 2014-10-15 06:44:01 +0000
@@ -6,16 +6,16 @@
#ifdef YADE_CGAL
-#include<yade/core/Shape.hpp>
-#include<yade/core/IGeom.hpp>
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/core/Material.hpp>
-#include<yade/pkg/common/Aabb.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/common/Wall.hpp>
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/lib/base/openmp-accu.hpp>
+#include<core/Shape.hpp>
+#include<core/IGeom.hpp>
+#include<core/GlobalEngine.hpp>
+#include<core/Material.hpp>
+#include<pkg/common/Aabb.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/common/Wall.hpp>
+#include<pkg/common/Facet.hpp>
+#include<lib/base/openmp-accu.hpp>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Delaunay_triangulation_3.h>
@@ -180,11 +180,11 @@
//***************************************************************************
#ifdef YADE_OPENGL
- #include<yade/pkg/common/GLDrawFunctors.hpp>
- #include<yade/lib/opengl/OpenGLWrapper.hpp>
- #include<yade/lib/opengl/GLUtils.hpp>
+ #include<pkg/common/GLDrawFunctors.hpp>
+ #include<lib/opengl/OpenGLWrapper.hpp>
+ #include<lib/opengl/GLUtils.hpp>
#include<GL/glu.h>
- #include<yade/pkg/dem/Shop.hpp>
+ #include<pkg/dem/Shop.hpp>
/*! Draw Polyhedra using OpenGL */
class Gl1_Polyhedra: public GlShapeFunctor{
=== modified file 'pkg/dem/Polyhedra_Ig2.hpp'
--- pkg/dem/Polyhedra_Ig2.hpp 2014-09-22 12:28:50 +0000
+++ pkg/dem/Polyhedra_Ig2.hpp 2014-10-15 06:44:01 +0000
@@ -4,7 +4,7 @@
#ifdef YADE_CGAL
#include"Polyhedra.hpp"
-#include<yade/pkg/common/Sphere.hpp>
+#include<pkg/common/Sphere.hpp>
//***************************************************************************
/*! Create Polyhedra (collision geometry) from colliding Polyhedras. */
=== modified file 'pkg/dem/Polyhedra_splitter.cpp'
--- pkg/dem/Polyhedra_splitter.cpp 2014-07-01 18:14:18 +0000
+++ pkg/dem/Polyhedra_splitter.cpp 2014-10-15 06:44:01 +0000
@@ -3,7 +3,7 @@
#ifdef YADE_CGAL
-#include<yade/pkg/dem/Polyhedra_splitter.hpp>
+#include<pkg/dem/Polyhedra_splitter.hpp>
YADE_PLUGIN((PolyhedraSplitter));
=== modified file 'pkg/dem/Polyhedra_splitter.hpp'
--- pkg/dem/Polyhedra_splitter.hpp 2013-10-16 15:24:49 +0000
+++ pkg/dem/Polyhedra_splitter.hpp 2014-10-15 06:44:01 +0000
@@ -6,8 +6,8 @@
#ifdef YADE_CGAL
-#include<yade/pkg/common/PeriodicEngines.hpp>
-#include<yade/core/Interaction.hpp>
+#include<pkg/common/PeriodicEngines.hpp>
+#include<core/Interaction.hpp>
#include"Polyhedra.hpp"
=== modified file 'pkg/dem/RungeKuttaCashKarp54Integrator.cpp'
--- pkg/dem/RungeKuttaCashKarp54Integrator.cpp 2014-05-23 13:05:19 +0000
+++ pkg/dem/RungeKuttaCashKarp54Integrator.cpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
#ifdef YADE_ODEINT
-#include<yade/pkg/dem/RungeKuttaCashKarp54Integrator.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/dem/RungeKuttaCashKarp54Integrator.hpp>
+#include<core/Scene.hpp>
YADE_PLUGIN((RungeKuttaCashKarp54Integrator));
=== modified file 'pkg/dem/RungeKuttaCashKarp54Integrator.hpp'
--- pkg/dem/RungeKuttaCashKarp54Integrator.hpp 2014-05-23 13:05:19 +0000
+++ pkg/dem/RungeKuttaCashKarp54Integrator.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
#ifdef YADE_ODEINT
#pragma once
-#include <yade/core/Scene.hpp>
-#include<yade/pkg/dem/Integrator.hpp>
+#include <core/Scene.hpp>
+#include<pkg/dem/Integrator.hpp>
#include<boost/numeric/odeint.hpp>
=== modified file 'pkg/dem/STLImporter.cpp'
--- pkg/dem/STLImporter.cpp 2010-11-07 11:46:20 +0000
+++ pkg/dem/STLImporter.cpp 2014-10-15 06:44:01 +0000
@@ -6,8 +6,8 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#include"STLImporter.hpp"
-#include<yade/pkg/dem/Shop.hpp>
-#include<yade/lib/import/STLReader.hpp>
+#include<pkg/dem/Shop.hpp>
+#include<lib/import/STLReader.hpp>
CREATE_LOGGER(STLImporter);
=== modified file 'pkg/dem/STLImporter.hpp'
--- pkg/dem/STLImporter.hpp 2010-11-07 11:46:20 +0000
+++ pkg/dem/STLImporter.hpp 2014-10-15 06:44:01 +0000
@@ -6,9 +6,9 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#pragma once
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/core/BodyContainer.hpp>
+#include<pkg/common/Facet.hpp>
+#include<core/Body.hpp>
+#include<core/BodyContainer.hpp>
class STLImporter {
=== modified file 'pkg/dem/SampleCapillaryPressureEngine.cpp'
--- pkg/dem/SampleCapillaryPressureEngine.cpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/SampleCapillaryPressureEngine.cpp 2014-10-15 06:44:01 +0000
@@ -9,11 +9,11 @@
*************************************************************************/
#include "SampleCapillaryPressureEngine.hpp"
-#include <yade/pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/lib/base/Math.hpp>
+#include <pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp>
+#include<core/Scene.hpp>
+#include<core/Omega.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<lib/base/Math.hpp>
YADE_PLUGIN((SampleCapillaryPressureEngine));
CREATE_LOGGER(SampleCapillaryPressureEngine);
=== modified file 'pkg/dem/SampleCapillaryPressureEngine.hpp'
--- pkg/dem/SampleCapillaryPressureEngine.hpp 2013-02-07 18:12:42 +0000
+++ pkg/dem/SampleCapillaryPressureEngine.hpp 2014-10-15 06:44:01 +0000
@@ -10,9 +10,9 @@
#ifndef SAMPLE_CAPILLARY_PRESSURE_ENGINE_HPP
#define SAMPLE_CAPILLARY_PRESSURE_ENGINE_HPP
-#include<yade/core/PartialEngine.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/pkg/dem/TriaxialStressController.hpp>
+#include<core/PartialEngine.hpp>
+#include<lib/base/Math.hpp>
+#include<pkg/dem/TriaxialStressController.hpp>
#include <string>
/*! \brief Isotropic compression + suction variation test */
=== modified file 'pkg/dem/ScGeom.cpp'
--- pkg/dem/ScGeom.cpp 2012-10-09 09:09:02 +0000
+++ pkg/dem/ScGeom.cpp 2014-10-15 06:44:01 +0000
@@ -3,9 +3,9 @@
// © 2008 Václav Šmilauer <eudoxos@xxxxxxxx>
// © 2006 Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
YADE_PLUGIN((ScGeom)(ScGeom6D)(ChCylGeom6D));
ScGeom::~ScGeom(){};
=== modified file 'pkg/dem/ScGeom.hpp'
--- pkg/dem/ScGeom.hpp 2014-05-23 13:05:19 +0000
+++ pkg/dem/ScGeom.hpp 2014-10-15 06:44:01 +0000
@@ -3,11 +3,11 @@
// © 2006 Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
#pragma once
-#include<yade/core/Interaction.hpp>
-#include<yade/core/IGeom.hpp>
-#include<yade/core/State.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
+#include<core/Interaction.hpp>
+#include<core/IGeom.hpp>
+#include<core/State.hpp>
+#include<lib/base/Math.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
/*! Class representing geometry of two bodies in contact.
*
* The code under SCG_SHEAR is experimental and is used only if ElasticContactLaw::useShear is explicitly true
=== modified file 'pkg/dem/Shop.hpp'
--- pkg/dem/Shop.hpp 2014-10-14 15:52:06 +0000
+++ pkg/dem/Shop.hpp 2014-10-15 06:44:01 +0000
@@ -4,9 +4,9 @@
#include<boost/lambda/lambda.hpp>
-#include "yade/lib/base/Math.hpp"
-#include "yade/lib/base/Logging.hpp"
-#include "yade/core/Body.hpp"
+#include "lib/base/Math.hpp"
+#include "lib/base/Logging.hpp"
+#include "core/Body.hpp"
#include<boost/function.hpp>
=== modified file 'pkg/dem/Shop_01.cpp'
--- pkg/dem/Shop_01.cpp 2014-10-14 15:52:06 +0000
+++ pkg/dem/Shop_01.cpp 2014-10-15 06:44:01 +0000
@@ -2,47 +2,47 @@
#include"Shop.hpp"
#include<boost/tokenizer.hpp>
-#include"yade/core/Scene.hpp"
-#include"yade/core/Body.hpp"
-#include"yade/core/Interaction.hpp"
-
-#include"yade/pkg/common/Aabb.hpp"
-#include"yade/core/Clump.hpp"
-#include"yade/pkg/common/InsertionSortCollider.hpp"
-
-#include"yade/pkg/common/Box.hpp"
-#include"yade/pkg/common/Sphere.hpp"
-#include"yade/pkg/common/ElastMat.hpp"
-#include"yade/pkg/dem/ViscoelasticPM.hpp"
-#include"yade/pkg/dem/CapillaryPhys.hpp"
-
-#include"yade/pkg/common/Bo1_Aabb.hpp"
-#include"yade/pkg/dem/NewtonIntegrator.hpp"
-#include"yade/pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp"
-#include"yade/pkg/dem/Ig2_Box_Sphere_ScGeom.hpp"
-#include"yade/pkg/dem/FrictPhys.hpp"
-
-#include"yade/pkg/common/ForceResetter.hpp"
-
-#include"yade/pkg/common/Dispatching.hpp"
-#include"yade/pkg/common/InteractionLoop.hpp"
-#include"yade/pkg/common/GravityEngines.hpp"
-
-#include"yade/pkg/dem/GlobalStiffnessTimeStepper.hpp"
-#include"yade/pkg/dem/ElasticContactLaw.hpp"
-
-#include"yade/pkg/dem/ScGeom.hpp"
-#include"yade/pkg/dem/FrictPhys.hpp"
-
-#include"yade/pkg/common/Grid.hpp"
-
-#include"yade/pkg/dem/Tetra.hpp"
+#include"core/Scene.hpp"
+#include"core/Body.hpp"
+#include"core/Interaction.hpp"
+
+#include"pkg/common/Aabb.hpp"
+#include"core/Clump.hpp"
+#include"pkg/common/InsertionSortCollider.hpp"
+
+#include"pkg/common/Box.hpp"
+#include"pkg/common/Sphere.hpp"
+#include"pkg/common/ElastMat.hpp"
+#include"pkg/dem/ViscoelasticPM.hpp"
+#include"pkg/dem/CapillaryPhys.hpp"
+
+#include"pkg/common/Bo1_Aabb.hpp"
+#include"pkg/dem/NewtonIntegrator.hpp"
+#include"pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp"
+#include"pkg/dem/Ig2_Box_Sphere_ScGeom.hpp"
+#include"pkg/dem/FrictPhys.hpp"
+
+#include"pkg/common/ForceResetter.hpp"
+
+#include"pkg/common/Dispatching.hpp"
+#include"pkg/common/InteractionLoop.hpp"
+#include"pkg/common/GravityEngines.hpp"
+
+#include"pkg/dem/GlobalStiffnessTimeStepper.hpp"
+#include"pkg/dem/ElasticContactLaw.hpp"
+
+#include"pkg/dem/ScGeom.hpp"
+#include"pkg/dem/FrictPhys.hpp"
+
+#include"pkg/common/Grid.hpp"
+
+#include"pkg/dem/Tetra.hpp"
#ifdef YADE_OPENGL
- #include"yade/pkg/common/Gl1_NormPhys.hpp"
+ #include"pkg/common/Gl1_NormPhys.hpp"
#endif
-#include "yade/py/_utils.hpp"
+#include "py/_utils.hpp"
CREATE_LOGGER(Shop);
=== modified file 'pkg/dem/Shop_02.cpp'
--- pkg/dem/Shop_02.cpp 2014-10-14 17:28:52 +0000
+++ pkg/dem/Shop_02.cpp 2014-10-15 06:44:01 +0000
@@ -1,45 +1,45 @@
// 2007 © Václav Šmilauer <eudoxos@xxxxxxxx>
#include"Shop.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/core/Interaction.hpp>
-
-#include<yade/pkg/common/Aabb.hpp>
-#include<yade/core/Clump.hpp>
-#include<yade/pkg/common/InsertionSortCollider.hpp>
-
-#include<yade/pkg/common/Box.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/dem/ViscoelasticPM.hpp>
-#include<yade/pkg/dem/CapillaryPhys.hpp>
-
-#include<yade/pkg/common/Bo1_Aabb.hpp>
-#include<yade/pkg/dem/NewtonIntegrator.hpp>
-#include<yade/pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
-#include<yade/pkg/dem/Ig2_Box_Sphere_ScGeom.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-
-#include<yade/pkg/common/ForceResetter.hpp>
-
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/InteractionLoop.hpp>
-#include<yade/pkg/common/GravityEngines.hpp>
-
-#include<yade/pkg/dem/GlobalStiffnessTimeStepper.hpp>
-#include<yade/pkg/dem/ElasticContactLaw.hpp>
-
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/dem/HertzMindlin.hpp>
-
-#include<yade/pkg/common/Grid.hpp>
-
-#include<yade/pkg/dem/Tetra.hpp>
+#include<core/Scene.hpp>
+#include<core/Body.hpp>
+#include<core/Interaction.hpp>
+
+#include<pkg/common/Aabb.hpp>
+#include<core/Clump.hpp>
+#include<pkg/common/InsertionSortCollider.hpp>
+
+#include<pkg/common/Box.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/dem/ViscoelasticPM.hpp>
+#include<pkg/dem/CapillaryPhys.hpp>
+
+#include<pkg/common/Bo1_Aabb.hpp>
+#include<pkg/dem/NewtonIntegrator.hpp>
+#include<pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
+#include<pkg/dem/Ig2_Box_Sphere_ScGeom.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+
+#include<pkg/common/ForceResetter.hpp>
+
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/InteractionLoop.hpp>
+#include<pkg/common/GravityEngines.hpp>
+
+#include<pkg/dem/GlobalStiffnessTimeStepper.hpp>
+#include<pkg/dem/ElasticContactLaw.hpp>
+
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/dem/HertzMindlin.hpp>
+
+#include<pkg/common/Grid.hpp>
+
+#include<pkg/dem/Tetra.hpp>
#ifdef YADE_OPENGL
- #include<yade/pkg/common/Gl1_NormPhys.hpp>
+ #include<pkg/common/Gl1_NormPhys.hpp>
#endif
CREATE_LOGGER(Shop);
=== modified file 'pkg/dem/SimpleShear.cpp'
--- pkg/dem/SimpleShear.cpp 2014-07-19 19:52:41 +0000
+++ pkg/dem/SimpleShear.cpp 2014-10-15 06:44:01 +0000
@@ -11,30 +11,30 @@
#include "SimpleShear.hpp"
-#include <yade/pkg/dem/NormalInelasticPM.hpp>
-#include<yade/pkg/dem/GlobalStiffnessTimeStepper.hpp>
-
-#include<yade/pkg/common/Aabb.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/InsertionSortCollider.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/InteractionLoop.hpp>
-
-#include<yade/pkg/common/ForceResetter.hpp>
-
-#include<yade/pkg/dem/NewtonIntegrator.hpp>
-#include<yade/pkg/common/GravityEngines.hpp>
-#include<yade/pkg/dem/KinemC__Engine.hpp>
-
-#include<yade/pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
-#include<yade/pkg/dem/Ig2_Box_Sphere_ScGeom.hpp>
-#include<yade/pkg/common/Bo1_Aabb.hpp>
-#include<yade/pkg/common/Bo1_Aabb.hpp>
-
-#include<yade/core/Body.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include <pkg/dem/NormalInelasticPM.hpp>
+#include<pkg/dem/GlobalStiffnessTimeStepper.hpp>
+
+#include<pkg/common/Aabb.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/InsertionSortCollider.hpp>
+#include<core/Interaction.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/InteractionLoop.hpp>
+
+#include<pkg/common/ForceResetter.hpp>
+
+#include<pkg/dem/NewtonIntegrator.hpp>
+#include<pkg/common/GravityEngines.hpp>
+#include<pkg/dem/KinemC__Engine.hpp>
+
+#include<pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
+#include<pkg/dem/Ig2_Box_Sphere_ScGeom.hpp>
+#include<pkg/common/Bo1_Aabb.hpp>
+#include<pkg/common/Bo1_Aabb.hpp>
+
+#include<core/Body.hpp>
+#include<pkg/common/Box.hpp>
+#include<pkg/common/Sphere.hpp>
#include <utility>
=== modified file 'pkg/dem/SimpleShear.hpp'
--- pkg/dem/SimpleShear.hpp 2014-07-02 16:18:24 +0000
+++ pkg/dem/SimpleShear.hpp 2014-10-15 06:44:01 +0000
@@ -8,7 +8,7 @@
#pragma once
-#include<yade/core/FileGenerator.hpp>
+#include<core/FileGenerator.hpp>
typedef pair<Vector3r, Real> BasicSphere;
=== modified file 'pkg/dem/SnapshotEngine.hpp'
--- pkg/dem/SnapshotEngine.hpp 2012-11-01 21:42:22 +0000
+++ pkg/dem/SnapshotEngine.hpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
#pragma once
-#include<yade/lib/opengl/OpenGLWrapper.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/PeriodicEngines.hpp>
-#include<yade/gui/qt4/OpenGLManager.hpp>
+#include<lib/opengl/OpenGLWrapper.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/PeriodicEngines.hpp>
+#include<gui/qt4/OpenGLManager.hpp>
class SnapshotEngine: public PeriodicEngine {
=== modified file 'pkg/dem/SpherePack.cpp'
--- pkg/dem/SpherePack.cpp 2014-09-10 20:45:19 +0000
+++ pkg/dem/SpherePack.cpp 2014-10-15 06:44:01 +0000
@@ -1,17 +1,17 @@
// © 2009 Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/pkg/dem/SpherePack.hpp>
+#include<pkg/dem/SpherePack.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/dem/Shop.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/dem/Shop.hpp>
#include <boost/random/linear_congruential.hpp>
#include <boost/random/uniform_real.hpp>
#include <boost/random/variate_generator.hpp>
-#include<yade/core/Timing.hpp>
+#include<core/Timing.hpp>
// not a serializable in the sense of YADE_PLUGIN
=== modified file 'pkg/dem/SpherePack.hpp'
--- pkg/dem/SpherePack.hpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/SpherePack.hpp 2014-10-15 06:44:01 +0000
@@ -3,8 +3,8 @@
#pragma once
-#include<yade/lib/base/Logging.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<lib/base/Logging.hpp>
+#include<lib/base/Math.hpp>
/*! Class representing geometry of spherical packing, with some utility functions. */
class SpherePack{
=== modified file 'pkg/dem/SpheresFactory.cpp'
--- pkg/dem/SpheresFactory.cpp 2014-07-01 18:14:18 +0000
+++ pkg/dem/SpheresFactory.cpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
-#include<yade/pkg/dem/SpheresFactory.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<pkg/dem/SpheresFactory.hpp>
+#include<pkg/common/Sphere.hpp>
#include <boost/random/linear_congruential.hpp>
#include <boost/random/uniform_real.hpp>
#include <boost/random/variate_generator.hpp>
=== modified file 'pkg/dem/SpheresFactory.hpp'
--- pkg/dem/SpheresFactory.hpp 2012-10-10 17:00:26 +0000
+++ pkg/dem/SpheresFactory.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
// Kovthanan …
-#include<yade/lib/base/Math.hpp>
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/pkg/common/Collider.hpp>
+#include<lib/base/Math.hpp>
+#include<core/GlobalEngine.hpp>
+#include<pkg/common/Collider.hpp>
class SpheresFactory: public GlobalEngine {
=== modified file 'pkg/dem/TesselationWrapper.cpp'
--- pkg/dem/TesselationWrapper.cpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/TesselationWrapper.cpp 2014-10-15 06:44:01 +0000
@@ -8,11 +8,11 @@
#ifdef YADE_CGAL
-#include<yade/pkg/dem/Shop.hpp>
+#include<pkg/dem/Shop.hpp>
#include"TesselationWrapper.hpp"
-#include<yade/lib/triangulation/Timer.h>
-#include<yade/pkg/dem/SpherePack.hpp>
-#include<yade/lib/pyutil/numpy.hpp>
+#include<lib/triangulation/Timer.h>
+#include<pkg/dem/SpherePack.hpp>
+#include<lib/pyutil/numpy.hpp>
YADE_PLUGIN((TesselationWrapper));
CREATE_LOGGER(TesselationWrapper);
=== modified file 'pkg/dem/TesselationWrapper.hpp'
--- pkg/dem/TesselationWrapper.hpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/TesselationWrapper.hpp 2014-10-15 06:44:01 +0000
@@ -6,12 +6,12 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#pragma once
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/lib/triangulation/Tesselation.h>
-#include<yade/pkg/dem/MicroMacroAnalyser.hpp>
+#include<core/GlobalEngine.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<lib/triangulation/Tesselation.h>
+#include<pkg/dem/MicroMacroAnalyser.hpp>
/*! \class TesselationWrapper
* \brief Handle the triangulation of spheres in a scene, build tesselation on request, and give access to computed quantities : currently volume and porosity of each Voronoï sphere.
=== modified file 'pkg/dem/Tetra.cpp'
--- pkg/dem/Tetra.cpp 2014-09-22 12:28:50 +0000
+++ pkg/dem/Tetra.cpp 2014-10-15 06:44:01 +0000
@@ -3,13 +3,13 @@
#include"Tetra.hpp"
-#include<yade/core/Interaction.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/State.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
+#include<core/Interaction.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<core/State.hpp>
+#include<pkg/common/ElastMat.hpp>
-#include<yade/pkg/common/Aabb.hpp>
+#include<pkg/common/Aabb.hpp>
#ifdef YADE_CGAL
#include <CGAL/intersections.h>
@@ -990,7 +990,7 @@
}
#ifdef YADE_OPENGL
- #include<yade/lib/opengl/OpenGLWrapper.hpp>
+ #include<lib/opengl/OpenGLWrapper.hpp>
bool Gl1_Tetra::wire;
void Gl1_Tetra::go(const shared_ptr<Shape>& cm, const shared_ptr<State>&,bool wire2,const GLViewInfo&)
{
=== modified file 'pkg/dem/Tetra.hpp'
--- pkg/dem/Tetra.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/Tetra.hpp 2014-10-15 06:44:01 +0000
@@ -3,13 +3,13 @@
#pragma once
-#include<yade/core/Shape.hpp>
-#include<yade/core/IGeom.hpp>
-#include<yade/core/GlobalEngine.hpp>
+#include<core/Shape.hpp>
+#include<core/IGeom.hpp>
+#include<core/GlobalEngine.hpp>
-#include<yade/pkg/common/Aabb.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/NormShearPhys.hpp>
+#include<pkg/common/Aabb.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/NormShearPhys.hpp>
#ifdef YADE_CGAL
#include <CGAL/Cartesian.h>
@@ -84,7 +84,7 @@
REGISTER_SERIALIZABLE(Bo1_Tetra_Aabb);
#ifdef YADE_OPENGL
- #include<yade/pkg/common/GLDrawFunctors.hpp>
+ #include<pkg/common/GLDrawFunctors.hpp>
/*! Draw Tetra using OpenGL */
class Gl1_Tetra: public GlShapeFunctor{
public:
=== modified file 'pkg/dem/ThreeDTriaxialEngine.cpp'
--- pkg/dem/ThreeDTriaxialEngine.cpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/ThreeDTriaxialEngine.cpp 2014-10-15 06:44:01 +0000
@@ -7,16 +7,16 @@
*************************************************************************/
#include "ThreeDTriaxialEngine.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<core/Omega.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<lib/base/Math.hpp>
#include<boost/lambda/lambda.hpp>
-#include<yade/pkg/dem/Shop.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
+#include<pkg/dem/Shop.hpp>
+#include<core/Interaction.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/common/ElastMat.hpp>
class Ip2_CohFrictMat_CohFrictMat_CohFrictPhys;
=== modified file 'pkg/dem/ThreeDTriaxialEngine.hpp'
--- pkg/dem/ThreeDTriaxialEngine.hpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/ThreeDTriaxialEngine.hpp 2014-10-15 06:44:01 +0000
@@ -9,9 +9,9 @@
#pragma once
-#include<yade/core/PartialEngine.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/pkg/dem/TriaxialStressController.hpp>
+#include<core/PartialEngine.hpp>
+#include<lib/base/Math.hpp>
+#include<pkg/dem/TriaxialStressController.hpp>
/** \brief Class for controlling in stress or in strain with respect to each spatial direction a cubical assembly of particles.
*
=== modified file 'pkg/dem/TriaxialCompressionEngine.cpp'
--- pkg/dem/TriaxialCompressionEngine.cpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/TriaxialCompressionEngine.cpp 2014-10-15 06:44:01 +0000
@@ -7,15 +7,15 @@
*************************************************************************/
#include "TriaxialCompressionEngine.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<core/Scene.hpp>
+#include<core/Omega.hpp>
+#include<lib/base/Math.hpp>
#include<boost/lambda/lambda.hpp>
-#include<yade/pkg/dem/Shop.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
+#include<pkg/dem/Shop.hpp>
+#include<core/Interaction.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/common/ElastMat.hpp>
class Ip2_CohFrictMat_CohFrictMat_CohFrictPhys;
=== modified file 'pkg/dem/TriaxialCompressionEngine.hpp'
--- pkg/dem/TriaxialCompressionEngine.hpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/TriaxialCompressionEngine.hpp 2014-10-15 06:44:01 +0000
@@ -8,9 +8,9 @@
#pragma once
-#include<yade/core/PartialEngine.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/pkg/dem/TriaxialStressController.hpp>
+#include<core/PartialEngine.hpp>
+#include<lib/base/Math.hpp>
+#include<pkg/dem/TriaxialStressController.hpp>
/** \brief Class for controlling optional initial isotropic compaction and subsequent triaxial test with constant lateral stress and constant axial strain rate. The algorithms used have been developed initialy for simulations reported in [Chareyre2002a] and [Chareyre2005]. They have been ported to Yade in a second step and used in e.g. [Kozicki2008],[Scholtes2009b],[Jerier2010b].
*
=== modified file 'pkg/dem/TriaxialStateRecorder.cpp'
--- pkg/dem/TriaxialStateRecorder.cpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/TriaxialStateRecorder.cpp 2014-10-15 06:44:01 +0000
@@ -9,14 +9,14 @@
*************************************************************************/
#include "TriaxialStateRecorder.hpp"
-// #include <yade/pkg/dem/TriaxialCompressionEngine.hpp>
-#include <yade/pkg/dem/TriaxialStressController.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include <yade/core/Omega.hpp>
-#include <yade/core/Scene.hpp>
-#include <yade/pkg/dem/ScGeom.hpp>
-#include <yade/pkg/dem/FrictPhys.hpp>
-#include <yade/pkg/dem/Shop.hpp>
+// #include <pkg/dem/TriaxialCompressionEngine.hpp>
+#include <pkg/dem/TriaxialStressController.hpp>
+#include<pkg/common/Sphere.hpp>
+#include <core/Omega.hpp>
+#include <core/Scene.hpp>
+#include <pkg/dem/ScGeom.hpp>
+#include <pkg/dem/FrictPhys.hpp>
+#include <pkg/dem/Shop.hpp>
CREATE_LOGGER(TriaxialStateRecorder);
TriaxialStateRecorder::~TriaxialStateRecorder() {};
=== modified file 'pkg/dem/TriaxialStateRecorder.hpp'
--- pkg/dem/TriaxialStateRecorder.hpp 2013-05-29 09:48:51 +0000
+++ pkg/dem/TriaxialStateRecorder.hpp 2014-10-15 06:44:01 +0000
@@ -11,7 +11,7 @@
#pragma once
-#include <yade/pkg/common/Recorder.hpp>
+#include <pkg/common/Recorder.hpp>
/*! \brief Record the stress-strain state of a sample in simulations using TriaxialCompressionEngine
=== modified file 'pkg/dem/TriaxialStressController.cpp'
--- pkg/dem/TriaxialStressController.cpp 2014-10-08 12:04:24 +0000
+++ pkg/dem/TriaxialStressController.cpp 2014-10-15 06:44:01 +0000
@@ -7,18 +7,18 @@
*************************************************************************/
#include"TriaxialStressController.hpp"
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/core/State.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Box.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<core/State.hpp>
#include<assert.h>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/dem/Shop.hpp>
-#include<yade/core/Clump.hpp>
+#include<core/Scene.hpp>
+#include<pkg/dem/Shop.hpp>
+#include<core/Clump.hpp>
#ifdef FLOW_ENGINE
-//#include<yade/pkg/pfv/FlowEngine.hpp>
+//#include<pkg/pfv/FlowEngine.hpp>
#include "FlowEngine_FlowEngineT.hpp"
#endif
=== modified file 'pkg/dem/TriaxialStressController.hpp'
--- pkg/dem/TriaxialStressController.hpp 2014-08-13 13:31:41 +0000
+++ pkg/dem/TriaxialStressController.hpp 2014-10-15 06:44:01 +0000
@@ -8,9 +8,9 @@
#pragma once
-#include<yade/pkg/common/BoundaryController.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<pkg/common/BoundaryController.hpp>
+#include<core/Scene.hpp>
+#include<lib/base/Math.hpp>
#include<boost/array.hpp>
=== modified file 'pkg/dem/TriaxialTest.cpp'
--- pkg/dem/TriaxialTest.cpp 2014-07-19 19:52:41 +0000
+++ pkg/dem/TriaxialTest.cpp 2014-10-15 06:44:01 +0000
@@ -7,35 +7,35 @@
*************************************************************************/
-#include<yade/pkg/dem/ElasticContactLaw.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/dem/GlobalStiffnessTimeStepper.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/dem/TriaxialStressController.hpp>
-#include<yade/pkg/dem/TriaxialCompressionEngine.hpp>
-#include <yade/pkg/dem/TriaxialStateRecorder.hpp>
-#include<yade/pkg/common/Aabb.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/InsertionSortCollider.hpp>
-#include<yade/pkg/common/InsertionSortCollider.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/GravityEngines.hpp>
-#include<yade/pkg/dem/NewtonIntegrator.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/pkg/common/Wall.hpp>
-#include<yade/pkg/common/ForceResetter.hpp>
-#include<yade/pkg/common/InteractionLoop.hpp>
-#include<yade/pkg/dem/Shop.hpp>
+#include<pkg/dem/ElasticContactLaw.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/dem/GlobalStiffnessTimeStepper.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/dem/TriaxialStressController.hpp>
+#include<pkg/dem/TriaxialCompressionEngine.hpp>
+#include <pkg/dem/TriaxialStateRecorder.hpp>
+#include<pkg/common/Aabb.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/InsertionSortCollider.hpp>
+#include<pkg/common/InsertionSortCollider.hpp>
+#include<core/Interaction.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/GravityEngines.hpp>
+#include<pkg/dem/NewtonIntegrator.hpp>
+#include<core/Body.hpp>
+#include<pkg/common/Box.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Facet.hpp>
+#include<pkg/common/Wall.hpp>
+#include<pkg/common/ForceResetter.hpp>
+#include<pkg/common/InteractionLoop.hpp>
+#include<pkg/dem/Shop.hpp>
-#include<yade/pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
-#include<yade/pkg/dem/Ig2_Box_Sphere_ScGeom.hpp>
-#include<yade/pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp>
-#include<yade/pkg/common/Bo1_Aabb.hpp>
-#include<yade/pkg/common/Wall.hpp>
+#include<pkg/dem/Ig2_Sphere_Sphere_ScGeom.hpp>
+#include<pkg/dem/Ig2_Box_Sphere_ScGeom.hpp>
+#include<pkg/dem/Ig2_Facet_Sphere_ScGeom.hpp>
+#include<pkg/common/Bo1_Aabb.hpp>
+#include<pkg/common/Wall.hpp>
#include <boost/numeric/conversion/bounds.hpp>
#include <boost/limits.hpp>
@@ -44,8 +44,8 @@
#include <boost/random/uniform_real.hpp>
#include <boost/random/variate_generator.hpp>
#include <boost/random/normal_distribution.hpp>
-#include<yade/pkg/dem/SpherePack.hpp>
-//#include<yade/pkg/dem/MicroMacroAnalyser.hpp>
+#include<pkg/dem/SpherePack.hpp>
+//#include<pkg/dem/MicroMacroAnalyser.hpp>
#include "TriaxialTest.hpp"
CREATE_LOGGER(TriaxialTest);
=== modified file 'pkg/dem/TriaxialTest.hpp'
--- pkg/dem/TriaxialTest.hpp 2013-09-19 08:50:04 +0000
+++ pkg/dem/TriaxialTest.hpp 2014-10-15 06:44:01 +0000
@@ -8,7 +8,7 @@
#pragma once
-#include<yade/core/FileGenerator.hpp>
+#include<core/FileGenerator.hpp>
class ForceRecorder;
class AveragePositionRecorder;
=== modified file 'pkg/dem/UnbalancedForceCallbacks.cpp'
--- pkg/dem/UnbalancedForceCallbacks.cpp 2011-01-09 16:34:50 +0000
+++ pkg/dem/UnbalancedForceCallbacks.cpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
-#include<yade/pkg/dem/UnbalancedForceCallbacks.hpp>
-#include<yade/pkg/common/NormShearPhys.hpp>
-#include<yade/core/Interaction.hpp>
-#include<yade/core/Body.hpp>
-#include<yade/core/Scene.hpp>
+#include<pkg/dem/UnbalancedForceCallbacks.hpp>
+#include<pkg/common/NormShearPhys.hpp>
+#include<core/Interaction.hpp>
+#include<core/Body.hpp>
+#include<core/Scene.hpp>
YADE_PLUGIN((SumIntrForcesCb)
#ifdef YADE_BODY_CALLBACK
=== modified file 'pkg/dem/UnbalancedForceCallbacks.hpp'
--- pkg/dem/UnbalancedForceCallbacks.hpp 2011-01-09 16:34:50 +0000
+++ pkg/dem/UnbalancedForceCallbacks.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
// 2010 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/pkg/common/Callbacks.hpp>
-#include<yade/lib/base/openmp-accu.hpp>
+#include<pkg/common/Callbacks.hpp>
+#include<lib/base/openmp-accu.hpp>
class SumIntrForcesCb: public IntrCallback{
public:
=== modified file 'pkg/dem/UniaxialStrainer.cpp'
--- pkg/dem/UniaxialStrainer.cpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/UniaxialStrainer.cpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
// 2008 © Václav Šmilauer <eudoxos@xxxxxxxx>
#include"UniaxialStrainer.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/core/InteractionContainer.hpp>
-#include<yade/pkg/common/Aabb.hpp>
+#include<core/Scene.hpp>
+#include<core/InteractionContainer.hpp>
+#include<pkg/common/Aabb.hpp>
YADE_PLUGIN((UniaxialStrainer));
/************************ UniaxialStrainer **********************/
=== modified file 'pkg/dem/UniaxialStrainer.hpp'
--- pkg/dem/UniaxialStrainer.hpp 2014-07-03 17:20:40 +0000
+++ pkg/dem/UniaxialStrainer.hpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
// 2008 © Václav Šmilauer <eudoxos@xxxxxxxx>
#pragma once
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/dem/Shop.hpp>
-#include<yade/pkg/common/BoundaryController.hpp>
+#include<core/Scene.hpp>
+#include<pkg/dem/Shop.hpp>
+#include<pkg/common/BoundaryController.hpp>
/*! Axial displacing two groups of bodies in the opposite direction with given strain rate.
*
=== modified file 'pkg/dem/VTKRecorder.cpp'
--- pkg/dem/VTKRecorder.cpp 2014-10-07 13:13:28 +0000
+++ pkg/dem/VTKRecorder.cpp 2014-10-15 06:44:01 +0000
@@ -22,16 +22,16 @@
#include<vtkMultiBlockDataSet.h>
#endif
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/pkg/dem/ConcretePM.hpp>
-#include<yade/pkg/dem/WirePM.hpp>
-#include<yade/pkg/dem/JointedCohesiveFrictionalPM.hpp>
-#include<yade/pkg/dem/Shop.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/Facet.hpp>
+#include<pkg/common/Box.hpp>
+#include<pkg/dem/ConcretePM.hpp>
+#include<pkg/dem/WirePM.hpp>
+#include<pkg/dem/JointedCohesiveFrictionalPM.hpp>
+#include<pkg/dem/Shop.hpp>
#ifdef YADE_LIQMIGRATION
- #include<yade/pkg/dem/ViscoelasticCapillarPM.hpp>
+ #include<pkg/dem/ViscoelasticCapillarPM.hpp>
#endif
YADE_PLUGIN((VTKRecorder));
=== modified file 'pkg/dem/VTKRecorder.hpp'
--- pkg/dem/VTKRecorder.hpp 2014-08-08 09:26:21 +0000
+++ pkg/dem/VTKRecorder.hpp 2014-10-15 06:44:01 +0000
@@ -1,5 +1,5 @@
#pragma once
-#include<yade/pkg/common/PeriodicEngines.hpp>
+#include<pkg/common/PeriodicEngines.hpp>
#include<vtkQuad.h>
#include<vtkSmartPointer.h>
=== modified file 'pkg/dem/ViscoelasticCapillarPM.cpp'
--- pkg/dem/ViscoelasticCapillarPM.cpp 2014-09-11 17:15:11 +0000
+++ pkg/dem/ViscoelasticCapillarPM.cpp 2014-10-15 06:44:01 +0000
@@ -1,9 +1,9 @@
#include"ViscoelasticCapillarPM.hpp"
-#include<yade/core/State.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<core/State.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/Sphere.hpp>
YADE_PLUGIN((ViscElCapMat)(ViscElCapPhys)(Ip2_ViscElCapMat_ViscElCapMat_ViscElCapPhys)(Law2_ScGeom_ViscElCapPhys_Basic));
=== modified file 'pkg/dem/ViscoelasticCapillarPM.hpp'
--- pkg/dem/ViscoelasticCapillarPM.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/ViscoelasticCapillarPM.hpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
#pragma once
#include "ViscoelasticPM.hpp"
#include <boost/unordered_map.hpp>
-#include <yade/core/PartialEngine.hpp>
+#include <core/PartialEngine.hpp>
class ViscElCapMat : public ViscElMat {
public:
=== modified file 'pkg/dem/ViscoelasticPM.cpp'
--- pkg/dem/ViscoelasticPM.cpp 2014-08-26 14:53:06 +0000
+++ pkg/dem/ViscoelasticPM.cpp 2014-10-15 06:44:01 +0000
@@ -1,13 +1,13 @@
// 2009 © Sergei Dorofeenko <sega@xxxxxxxxxxxxxxxx>
#include"ViscoelasticPM.hpp"
-#include<yade/core/State.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/Sphere.hpp>
+#include<core/State.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/Sphere.hpp>
#ifdef YADE_SPH
-#include<yade/pkg/common/SPHEngine.hpp>
+#include<pkg/common/SPHEngine.hpp>
#endif
using std::isfinite;
=== modified file 'pkg/dem/ViscoelasticPM.hpp'
--- pkg/dem/ViscoelasticPM.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/ViscoelasticPM.hpp 2014-10-15 06:44:01 +0000
@@ -4,15 +4,15 @@
#pragma once
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/pkg/common/MatchMaker.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<pkg/common/MatchMaker.hpp>
#ifdef YADE_SPH
-#include<yade/pkg/common/SPHEngine.hpp>
+#include<pkg/common/SPHEngine.hpp>
#endif
=== modified file 'pkg/dem/WirePM.cpp'
--- pkg/dem/WirePM.cpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/WirePM.cpp 2014-10-15 06:44:01 +0000
@@ -7,16 +7,16 @@
*************************************************************************/
#include"WirePM.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<core/Omega.hpp>
#include "../../lib/base/Math.hpp"
#include <boost/random/linear_congruential.hpp>
#include <boost/random/triangle_distribution.hpp>
#include <boost/random/variate_generator.hpp>
-#include<yade/core/Timing.hpp>
+#include<core/Timing.hpp>
YADE_PLUGIN((WireMat)(WireState)(WirePhys)(Ip2_WireMat_WireMat_WirePhys)(Law2_ScGeom_WirePhys_WirePM));
=== modified file 'pkg/dem/WirePM.hpp'
--- pkg/dem/WirePM.hpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/WirePM.hpp 2014-10-15 06:44:01 +0000
@@ -25,10 +25,10 @@
#pragma once
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/dem/FrictPhys.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/dem/FrictPhys.hpp>
+#include<pkg/dem/ScGeom.hpp>
/** This class holds information associated with each body state*/
class WireState: public State {
=== modified file 'pkg/lbm/HydrodynamicsLawLBM.cpp'
--- pkg/lbm/HydrodynamicsLawLBM.cpp 2014-07-14 20:08:34 +0000
+++ pkg/lbm/HydrodynamicsLawLBM.cpp 2014-10-15 06:44:01 +0000
@@ -24,11 +24,11 @@
#ifdef LBM_ENGINE
#include"HydrodynamicsLawLBM.hpp"
-#include<yade/core/Omega.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/pkg/common/Box.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/dem/CohesiveFrictionalContactLaw.hpp>
+#include<core/Omega.hpp>
+#include<core/Scene.hpp>
+#include<pkg/common/Box.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/dem/CohesiveFrictionalContactLaw.hpp>
namespace bfs=boost::filesystem;
=== modified file 'pkg/lbm/HydrodynamicsLawLBM.hpp'
--- pkg/lbm/HydrodynamicsLawLBM.hpp 2014-03-31 16:01:57 +0000
+++ pkg/lbm/HydrodynamicsLawLBM.hpp 2014-10-15 06:44:01 +0000
@@ -24,10 +24,10 @@
#ifdef LBM_ENGINE
#pragma once
-#include<yade/pkg/lbm/LBMnode.hpp>
-#include<yade/pkg/lbm/LBMlink.hpp>
-#include<yade/pkg/lbm/LBMbody.hpp>
-#include<yade/core/GlobalEngine.hpp>
+#include<pkg/lbm/LBMnode.hpp>
+#include<pkg/lbm/LBMlink.hpp>
+#include<pkg/lbm/LBMbody.hpp>
+#include<core/GlobalEngine.hpp>
class HydrodynamicsLawLBM : public GlobalEngine
=== modified file 'pkg/lbm/LBMbody.hpp'
--- pkg/lbm/LBMbody.hpp 2014-07-21 18:14:48 +0000
+++ pkg/lbm/LBMbody.hpp 2014-10-15 06:44:01 +0000
@@ -9,8 +9,8 @@
#ifdef LBM_ENGINE
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/Indexable.hpp>
class LBMbody: public Serializable{
public:
=== modified file 'pkg/lbm/LBMlink.hpp'
--- pkg/lbm/LBMlink.hpp 2014-07-21 18:14:48 +0000
+++ pkg/lbm/LBMlink.hpp 2014-10-15 06:44:01 +0000
@@ -9,8 +9,8 @@
#ifdef LBM_ENGINE
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/Indexable.hpp>
class LBMlink: public Serializable{
public:
=== modified file 'pkg/lbm/LBMnode.hpp'
--- pkg/lbm/LBMnode.hpp 2014-03-31 16:01:57 +0000
+++ pkg/lbm/LBMnode.hpp 2014-10-15 06:44:01 +0000
@@ -9,8 +9,8 @@
#ifdef LBM_ENGINE
#pragma once
-#include<yade/lib/serialization/Serializable.hpp>
-#include<yade/lib/multimethods/Indexable.hpp>
+#include<lib/serialization/Serializable.hpp>
+#include<lib/multimethods/Indexable.hpp>
class LBMnode: public Serializable{
public:
=== modified file 'pkg/pfv/DFNFlow.cpp'
--- pkg/pfv/DFNFlow.cpp 2014-10-09 21:03:29 +0000
+++ pkg/pfv/DFNFlow.cpp 2014-10-15 06:44:01 +0000
@@ -7,8 +7,8 @@
*************************************************************************/
#ifdef FLOW_ENGINE
-#include<yade/pkg/dem/JointedCohesiveFrictionalPM.hpp>
-// #include<yade/pkg/dem/ScGeom.hpp>
+#include<pkg/dem/JointedCohesiveFrictionalPM.hpp>
+// #include<pkg/dem/ScGeom.hpp>
//keep this #ifdef for commited versions unless you really have stable version that should be compiled by default
//it will save compilation time for everyone else
=== modified file 'pkg/pfv/FlowEngine.hpp.in'
--- pkg/pfv/FlowEngine.hpp.in 2014-10-10 11:45:21 +0000
+++ pkg/pfv/FlowEngine.hpp.in 2014-10-15 06:44:01 +0000
@@ -34,13 +34,13 @@
*/
#pragma once
-#include<yade/core/PartialEngine.hpp>
-#include<yade/pkg/dem/TriaxialCompressionEngine.hpp>
-#include<yade/pkg/dem/TesselationWrapper.hpp>
-#include<yade/lib/triangulation/FlowBoundingSphere.hpp>
-#include<yade/lib/triangulation/PeriodicFlow.hpp>
-#include<yade/pkg/pfv/FlowEngine.hpp>
-#include<yade/core/Clump.hpp>
+#include<core/PartialEngine.hpp>
+#include<pkg/dem/TriaxialCompressionEngine.hpp>
+#include<pkg/dem/TesselationWrapper.hpp>
+#include<lib/triangulation/FlowBoundingSphere.hpp>
+#include<lib/triangulation/PeriodicFlow.hpp>
+#include<pkg/pfv/FlowEngine.hpp>
+#include<core/Clump.hpp>
template<class _CellInfo, class _VertexInfo, class _Tesselation=CGT::_Tesselation<CGT::TriangulationTypes<_VertexInfo,_CellInfo> >, class solverT=DEFAULTSOLVER >
class TemplateFlowEngine_@TEMPLATE_FLOW_NAME@ : public PartialEngine
=== modified file 'pkg/pfv/FlowEngine.ipp.in'
--- pkg/pfv/FlowEngine.ipp.in 2014-10-14 15:52:06 +0000
+++ pkg/pfv/FlowEngine.ipp.in 2014-10-15 06:44:01 +0000
@@ -13,7 +13,7 @@
#include <cholmod.h>
#endif
//For pyRunString
-#include<yade/lib/pyutil/gil.hpp>
+#include<lib/pyutil/gil.hpp>
template< class _CellInfo, class _VertexInfo, class _Tesselation, class solverT >
TemplateFlowEngine_@TEMPLATE_FLOW_NAME@<_CellInfo,_VertexInfo,_Tesselation,solverT>::~TemplateFlowEngine_@TEMPLATE_FLOW_NAME@() {}
=== modified file 'py/WeightedAverage2d.cpp'
--- py/WeightedAverage2d.cpp 2014-05-23 13:03:50 +0000
+++ py/WeightedAverage2d.cpp 2014-10-15 06:44:01 +0000
@@ -1,4 +1,4 @@
-#include<yade/lib/smoothing/WeightedAverage2d.hpp>
+#include<lib/smoothing/WeightedAverage2d.hpp>
/* Tell whether point is inside polygon
*
=== modified file 'py/_polyhedra_utils.cpp'
--- py/_polyhedra_utils.cpp 2014-07-03 17:20:40 +0000
+++ py/_polyhedra_utils.cpp 2014-10-15 06:44:01 +0000
@@ -3,13 +3,13 @@
#ifdef YADE_CGAL
-#include"yade/pkg/dem/Polyhedra.hpp"
+#include"pkg/dem/Polyhedra.hpp"
-#include<yade/core/Scene.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/ElastMat.hpp>
-#include<yade/lib/pyutil/doc_opts.hpp>
+#include<core/Scene.hpp>
+#include<core/Omega.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/ElastMat.hpp>
+#include<lib/pyutil/doc_opts.hpp>
#include<cmath>
#include<numpy/ndarrayobject.h>
=== modified file 'py/_utils.cpp'
--- py/_utils.cpp 2014-10-14 17:28:52 +0000
+++ py/_utils.cpp 2014-10-15 06:44:01 +0000
@@ -1,4 +1,4 @@
-#include <yade/py/_utils.hpp>
+#include <py/_utils.hpp>
bool isInBB(Vector3r p, Vector3r bbMin, Vector3r bbMax){return p[0]>bbMin[0] && p[0]<bbMax[0] && p[1]>bbMin[1] && p[1]<bbMax[1] && p[2]>bbMin[2] && p[2]<bbMax[2];}
=== modified file 'py/_utils.hpp'
--- py/_utils.hpp 2014-10-14 15:52:06 +0000
+++ py/_utils.hpp 2014-10-15 06:44:01 +0000
@@ -1,15 +1,15 @@
-#include<yade/pkg/dem/Shop.hpp>
-#include<yade/core/Scene.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/pkg/dem/ScGeom.hpp>
-#include<yade/pkg/dem/DemXDofGeom.hpp>
-#include<yade/pkg/common/Facet.hpp>
-#include<yade/pkg/dem/Tetra.hpp>
-#include<yade/pkg/common/Sphere.hpp>
-#include<yade/pkg/common/NormShearPhys.hpp>
-#include<yade/lib/computational-geometry/Hull2d.hpp>
-#include<yade/lib/pyutil/doc_opts.hpp>
-#include<yade/pkg/dem/ViscoelasticPM.hpp>
+#include<pkg/dem/Shop.hpp>
+#include<core/Scene.hpp>
+#include<core/Omega.hpp>
+#include<pkg/dem/ScGeom.hpp>
+#include<pkg/dem/DemXDofGeom.hpp>
+#include<pkg/common/Facet.hpp>
+#include<pkg/dem/Tetra.hpp>
+#include<pkg/common/Sphere.hpp>
+#include<pkg/common/NormShearPhys.hpp>
+#include<lib/computational-geometry/Hull2d.hpp>
+#include<lib/pyutil/doc_opts.hpp>
+#include<pkg/dem/ViscoelasticPM.hpp>
#include<numpy/ndarrayobject.h>
=== modified file 'py/mathWrap/miniEigen.cpp'
--- py/mathWrap/miniEigen.cpp 2014-07-11 17:39:21 +0000
+++ py/mathWrap/miniEigen.cpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
#include<boost/algorithm/string/trim.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/lib/pyutil/doc_opts.hpp>
+#include<lib/base/Math.hpp>
+#include<lib/pyutil/doc_opts.hpp>
namespace bp=boost::python;
=== modified file 'py/pack/_packObb.cpp'
--- py/pack/_packObb.cpp 2014-07-03 17:20:40 +0000
+++ py/pack/_packObb.cpp 2014-10-15 06:44:01 +0000
@@ -2,9 +2,9 @@
// the code written after http://www.amillionpixels.us/bestfitobb.cpp
// which is MIT-licensed
-#include<yade/lib/base/Logging.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/lib/pyutil/doc_opts.hpp>
+#include<lib/base/Logging.hpp>
+#include<lib/base/Math.hpp>
+#include<lib/pyutil/doc_opts.hpp>
// compute minimum bounding for a cloud of points
=== modified file 'py/pack/_packPredicates.cpp'
--- py/pack/_packPredicates.cpp 2014-07-03 17:20:40 +0000
+++ py/pack/_packPredicates.cpp 2014-10-15 06:44:01 +0000
@@ -1,7 +1,7 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/lib/base/Logging.hpp>
-#include<yade/lib/base/Math.hpp>
-#include<yade/lib/pyutil/doc_opts.hpp>
+#include<lib/base/Logging.hpp>
+#include<lib/base/Math.hpp>
+#include<lib/pyutil/doc_opts.hpp>
namespace py=boost::python;
=== modified file 'py/pack/_packSpheres.cpp'
--- py/pack/_packSpheres.cpp 2014-09-03 15:59:54 +0000
+++ py/pack/_packSpheres.cpp 2014-10-15 06:44:01 +0000
@@ -1,8 +1,8 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/pkg/dem/SpherePack.hpp>
-#include<yade/lib/pyutil/doc_opts.hpp>
-#include<yade/lib/base/Math.hpp>
+#include<pkg/dem/SpherePack.hpp>
+#include<lib/pyutil/doc_opts.hpp>
+#include<lib/base/Math.hpp>
BOOST_PYTHON_MODULE(_packSpheres){
boost::python::scope().attr("__doc__")="Creation, manipulation, IO for generic sphere packings.";
=== modified file 'py/wrapper/customConverters.cpp'
--- py/wrapper/customConverters.cpp 2014-07-03 17:20:40 +0000
+++ py/wrapper/customConverters.cpp 2014-10-15 06:44:01 +0000
@@ -1,20 +1,20 @@
// 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/lib/base/Math.hpp>
-#include<yade/lib/base/openmp-accu.hpp>
-
-#include<yade/core/Engine.hpp>
-
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/pkg/common/Callbacks.hpp>
-#include<yade/pkg/dem/SpherePack.hpp>
-#include<yade/pkg/common/KinematicEngines.hpp>
+#include<lib/base/Math.hpp>
+#include<lib/base/openmp-accu.hpp>
+
+#include<core/Engine.hpp>
+
+#include<pkg/common/Dispatching.hpp>
+#include<pkg/common/Callbacks.hpp>
+#include<pkg/dem/SpherePack.hpp>
+#include<pkg/common/KinematicEngines.hpp>
#ifdef YADE_OPENGL
- #include<yade/pkg/common/GLDrawFunctors.hpp>
- #include<yade/pkg/common/OpenGLRenderer.hpp>
+ #include<pkg/common/GLDrawFunctors.hpp>
+ #include<pkg/common/OpenGLRenderer.hpp>
#endif
-#include<yade/pkg/common/MatchMaker.hpp>
+#include<pkg/common/MatchMaker.hpp>
// move this to the miniEigen wrapper later
=== modified file 'py/wrapper/yadeWrapper.cpp'
--- py/wrapper/yadeWrapper.cpp 2014-09-26 21:38:22 +0000
+++ py/wrapper/yadeWrapper.cpp 2014-10-15 06:44:01 +0000
@@ -1,6 +1,6 @@
// 2007,2008 © Václav Šmilauer <eudoxos@xxxxxxxx>
-#include<yade/lib/base/Math.hpp>
+#include<lib/base/Math.hpp>
#include<unistd.h>
#include<list>
#include<signal.h>
@@ -12,28 +12,28 @@
#include<boost/date_time/posix_time/posix_time.hpp>
#include<boost/algorithm/string.hpp>
-#include<yade/lib/base/Logging.hpp>
-#include<yade/lib/pyutil/gil.hpp>
-#include<yade/lib/pyutil/raw_constructor.hpp>
-#include<yade/lib/pyutil/doc_opts.hpp>
-#include<yade/core/Omega.hpp>
-#include<yade/core/ThreadRunner.hpp>
-#include<yade/core/FileGenerator.hpp>
-#include<yade/core/EnergyTracker.hpp>
-
-#include<yade/pkg/dem/STLImporter.hpp>
-
-#include<yade/pkg/common/Dispatching.hpp>
-#include<yade/core/GlobalEngine.hpp>
-#include<yade/core/PartialEngine.hpp>
-#include<yade/core/Functor.hpp>
-#include<yade/pkg/common/ParallelEngine.hpp>
-#include<yade/pkg/common/Collider.hpp>
-
-#include<yade/pkg/common/InteractionLoop.hpp>
-
-#include <yade/core/Clump.hpp>
-#include <yade/pkg/common/Sphere.hpp>
+#include<lib/base/Logging.hpp>
+#include<lib/pyutil/gil.hpp>
+#include<lib/pyutil/raw_constructor.hpp>
+#include<lib/pyutil/doc_opts.hpp>
+#include<core/Omega.hpp>
+#include<core/ThreadRunner.hpp>
+#include<core/FileGenerator.hpp>
+#include<core/EnergyTracker.hpp>
+
+#include<pkg/dem/STLImporter.hpp>
+
+#include<pkg/common/Dispatching.hpp>
+#include<core/GlobalEngine.hpp>
+#include<core/PartialEngine.hpp>
+#include<core/Functor.hpp>
+#include<pkg/common/ParallelEngine.hpp>
+#include<pkg/common/Collider.hpp>
+
+#include<pkg/common/InteractionLoop.hpp>
+
+#include <core/Clump.hpp>
+#include <pkg/common/Sphere.hpp>
#if BOOST_VERSION>=104700
#include<boost/math/special_functions/nonfinite_num_facets.hpp>
@@ -47,8 +47,8 @@
#include <boost/random/variate_generator.hpp>
#include <boost/archive/codecvt_null.hpp>
-#include <yade/core/Timing.hpp>
-#include <yade/lib/serialization/ObjectIO.hpp>
+#include <core/Timing.hpp>
+#include <lib/serialization/ObjectIO.hpp>
namespace py = boost::python;
=== modified file 'scripts/linkdeps.py'
--- scripts/linkdeps.py 2013-10-16 15:24:49 +0000
+++ scripts/linkdeps.py 2014-10-15 06:44:01 +0000
@@ -39,7 +39,7 @@
if level==maxIncludeLevel: return set(),set()
#print path,f
for l in open(fullF):
- m=re.match('^#include<yade/([^/]*)/(.*)>.*$',l)
+ m=re.match('^#include<([^/]*)/(.*)>.*$',l)
if m:
incMod=m.group(1); incHead=m.group(2); baseName=incHead.split('.')[0]; assert(len(incHead.split('.'))==2)
if incMod=='core': continue
