yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #00944
[svn] r1661 - in trunk/pkg/dem: . DataClass/InteractionPhysics Engine/EngineUnit Engine/StandAloneEngine RenderingEngine RenderingEngine/GLDrawSimpleViscoelasticInteraction RenderingEngine/GLDrawViscoelasticInteraction
Author: sega
Date: 2009-02-09 18:03:36 +0100 (Mon, 09 Feb 2009)
New Revision: 1661
Added:
trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp
trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp
trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/
trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp
trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.hpp
Removed:
trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.cpp
trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.hpp
trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.cpp
trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.hpp
Modified:
trunk/pkg/dem/Engine/EngineUnit/SimpleViscoelasticRelationships.cpp
trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticContactLaw.cpp
trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp
trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.hpp
trunk/pkg/dem/SConscript
Log:
Class SimpleViscoelasticInteraction is renamed to ViscoelasticInteraction and is inherited from ElasticContactInteraction now.
Deleted: trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.cpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.cpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -1,32 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2008 by Dorofeenko Sergei *
-* sega@xxxxxxxxxxxxxxxx *
-* *
-* 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 "SimpleViscoelasticInteraction.hpp"
-
-
-SimpleViscoelasticInteraction::SimpleViscoelasticInteraction()
-{
- createIndex();
-}
-
-SimpleViscoelasticInteraction::~SimpleViscoelasticInteraction()
-{
-}
-
-void SimpleViscoelasticInteraction::registerAttributes()
-{
- REGISTER_ATTRIBUTE(kn);
- REGISTER_ATTRIBUTE(ks);
- REGISTER_ATTRIBUTE(cn);
- REGISTER_ATTRIBUTE(cs);
- REGISTER_ATTRIBUTE(tangensOfFrictionAngle);
- REGISTER_ATTRIBUTE(prevNormal);
- REGISTER_ATTRIBUTE(normalForce);
- REGISTER_ATTRIBUTE(shearForce);
-}
-YADE_PLUGIN();
Deleted: trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.hpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.hpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.hpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -1,48 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2008 by Sergei Dorofeenko *
-* sega@xxxxxxxxxxxxxxxx *
-* *
-* 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. *
-*************************************************************************/
-
-#pragma once
-
-#include<yade/core/InteractionPhysics.hpp>
-
-class SimpleViscoelasticInteraction : public InteractionPhysics
-{
- public :
-
- /// Normal interaction elastic constants.
- Real kn;
- /// Normal interaction viscous constants.
- Real cn;
- /// Shear interaction elastic constants.
- Real ks;
- /// Shear interaction viscous constants.
- Real cs;
- /// Coulomb friction
- Real tangensOfFrictionAngle;
- /// Unit normal of the contact plane
- Vector3r prevNormal;
- /// Normal force
- Vector3r normalForce;
- /// Incremental shear force
- Vector3r shearForce;
-
- SimpleViscoelasticInteraction();
- virtual ~SimpleViscoelasticInteraction();
- protected :
- virtual void registerAttributes();
-
- REGISTER_CLASS_NAME(SimpleViscoelasticInteraction);
- REGISTER_BASE_CLASS_NAME(InteractionPhysics);
-
- REGISTER_CLASS_INDEX(SimpleViscoelasticInteraction,InteractionPhysics);
-
-};
-
-REGISTER_SERIALIZABLE(SimpleViscoelasticInteraction);
-
-
Copied: trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp (from rev 1660, trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.cpp)
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.cpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -0,0 +1,26 @@
+/*************************************************************************
+* Copyright (C) 2008 by Dorofeenko Sergei *
+* sega@xxxxxxxxxxxxxxxx *
+* *
+* 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 "ViscoelasticInteraction.hpp"
+
+
+ViscoelasticInteraction::ViscoelasticInteraction()
+{
+ createIndex();
+}
+
+ViscoelasticInteraction::~ViscoelasticInteraction()
+{
+}
+
+void ViscoelasticInteraction::registerAttributes()
+{
+ REGISTER_ATTRIBUTE(cn);
+ REGISTER_ATTRIBUTE(cs);
+}
+YADE_PLUGIN();
Property changes on: trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp (from rev 1660, trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.hpp)
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/SimpleViscoelasticInteraction.hpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -0,0 +1,36 @@
+/*************************************************************************
+* Copyright (C) 2008 by Sergei Dorofeenko *
+* sega@xxxxxxxxxxxxxxxx *
+* *
+* 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. *
+*************************************************************************/
+
+#pragma once
+
+#include<yade/pkg-dem/ElasticContactInteraction.hpp>
+
+class ViscoelasticInteraction : public ElasticContactInteraction
+{
+ public :
+
+ /// Normal viscous
+ Real cn;
+ /// Shear viscous
+ Real cs;
+
+ ViscoelasticInteraction();
+ virtual ~ViscoelasticInteraction();
+ protected :
+ virtual void registerAttributes();
+
+ REGISTER_CLASS_NAME(ViscoelasticInteraction);
+ REGISTER_BASE_CLASS_NAME(InteractionPhysics);
+
+ REGISTER_CLASS_INDEX(ViscoelasticInteraction,InteractionPhysics);
+
+};
+
+REGISTER_SERIALIZABLE(ViscoelasticInteraction);
+
+
Property changes on: trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.hpp
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/pkg/dem/Engine/EngineUnit/SimpleViscoelasticRelationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/SimpleViscoelasticRelationships.cpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/Engine/EngineUnit/SimpleViscoelasticRelationships.cpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -8,7 +8,7 @@
#include"SimpleViscoelasticRelationships.hpp"
#include<yade/pkg-dem/SimpleViscoelasticBodyParameters.hpp>
-#include<yade/pkg-dem/SimpleViscoelasticInteraction.hpp>
+#include<yade/pkg-dem/ViscoelasticInteraction.hpp>
#include<yade/pkg-dem/SpheresContactGeometry.hpp>
#include<yade/core/Omega.hpp>
#include<yade/core/MetaBody.hpp>
@@ -33,8 +33,8 @@
SimpleViscoelasticBodyParameters* sdec1 = static_cast<SimpleViscoelasticBodyParameters*>(b1.get());
SimpleViscoelasticBodyParameters* sdec2 = static_cast<SimpleViscoelasticBodyParameters*>(b2.get());
- interaction->interactionPhysics = shared_ptr<SimpleViscoelasticInteraction>(new SimpleViscoelasticInteraction());
- SimpleViscoelasticInteraction* contactPhysics = YADE_CAST<SimpleViscoelasticInteraction*>(interaction->interactionPhysics.get());
+ interaction->interactionPhysics = shared_ptr<ViscoelasticInteraction>(new ViscoelasticInteraction());
+ ViscoelasticInteraction* contactPhysics = YADE_CAST<ViscoelasticInteraction*>(interaction->interactionPhysics.get());
contactPhysics->kn = sdec1->kn * sdec2->kn / (sdec1->kn + sdec2->kn);
contactPhysics->ks = sdec1->ks * sdec2->ks / (sdec1->ks + sdec2->ks);
Modified: trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticContactLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticContactLaw.cpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticContactLaw.cpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -11,7 +11,7 @@
#include"SimpleViscoelasticContactLaw.hpp"
#include<yade/pkg-dem/SimpleViscoelasticBodyParameters.hpp>
-#include<yade/pkg-dem/SimpleViscoelasticInteraction.hpp>
+#include<yade/pkg-dem/ViscoelasticInteraction.hpp>
#include<yade/pkg-dem/SpheresContactGeometry.hpp>
#include<yade/core/Omega.hpp>
#include<yade/core/MetaBody.hpp>
@@ -58,7 +58,7 @@
//if( !( (*bodies)[id1]->getGroupMask() & (*bodies)[id2]->getGroupMask() & sdecGroupMask) ) continue;
SpheresContactGeometry* currentContactGeometry= YADE_CAST<SpheresContactGeometry*>(contact->interactionGeometry.get());
- SimpleViscoelasticInteraction* currentContactPhysics = YADE_CAST<SimpleViscoelasticInteraction*> (contact->interactionPhysics.get());
+ ViscoelasticInteraction* currentContactPhysics = YADE_CAST<ViscoelasticInteraction*> (contact->interactionPhysics.get());
if((!currentContactGeometry)||(!currentContactPhysics)) continue;
SimpleViscoelasticBodyParameters* de1 = YADE_CAST<SimpleViscoelasticBodyParameters*>((*bodies)[id1]->physicalParameters.get());
Modified: trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -10,7 +10,7 @@
#include <yade/core/MetaBody.hpp>
#include <boost/lexical_cast.hpp>
-SimpleViscoelasticSpheresInteractionRecorder::SimpleViscoelasticSpheresInteractionRecorder (): DataRecorder(), interactionSphere(new SpheresContactGeometry), viscoelasticInteraction(new SimpleViscoelasticInteraction)
+SimpleViscoelasticSpheresInteractionRecorder::SimpleViscoelasticSpheresInteractionRecorder (): DataRecorder(), interactionSphere(new SpheresContactGeometry), viscoelasticInteraction(new ViscoelasticInteraction)
{
outputBase = "contacts";
interval=50;
@@ -58,7 +58,7 @@
if ( i->interactionPhysics->getClassIndex() != viscoelasticInteraction->getClassIndex() ) continue;
const SpheresContactGeometry* s = static_cast<SpheresContactGeometry*>(i->interactionGeometry.get());
- const SimpleViscoelasticInteraction* p = static_cast<SimpleViscoelasticInteraction*>(i->interactionPhysics.get());
+ const ViscoelasticInteraction* p = static_cast<ViscoelasticInteraction*>(i->interactionPhysics.get());
std::string outputFile = outputBase+lexical_cast<string>(i->getId1())+"-"+lexical_cast<string>(i->getId2())+".dat";
Modified: trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.hpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.hpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.hpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -9,16 +9,16 @@
#include <yade/core/DataRecorder.hpp>
#include <yade/pkg-dem/SpheresContactGeometry.hpp>
-#include <yade/pkg-dem/SimpleViscoelasticInteraction.hpp>
+#include <yade/pkg-dem/ViscoelasticInteraction.hpp>
#include <set>
-/// Save SpheresContactGeometry and SimpleViscoelasticInteraction of the
+/// Save SpheresContactGeometry and ViscoelasticInteraction of the
/// interaction between the body Id1 and the body Id2 into the file
/// outputBaseId1-Id2.
class SimpleViscoelasticSpheresInteractionRecorder : public DataRecorder {
private:
shared_ptr<SpheresContactGeometry> interactionSphere;
- shared_ptr<SimpleViscoelasticInteraction> viscoelasticInteraction;
+ shared_ptr<ViscoelasticInteraction> viscoelasticInteraction;
set<pair<int,int> > interaction_ids;
public :
Deleted: trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.cpp
===================================================================
--- trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.cpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.cpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -1,38 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2006 by Sergei Dorofeenko *
-* sega@xxxxxxxxxxxxxxxx *
-* *
-* 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 "GLDrawSimpleViscoelasticInteraction.hpp"
-#include <yade/pkg-dem/SimpleViscoelasticInteraction.hpp>
-#include<yade/lib-opengl/OpenGLWrapper.hpp>
-
-
-void GLDrawSimpleViscoelasticInteraction::go(
- const shared_ptr<InteractionPhysics>& ip,
- const shared_ptr<Interaction>&,
- const shared_ptr<Body>& b1,
- const shared_ptr<Body>& b2,
- bool wireFrame)
-{
- SimpleViscoelasticInteraction* p = static_cast<SimpleViscoelasticInteraction*>(ip.get());
- Vector3r mid = 0.5*(b1->physicalParameters->se3.position+b2->physicalParameters->se3.position);
- glTranslatev(mid);
- glColor3(1.0,0.0,0.0);
-
- glPushMatrix();
- glRasterPos2i(0,0);
- std::string str;
- str = std::string(" kn=") + boost::lexical_cast<std::string>((float)(p->kn))
- + std::string(" cn=") + boost::lexical_cast<std::string>((float)(p->cn))
- + std::string(" ks=") + boost::lexical_cast<std::string>((float)(p->ks))
- + std::string(" cs=") + boost::lexical_cast<std::string>((float)(p->cs));
- for(unsigned int i=0;i<str.length();i++)
- glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, str[i]);
- glPopMatrix();
-}
-
-YADE_PLUGIN();
Deleted: trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.hpp
===================================================================
--- trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.hpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.hpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -1,25 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2006 by Sergei Dorofeenko *
-* sega@xxxxxxxxxxxxxxxx *
-* *
-* 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. *
-*************************************************************************/
-
-#pragma once
-
-#include <yade/pkg-common/GLDrawFunctors.hpp>
-
-class GLDrawSimpleViscoelasticInteraction : public GLDrawInteractionPhysicsFunctor
-{
- public :
- virtual void go(const shared_ptr<InteractionPhysics>&,const shared_ptr<Interaction>&,const shared_ptr<Body>&,const shared_ptr<Body>&,bool wireFrame);
-
- RENDERS(SimpleViscoelasticInteraction);
- REGISTER_CLASS_NAME(GLDrawSimpleViscoelasticInteraction);
- REGISTER_BASE_CLASS_NAME(GLDrawInteractionPhysicsFunctor);
-};
-
-REGISTER_SERIALIZABLE(GLDrawSimpleViscoelasticInteraction);
-
-
Copied: trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp (from rev 1660, trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.cpp)
===================================================================
--- trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.cpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -0,0 +1,38 @@
+/*************************************************************************
+* Copyright (C) 2006 by Sergei Dorofeenko *
+* sega@xxxxxxxxxxxxxxxx *
+* *
+* 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 "GLDrawViscoelasticInteraction.hpp"
+#include <yade/pkg-dem/ViscoelasticInteraction.hpp>
+#include<yade/lib-opengl/OpenGLWrapper.hpp>
+
+
+void GLDrawViscoelasticInteraction::go(
+ const shared_ptr<InteractionPhysics>& ip,
+ const shared_ptr<Interaction>&,
+ const shared_ptr<Body>& b1,
+ const shared_ptr<Body>& b2,
+ bool wireFrame)
+{
+ ViscoelasticInteraction* p = static_cast<ViscoelasticInteraction*>(ip.get());
+ Vector3r mid = 0.5*(b1->physicalParameters->se3.position+b2->physicalParameters->se3.position);
+ glTranslatev(mid);
+ glColor3(1.0,0.0,0.0);
+
+ glPushMatrix();
+ glRasterPos2i(0,0);
+ std::string str;
+ str = std::string(" kn=") + boost::lexical_cast<std::string>((float)(p->kn))
+ + std::string(" cn=") + boost::lexical_cast<std::string>((float)(p->cn))
+ + std::string(" ks=") + boost::lexical_cast<std::string>((float)(p->ks))
+ + std::string(" cs=") + boost::lexical_cast<std::string>((float)(p->cs));
+ for(unsigned int i=0;i<str.length();i++)
+ glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, str[i]);
+ glPopMatrix();
+}
+
+YADE_PLUGIN();
Property changes on: trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.hpp (from rev 1660, trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.hpp)
===================================================================
--- trunk/pkg/dem/RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.hpp 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.hpp 2009-02-09 17:03:36 UTC (rev 1661)
@@ -0,0 +1,25 @@
+/*************************************************************************
+* Copyright (C) 2006 by Sergei Dorofeenko *
+* sega@xxxxxxxxxxxxxxxx *
+* *
+* 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. *
+*************************************************************************/
+
+#pragma once
+
+#include <yade/pkg-common/GLDrawFunctors.hpp>
+
+class GLDrawViscoelasticInteraction : public GLDrawInteractionPhysicsFunctor
+{
+ public :
+ virtual void go(const shared_ptr<InteractionPhysics>&,const shared_ptr<Interaction>&,const shared_ptr<Body>&,const shared_ptr<Body>&,bool wireFrame);
+
+ RENDERS(ViscoelasticInteraction);
+ REGISTER_CLASS_NAME(GLDrawViscoelasticInteraction);
+ REGISTER_BASE_CLASS_NAME(GLDrawInteractionPhysicsFunctor);
+};
+
+REGISTER_SERIALIZABLE(GLDrawViscoelasticInteraction);
+
+
Property changes on: trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.hpp
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/pkg/dem/SConscript
===================================================================
--- trunk/pkg/dem/SConscript 2009-02-08 22:57:07 UTC (rev 1660)
+++ trunk/pkg/dem/SConscript 2009-02-09 17:03:36 UTC (rev 1661)
@@ -698,7 +698,7 @@
'SimpleViscoelasticRelationships',
'SimpleViscoelasticContactLaw',
'SimpleViscoelasticBodyParameters',
- 'SimpleViscoelasticInteraction',
+ 'ViscoelasticInteraction',
'PhysicalActionVectorVector',
'InteractionVecSet',
'BodyRedirectionVector',
@@ -1082,23 +1082,24 @@
,['DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.cpp']
,LIBS=env['LIBS']+['RigidBodyParameters'])
- ,env.SharedLibrary('SimpleViscoelasticInteraction'
- ,['DataClass/InteractionPhysics/SimpleViscoelasticInteraction.cpp'])
+ ,env.SharedLibrary('ViscoelasticInteraction'
+ ,['DataClass/InteractionPhysics/ViscoelasticInteraction.cpp']
+ ,LIBS=env['LIBS']+['ElasticContactInteraction'])
- ,env.SharedLibrary('GLDrawSimpleViscoelasticInteraction'
- ,['RenderingEngine/GLDrawSimpleViscoelasticInteraction/GLDrawSimpleViscoelasticInteraction.cpp']
- ,LIBS=env['LIBS']+['yade-opengl','SimpleViscoelasticInteraction'])
+ ,env.SharedLibrary('GLDrawViscoelasticInteraction'
+ ,['RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp']
+ ,LIBS=env['LIBS']+['yade-opengl','ViscoelasticInteraction'])
,env.SharedLibrary('SimpleViscoelasticRelationships'
,['Engine/EngineUnit/SimpleViscoelasticRelationships.cpp']
,LIBS=env['LIBS']+['SimpleViscoelasticBodyParameters'
- ,'SimpleViscoelasticInteraction'
+ ,'ViscoelasticInteraction'
,'SpheresContactGeometry'
])
,env.SharedLibrary('SimpleViscoelasticContactLaw'
,['Engine/StandAloneEngine/SimpleViscoelasticContactLaw.cpp']
- ,LIBS=env['LIBS']+['SimpleViscoelasticInteraction'
+ ,LIBS=env['LIBS']+['ViscoelasticInteraction'
,'SimpleViscoelasticBodyParameters'
,'SpheresContactGeometry'
,'Force'
@@ -1124,7 +1125,7 @@
,env.SharedLibrary('SimpleViscoelasticSpheresInteractionRecorder'
,['Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp']
- ,LIBS=env['LIBS']+['SpheresContactGeometry','SimpleViscoelasticInteraction'])
+ ,LIBS=env['LIBS']+['SpheresContactGeometry','ViscoelasticInteraction'])
,env.SharedLibrary('RigidBodyRecorder'
,['Engine/StandAloneEngine/RigidBodyRecorder.cpp']
@@ -1139,7 +1140,7 @@
,'SimpleViscoelasticRelationships'
,'SimpleViscoelasticContactLaw'
,'SimpleViscoelasticBodyParameters'
- ,'SimpleViscoelasticInteraction'
+ ,'ViscoelasticInteraction'
,'SimpleViscoelasticSpheresInteractionRecorder'
,'GravityEngines'
,'BodyRedirectionVector'
