yade-dev team mailing list archive

Thread
Date
[svn] r1821 - trunk/pkg/dem/Engine/StandAloneEngine

To: yade-dev@xxxxxxxxxxxxxxxxxxx
From: chareyre at BerliOS <chareyre@xxxxxxxxxxxxxxx>
Date: Mon, 29 Jun 2009 10:47:31 +0200
Author: chareyre
Date: 2009-06-29 10:47:31 +0200 (Mon, 29 Jun 2009)
New Revision: 1821

Modified:
   trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.hpp
Log:
Remove useless dependency. 




Modified: trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp	2009-06-26 22:39:15 UTC (rev 1820)
+++ trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp	2009-06-29 08:47:31 UTC (rev 1821)
@@ -10,7 +10,7 @@
 #include<yade/pkg-dem/BodyMacroParameters.hpp>
 #include<yade/pkg-dem/ElasticContactInteraction.hpp>
 #include<yade/pkg-dem/SpheresContactGeometry.hpp>
-#include<yade/pkg-dem/MacroMicroElasticRelationships.hpp>
+//#include<yade/pkg-dem/MacroMicroElasticRelationships.hpp>
 #include<yade/core/Interaction.hpp>
 #include<yade/core/MetaBody.hpp>
 #include<yade/pkg-common/Sphere.hpp>
@@ -18,7 +18,7 @@
 CREATE_LOGGER(GlobalStiffnessTimeStepper);
 YADE_PLUGIN("GlobalStiffnessTimeStepper");
 
-GlobalStiffnessTimeStepper::GlobalStiffnessTimeStepper() : TimeStepper() , sdecContactModel(new MacroMicroElasticRelationships)
+GlobalStiffnessTimeStepper::GlobalStiffnessTimeStepper() : TimeStepper()
 {
 //cerr << "GlobalStiffnessTimeStepper()"  << endl;
 	sdecGroupMask = 1;

Modified: trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.hpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.hpp	2009-06-26 22:39:15 UTC (rev 1820)
+++ trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.hpp	2009-06-29 08:47:31 UTC (rev 1821)
@@ -19,7 +19,7 @@
 
 class Interaction;
 class BodyContainer;
-class MacroMicroElasticRelationships;
+//class MacroMicroElasticRelationships;
 class MetaBody;
 
 class GlobalStiffnessTimeStepper : public TimeStepper
@@ -32,7 +32,7 @@
 		Real		newDt, previousDt;
 		bool		computedSomething,
 				computedOnce;
-		shared_ptr<MacroMicroElasticRelationships> sdecContactModel;
+		//shared_ptr<MacroMicroElasticRelationships> sdecContactModel;
 
 		void findTimeStepFromBody(const shared_ptr<Body>& body, MetaBody * ncb);
 		void findTimeStepFromInteraction(const shared_ptr<Interaction>& , shared_ptr<BodyContainer>&);