yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #01558
[svn] r1896 - in trunk: lib pkg/dem/DataClass/InteractionGeometry pkg/dem/Engine/EngineUnit pkg/dem/Engine/StandAloneEngine pkg/dem/RenderingEngine pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry pkg/mass-spring/PreProcessor
Author: eudoxos
Date: 2009-07-28 15:46:19 +0200 (Tue, 28 Jul 2009)
New Revision: 1896
Removed:
trunk/pkg/dem/DataClass/InteractionGeometry/SDECLinkGeometry.cpp
trunk/pkg/dem/DataClass/InteractionGeometry/SDECLinkGeometry.hpp
trunk/pkg/dem/RenderingEngine/GLDrawSDECLinkGeometry/
Modified:
trunk/lib/SConscript
trunk/pkg/dem/Engine/EngineUnit/CL1Relationships.cpp
trunk/pkg/dem/Engine/EngineUnit/CohesiveFrictionalRelationships.cpp
trunk/pkg/dem/Engine/EngineUnit/MacroMicroElasticRelationships.cpp
trunk/pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.cpp
trunk/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.cpp
trunk/pkg/mass-spring/PreProcessor/HangingCloth.cpp
Log:
Remove SDECLinkGeometry, replaced by SpheresContactGeometry at a few places. Not checked for functionality. This avoid many warnings.
Modified: trunk/lib/SConscript
===================================================================
--- trunk/lib/SConscript 2009-07-28 13:15:09 UTC (rev 1895)
+++ trunk/lib/SConscript 2009-07-28 13:46:19 UTC (rev 1896)
@@ -48,9 +48,10 @@
# since the generated header is #include'd "...", it looks for it in the original dir
# no idea why this _does_ work with gui/qt3. Go figure.
CPPPATH=env['CPPPATH']+['${TARGET.dir}'],
+ LIBS=env['LIBS']+['GL']
)
if 'YADE_OPENGL' in env['CPPDEFINES']:
- yadeStaticOrSharedLib('yade-opengl',env.Combine('yade-opengl.cpp',['opengl/FpsTracker.cpp','opengl/GLTextLabel.cpp','opengl/GLWindow.cpp','opengl/GLWindowsManager.cpp','opengl/GLUtils.cpp']),LIBS=env['LIBS']+['glut','$QGLVIEWER_LIB']),
+ yadeStaticOrSharedLib('yade-opengl',env.Combine('yade-opengl.cpp',['opengl/FpsTracker.cpp','opengl/GLTextLabel.cpp','opengl/GLWindow.cpp','opengl/GLWindowsManager.cpp','opengl/GLUtils.cpp']),LIBS=env['LIBS']+['glut','GL','$QGLVIEWER_LIB']),
yadeStaticOrSharedLib('yade-support',env.Combine('yade-support.cpp',[
'base/yadeWm3Extra.cpp',
Deleted: trunk/pkg/dem/DataClass/InteractionGeometry/SDECLinkGeometry.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionGeometry/SDECLinkGeometry.cpp 2009-07-28 13:15:09 UTC (rev 1895)
+++ trunk/pkg/dem/DataClass/InteractionGeometry/SDECLinkGeometry.cpp 2009-07-28 13:46:19 UTC (rev 1896)
@@ -1,22 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2004 by Olivier Galizzi *
-* olivier.galizzi@xxxxxxx *
-* Copyright (C) 2004 by Janek Kozicki *
-* cosurgi@xxxxxxxxxx *
-* *
-* 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 "SDECLinkGeometry.hpp"
-
-SDECLinkGeometry::SDECLinkGeometry()
-{
- createIndex();
-}
-
-SDECLinkGeometry::~SDECLinkGeometry()
-{
-}
-
-YADE_PLUGIN("SDECLinkGeometry");
\ No newline at end of file
Deleted: trunk/pkg/dem/DataClass/InteractionGeometry/SDECLinkGeometry.hpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionGeometry/SDECLinkGeometry.hpp 2009-07-28 13:15:09 UTC (rev 1895)
+++ trunk/pkg/dem/DataClass/InteractionGeometry/SDECLinkGeometry.hpp 2009-07-28 13:46:19 UTC (rev 1896)
@@ -1,37 +0,0 @@
-/*************************************************************************
-* Copyright (C) 2004 by Olivier Galizzi *
-* olivier.galizzi@xxxxxxx *
-* *
-* 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 <vector>
-#include<yade/core/InteractionGeometry.hpp>
-#include <Wm3Vector3.h>
-#include<yade/lib-base/yadeWm3.hpp>
-#include <Wm3Quaternion.h>
-
-
-class __attribute__((__deprecated__)) SDECLinkGeometry : public InteractionGeometry
-{
- public :
- SDECLinkGeometry();
- virtual ~SDECLinkGeometry();
-
- Real radius1 // FIXME : lots of stuff is the same as in SpheresContactGeometry, so it should inherit from it.
- ,radius2;
-
- Vector3r normal; // new unit normal of the contact plane.
- REGISTER_ATTRIBUTES(InteractionGeometry,(radius1)(radius2));
- REGISTER_CLASS_NAME(SDECLinkGeometry);
- REGISTER_BASE_CLASS_NAME(InteractionGeometry);
-
- REGISTER_CLASS_INDEX(SDECLinkGeometry,InteractionGeometry);
-};
-
-REGISTER_SERIALIZABLE(SDECLinkGeometry);
-
-
Modified: trunk/pkg/dem/Engine/EngineUnit/CL1Relationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/CL1Relationships.cpp 2009-07-28 13:15:09 UTC (rev 1895)
+++ trunk/pkg/dem/Engine/EngineUnit/CL1Relationships.cpp 2009-07-28 13:46:19 UTC (rev 1896)
@@ -9,8 +9,8 @@
#include"CL1Relationships.hpp"
#include<yade/pkg-dem/SpheresContactGeometry.hpp>
#include<yade/pkg-dem/ContactLaw1Interaction.hpp>
-#include<yade/pkg-dem/SDECLinkGeometry.hpp> // FIXME - I can't dispatch by SDECLinkGeometry <-> SpheresContactGeometry !!?
-#include<yade/pkg-dem/SDECLinkPhysics.hpp> // FIXME
+// #include<yade/pkg-dem/SDECLinkGeometry.hpp> // FIXME - I can't dispatch by SDECLinkGeometry <-> SpheresContactGeometry !!?
+// #include<yade/pkg-dem/SDECLinkPhysics.hpp> // FIXME
#include<yade/pkg-dem/CohesiveFrictionalBodyParameters.hpp>
#include<yade/core/Omega.hpp>
#include<yade/core/MetaBody.hpp>
@@ -173,6 +173,7 @@
}
}
+#if 0
else // this is PERMANENT LINK because previous dynamic_cast failed, dispatcher should do this job
{
SDECLinkGeometry* sdecLinkGeometry = dynamic_cast<SDECLinkGeometry*>(interaction->interactionGeometry.get());
@@ -185,5 +186,6 @@
linkPhysics->equilibriumDistance = linkPhysics->initialEquilibriumDistance;
}
}
+#endif
};
-YADE_PLUGIN("CL1Relationships");
\ No newline at end of file
+YADE_PLUGIN("CL1Relationships");
Modified: trunk/pkg/dem/Engine/EngineUnit/CohesiveFrictionalRelationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/CohesiveFrictionalRelationships.cpp 2009-07-28 13:15:09 UTC (rev 1895)
+++ trunk/pkg/dem/Engine/EngineUnit/CohesiveFrictionalRelationships.cpp 2009-07-28 13:46:19 UTC (rev 1896)
@@ -9,8 +9,8 @@
#include"CohesiveFrictionalRelationships.hpp"
#include<yade/pkg-dem/SpheresContactGeometry.hpp>
#include<yade/pkg-dem/CohesiveFrictionalContactInteraction.hpp>
-#include<yade/pkg-dem/SDECLinkGeometry.hpp> // FIXME - I can't dispatch by SDECLinkGeometry <-> SpheresContactGeometry !!?
-#include<yade/pkg-dem/SDECLinkPhysics.hpp> // FIXME
+//#include<yade/pkg-dem/SDECLinkGeometry.hpp> // FIXME - I can't dispatch by SDECLinkGeometry <-> SpheresContactGeometry !!?
+//#include<yade/pkg-dem/SDECLinkPhysics.hpp> // FIXME
#include<yade/pkg-dem/CohesiveFrictionalBodyParameters.hpp>
#include<yade/core/Omega.hpp>
#include<yade/core/MetaBody.hpp>
@@ -179,6 +179,7 @@
}
}
+#if 0
else // this is PERMANENT LINK because previous dynamic_cast failed, dispatcher should do this job
{
SDECLinkGeometry* sdecLinkGeometry = dynamic_cast<SDECLinkGeometry*>(interaction->interactionGeometry.get());
@@ -191,5 +192,6 @@
linkPhysics->equilibriumDistance = linkPhysics->initialEquilibriumDistance;
}
}
+#endif
};
-YADE_PLUGIN("CohesiveFrictionalRelationships");
\ No newline at end of file
+YADE_PLUGIN("CohesiveFrictionalRelationships");
Modified: trunk/pkg/dem/Engine/EngineUnit/MacroMicroElasticRelationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/MacroMicroElasticRelationships.cpp 2009-07-28 13:15:09 UTC (rev 1895)
+++ trunk/pkg/dem/Engine/EngineUnit/MacroMicroElasticRelationships.cpp 2009-07-28 13:46:19 UTC (rev 1896)
@@ -11,8 +11,8 @@
#include"MacroMicroElasticRelationships.hpp"
#include<yade/pkg-dem/SpheresContactGeometry.hpp>
#include<yade/pkg-dem/ElasticContactInteraction.hpp>
-#include<yade/pkg-dem/SDECLinkGeometry.hpp> // FIXME - I can't dispatch by SDECLinkGeometry <-> SpheresContactGeometry !!?
-#include<yade/pkg-dem/SDECLinkPhysics.hpp> // FIXME
+//#include<yade/pkg-dem/SDECLinkGeometry.hpp> // FIXME - I can't dispatch by SDECLinkGeometry <-> SpheresContactGeometry !!?
+//#include<yade/pkg-dem/SDECLinkPhysics.hpp> // FIXME
#include<yade/pkg-dem/BodyMacroParameters.hpp>
#include<yade/pkg-dem/Tetra.hpp>
#include<yade/core/Omega.hpp>
@@ -111,6 +111,7 @@
}
else // this is PERMANENT LINK because previous dynamic_cast failed, dispatcher should do this job
{
+#if 0
SDECLinkGeometry* sdecLinkGeometry = dynamic_cast<SDECLinkGeometry*>(interaction->interactionGeometry.get());
if (sdecLinkGeometry)
{
@@ -120,7 +121,9 @@
linkPhysics->ks = linkPhysics->initialKs;
linkPhysics->equilibriumDistance = linkPhysics->initialEquilibriumDistance;
}
- else if(dynamic_cast<TetraBang*>(interaction->interactionGeometry.get()) && !interaction->interactionPhysics){
+ else
+#endif
+ if(dynamic_cast<TetraBang*>(interaction->interactionGeometry.get()) && !interaction->interactionPhysics){
// TetraLaw doesn't use InteractionPhysics anyway, it accesses bodies' parameters directly
interaction->interactionPhysics=shared_ptr<InteractionPhysics>(new InteractionPhysics);
}
Modified: trunk/pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.cpp 2009-07-28 13:15:09 UTC (rev 1895)
+++ trunk/pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.cpp 2009-07-28 13:46:19 UTC (rev 1896)
@@ -10,7 +10,7 @@
#include<yade/pkg-dem/BodyMacroParameters.hpp>
#include<yade/pkg-dem/SpheresContactGeometry.hpp>
#include<yade/pkg-dem/ElasticContactInteraction.hpp>
-#include<yade/pkg-dem/SDECLinkGeometry.hpp>
+//#include<yade/pkg-dem/SDECLinkGeometry.hpp>
#include<yade/pkg-dem/SDECLinkPhysics.hpp>
@@ -53,7 +53,7 @@
BodyMacroParameters* de1 = YADE_CAST<BodyMacroParameters*>((*bodies)[id1]->physicalParameters.get());
BodyMacroParameters* de2 = YADE_CAST<BodyMacroParameters*>((*bodies)[id2]->physicalParameters.get());
SDECLinkPhysics* currentContactPhysics = YADE_CAST<SDECLinkPhysics*>(contact2->interactionPhysics.get());
- SDECLinkGeometry* currentContactGeometry = YADE_CAST<SDECLinkGeometry*>(contact2->interactionGeometry.get());
+ SpheresContactGeometry* currentContactGeometry = YADE_CAST<SpheresContactGeometry*>(contact2->interactionGeometry.get());
if((!currentContactPhysics)||(!currentContactGeometry)) continue;
Real un = currentContactPhysics->equilibriumDistance-(de2->se3.position-de1->se3.position).Length();
@@ -230,4 +230,4 @@
}
-YADE_PLUGIN("ElasticCohesiveLaw");
\ No newline at end of file
+YADE_PLUGIN("ElasticCohesiveLaw");
Modified: trunk/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.cpp
===================================================================
--- trunk/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.cpp 2009-07-28 13:15:09 UTC (rev 1895)
+++ trunk/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.cpp 2009-07-28 13:46:19 UTC (rev 1896)
@@ -27,8 +27,10 @@
{
SpheresContactGeometry* sc = static_cast<SpheresContactGeometry*>(ig.get());
- const Se3r& se31=b1->physicalParameters->dispSe3,se32=b2->physicalParameters->dispSe3;
- const Vector3r& pos1=se31.position,pos2=se32.position;
+ #if 0
+ const Se3r& se31=b1->physicalParameters->dispSe3,se32=b2->physicalParameters->dispSe3;
+ const Vector3r& pos1=se31.position,pos2=se32.position;
+ #endif
if(wireFrame)
{
Modified: trunk/pkg/mass-spring/PreProcessor/HangingCloth.cpp
===================================================================
--- trunk/pkg/mass-spring/PreProcessor/HangingCloth.cpp 2009-07-28 13:15:09 UTC (rev 1895)
+++ trunk/pkg/mass-spring/PreProcessor/HangingCloth.cpp 2009-07-28 13:46:19 UTC (rev 1896)
@@ -47,7 +47,7 @@
#include<yade/pkg-dem/ElasticContactLaw.hpp>
#include<yade/pkg-dem/MacroMicroElasticRelationships.hpp>
#include<yade/pkg-dem/BodyMacroParameters.hpp>
-#include<yade/pkg-dem/SDECLinkGeometry.hpp>
+//#include<yade/pkg-dem/SDECLinkGeometry.hpp>
#include<yade/pkg-dem/SDECLinkPhysics.hpp>
//#include<yade/pkg-common/MassSpringBody2RigidBodyLaw.hpp>
@@ -365,7 +365,7 @@
if ( a && b && as && bs && (a->se3.position - b->se3.position).Length() < (as->radius + bs->radius))
{
shared_ptr<Interaction> link(new Interaction( bodyA->getId() , bodyB->getId() ));
- shared_ptr<SDECLinkGeometry> geometry(new SDECLinkGeometry);
+ shared_ptr<SpheresContactGeometry> geometry(new SpheresContactGeometry);
shared_ptr<SDECLinkPhysics> physics(new SDECLinkPhysics);
geometry->radius1 = as->radius - fabs(as->radius - bs->radius)*0.5;
@@ -505,4 +505,4 @@
body->physicalParameters = physics;
}
-YADE_PLUGIN("HangingCloth");
\ No newline at end of file
+YADE_PLUGIN("HangingCloth");
