yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4113
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Wed 2014-07-23 11:11:35 +0200
message:
  Move some YADE_PLUGINS into common.cpp
  
  Discussed with Bruno
  http://www.mail-archive.com/yade-dev@xxxxxxxxxxxxxxxxxxx/msg10422.html
added:
  pkg/common/common.cpp
modified:
  pkg/common/MatchMaker.cpp
  pkg/common/ParallelEngine.cpp
  pkg/dem/DomainLimiter.cpp


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'pkg/common/MatchMaker.cpp'
--- pkg/common/MatchMaker.cpp	2014-07-21 09:09:14 +0000
+++ pkg/common/MatchMaker.cpp	2014-07-23 09:11:35 +0000
@@ -4,31 +4,6 @@
 
 YADE_PLUGIN((MatchMaker));
 
-
-// =======================================================
-// Some plugins from removed CPP-fiels
-#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>
-
-YADE_PLUGIN((IntrCallback)
-	#ifdef YADE_BODY_CALLBACK
-		(BodyCallback)
-	#endif
-);
-YADE_PLUGIN((ForceResetter)(TorqueEngine)(FieldApplier)(BoundaryController)
-            (NormPhys)(NormShearPhys)(Recorder)(CylScGeom6D)(CylScGeom)(Box)
-            (StepDisplacer));
-
-// =======================================================
-
 Real MatchMaker::operator()(int id1, int id2, Real val1, Real val2) const {
 	FOREACH(const Vector3r& m, matches){
 		if(((int)m[0]==id1 && (int)m[1]==id2) || ((int)m[0]==id2 && (int)m[1]==id1)) return m[2];

=== modified file 'pkg/common/ParallelEngine.cpp'
--- pkg/common/ParallelEngine.cpp	2014-07-19 19:52:41 +0000
+++ pkg/common/ParallelEngine.cpp	2014-07-23 09:11:35 +0000
@@ -1,10 +1,5 @@
-#include"ParallelEngine.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>
-YADE_PLUGIN((PeriodicEngine)(Sphere)(Aabb)(ElastMat)(FrictMat)(PyRunner)(ParallelEngine));
+#include <yade/pkg/common/ParallelEngine.hpp>
+YADE_PLUGIN((ParallelEngine));
 
 #ifdef YADE_OPENMP
   #include<omp.h>

=== added file 'pkg/common/common.cpp'
--- pkg/common/common.cpp	1970-01-01 00:00:00 +0000
+++ pkg/common/common.cpp	2014-07-23 09:11:35 +0000
@@ -0,0 +1,31 @@
+// =======================================================
+// 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>
+
+YADE_PLUGIN((IntrCallback)
+	#ifdef YADE_BODY_CALLBACK
+		(BodyCallback)
+	#endif
+);
+
+YADE_PLUGIN((ForceResetter)(TorqueEngine)(FieldApplier)(BoundaryController)
+            (NormPhys)(NormShearPhys)(Recorder)(CylScGeom6D)(CylScGeom)(Box)
+            (StepDisplacer)(GenericSpheresContact)
+            (PeriodicEngine)(Sphere)(Aabb)(ElastMat)(FrictMat)(PyRunner)
+            );

=== modified file 'pkg/dem/DomainLimiter.cpp'
--- pkg/dem/DomainLimiter.cpp	2014-07-21 09:09:14 +0000
+++ pkg/dem/DomainLimiter.cpp	2014-07-23 09:11:35 +0000
@@ -2,7 +2,7 @@
 #include<yade/pkg/dem/DemXDofGeom.hpp>
 #include<yade/pkg/dem/Shop.hpp>
 
-YADE_PLUGIN((DomainLimiter)(LawTester)(GenericSpheresContact)
+YADE_PLUGIN((DomainLimiter)(LawTester)
 	#ifdef YADE_OPENGL
 		(GlExtra_LawTester)(GlExtra_OctreeCubes)
 	#endif