yade-dev team mailing list archive

[sega at BerliOS <sega@xxxxxxxxxxxxxxx>]

Author: sega
Date: 2009-02-25 16:49:21 +0100 (Wed, 25 Feb 2009)
New Revision: 1691

Added:
   trunk/pkg/common/Container/InteractionHashMap.hpp
Modified:
   trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp
   trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp
Log:
Fix bug in serialization for ViscoelasticInteraction.
Fix compilation error for InteractionHashMap


Added: trunk/pkg/common/Container/InteractionHashMap.hpp
===================================================================
--- trunk/pkg/common/Container/InteractionHashMap.hpp	2009-02-25 14:25:55 UTC (rev 1690)
+++ trunk/pkg/common/Container/InteractionHashMap.hpp	2009-02-25 15:49:21 UTC (rev 1691)
@@ -0,0 +1 @@
+#include<yade/core/InteractionHashMap.hpp>

Modified: trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp	2009-02-25 14:25:55 UTC (rev 1690)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp	2009-02-25 15:49:21 UTC (rev 1691)
@@ -18,9 +18,4 @@
 {
 }
 
-void ViscoelasticInteraction::registerAttributes()
-{
-	REGISTER_ATTRIBUTE(cn);
-	REGISTER_ATTRIBUTE(cs);
-}
 YADE_PLUGIN();

Modified: trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp	2009-02-25 14:25:55 UTC (rev 1690)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp	2009-02-25 15:49:21 UTC (rev 1691)
@@ -22,13 +22,10 @@
 		ViscoelasticInteraction();
 		virtual ~ViscoelasticInteraction();
 	protected :
-		virtual void registerAttributes();
 
-	REGISTER_CLASS_NAME(ViscoelasticInteraction);
-	REGISTER_BASE_CLASS_NAME(InteractionPhysics);
+	REGISTER_ATTRIBUTES(ElasticContactInteraction,(cn)(cs));
+	REGISTER_CLASS_AND_BASE(ViscoelasticInteraction,ElasticContactInteraction);
 
-	REGISTER_CLASS_INDEX(ViscoelasticInteraction,InteractionPhysics);
-
 };
 
 REGISTER_SERIALIZABLE(ViscoelasticInteraction);