yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #03255
[Branch ~yade-dev/yade/trunk] Rev 1998: Get rid of physpas a geometricalshape relicts in non-attic code.
------------------------------------------------------------
revno: 1998
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-02-02 12:05:09 +0100
message:
Get rid of physpas a geometricalshape relicts in non-attic code.
removed:
core/InteractionSolver.hpp
added:
attic/core/
renamed:
core/GeometricalModel.cpp => attic/core/GeometricalModel.cpp
core/GeometricalModel.hpp => attic/core/GeometricalModel.hpp
core/PhysicalParameters.cpp => attic/core/PhysicalParameters.cpp
core/PhysicalParameters.hpp => attic/core/PhysicalParameters.hpp
modified:
SConstruct
core/Body.hpp
core/SConscript
pkg/common/RenderingEngine/GLDrawFunctors.hpp
pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.cpp
pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.hpp
pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp
pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp
pkg/dem/Engine/GlobalEngine/ContactLaw1.cpp
pkg/dem/Engine/GlobalEngine/ContactLaw1.hpp
pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp
pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp
pkg/dem/Engine/PartialEngine/HydraulicForceEngine.cpp
pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp
pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp
pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp
pkg/dem/PreProcessor/TriaxialTest.cpp
pkg/dem/PreProcessor/TriaxialTestWater.cpp
pkg/dem/meta/Shop.cpp
pkg/dem/meta/Shop.hpp
pkg/dem/meta/Tetra.hpp
py/_utils.cpp
--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.
=== modified file 'SConstruct'
--- SConstruct 2010-02-02 09:59:57 +0000
+++ SConstruct 2010-02-02 11:05:09 +0000
@@ -138,7 +138,7 @@
ListVariable('exclude','Yade components that will not be built','none',names=['gui','extra','common','dem','lattice','snow']),
EnumVariable('PGO','Whether to "gen"erate or "use" Profile-Guided Optimization','',['','gen','use'],{'no':'','0':'','false':''},1),
# OK, dummy prevents bug in scons: if one selects all, it says all in scons.config, but without quotes, which generates error.
- ListVariable('features','Optional features that are turned on','log4cxx,opengl,gts,openmp,vtk',names=['opengl','log4cxx','cgal','openmp','gts','vtk','geometricalmodel','physpar','python','eigen']),
+ ListVariable('features','Optional features that are turned on','log4cxx,opengl,gts,openmp,vtk',names=['opengl','log4cxx','cgal','openmp','gts','vtk','python','eigen']),
('jobs','Number of jobs to run at the same time (same as -j, but saved)',4,None,int),
#('extraModules', 'Extra directories with their own SConscript files (must be in-tree) (whitespace separated)',None,None,Split),
('buildPrefix','Where to create build-[version][variant] directory for intermediary files','..'),
=== added directory 'attic/core'
=== renamed file 'core/GeometricalModel.cpp' => 'attic/core/GeometricalModel.cpp'
=== renamed file 'core/GeometricalModel.hpp' => 'attic/core/GeometricalModel.hpp'
=== renamed file 'core/PhysicalParameters.cpp' => 'attic/core/PhysicalParameters.cpp'
=== renamed file 'core/PhysicalParameters.hpp' => 'attic/core/PhysicalParameters.hpp'
=== modified file 'core/Body.hpp'
--- core/Body.hpp 2010-02-02 09:59:57 +0000
+++ core/Body.hpp 2010-02-02 11:05:09 +0000
@@ -10,7 +10,6 @@
#pragma once
#include<iostream>
-#include"GeometricalModel.hpp"
#include"Shape.hpp"
#include"Bound.hpp"
#include"State.hpp"
=== removed file 'core/InteractionSolver.hpp'
--- core/InteractionSolver.hpp 2009-12-09 17:11:51 +0000
+++ core/InteractionSolver.hpp 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*************************************************************************
-* 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. *
-*************************************************************************/
-
-#pragma once
-
-#include "GlobalEngine.hpp"
-
-class InteractionSolver : public GlobalEngine
-{
- public :
- InteractionSolver() {};
- virtual ~InteractionSolver() {};
-
- REGISTER_CLASS_NAME(InteractionSolver);
- REGISTER_BASE_CLASS_NAME(GlobalEngine);
-};
-
-REGISTER_SERIALIZABLE(InteractionSolver);
-
=== modified file 'core/SConscript'
--- core/SConscript 2010-02-02 08:51:30 +0000
+++ core/SConscript 2010-02-02 11:05:09 +0000
@@ -35,7 +35,6 @@
'PartialEngine.cpp',
'FileGenerator.cpp',
'FrontEnd.cpp',
- 'GeometricalModel.cpp',
'Shape.cpp',
'Interaction.cpp',
'InteractionContainer.cpp',
@@ -54,7 +53,6 @@
'containers/InteractionVecMap.cpp',
'corePlugins.cpp'
]
- +(['PhysicalParameters.cpp'] if 'physpar' in env['features'] else [])
),
LIBS=env['LIBS']+[
'yade-support',
=== modified file 'pkg/common/RenderingEngine/GLDrawFunctors.hpp'
--- pkg/common/RenderingEngine/GLDrawFunctors.hpp 2009-12-18 09:48:16 +0000
+++ pkg/common/RenderingEngine/GLDrawFunctors.hpp 2010-02-02 11:05:09 +0000
@@ -6,15 +6,11 @@
#include<yade/lib-multimethods/FunctorWrapper.hpp>
#include<yade/core/Bound.hpp>
#include<yade/core/State.hpp>
-#ifdef YADE_GEOMETRICALMODEL
- #include<yade/core/GeometricalModel.hpp>
-#endif
#include<yade/core/Shape.hpp>
#include<yade/core/Functor.hpp>
#include<yade/core/InteractionGeometry.hpp>
#include<yade/core/Body.hpp>
#include<yade/core/InteractionPhysics.hpp>
-#include<yade/core/GeometricalModel.hpp>
#define RENDERS(name) public: virtual string renders() const { return #name;};
@@ -33,17 +29,6 @@
REGISTER_BASE_CLASS_NAME(Functor1D);
};
REGISTER_SERIALIZABLE(GlBoundFunctor);
-#ifdef YADE_GEOMETRICALMODEL
- class GlGeometricalModelFunctor: public Functor1D<void,TYPELIST_3(const shared_ptr<GeometricalModel>&, const shared_ptr<State>&,bool)>{
- public:
- virtual ~GlGeometricalModelFunctor() {};
- virtual string renders() const { std::cerr<<"Unregistered gldraw class.\n"; throw; };
- virtual void initgl(){/*WARNING: it must deal with static members, because it is called from another instance!*/};
- REGISTER_CLASS_NAME(GlGeometricalModelFunctor);
- REGISTER_BASE_CLASS_NAME(Functor1D);
- };
- REGISTER_SERIALIZABLE(GlGeometricalModelFunctor);
-#endif
class GlShapeFunctor: public Functor1D<void, TYPELIST_4(const shared_ptr<Shape>&, const shared_ptr<State>&,bool,const GLViewInfo&)>{
public:
@@ -75,16 +60,6 @@
};
REGISTER_SERIALIZABLE(GlInteractionPhysicsFunctor);
-#ifdef YADE_GEOMETRICALMODEL
- class GLDrawShadowVolumeFunctor: public Functor1D<void, TYPELIST_3(const shared_ptr<GeometricalModel>&, const shared_ptr<State>&, const Vector3r&)>{
- public:
- virtual string renders() const { std::cerr<<"Unregistered gldraw class.\n"; throw; };
- REGISTER_CLASS_NAME(GLDrawShadowVolumeFunctor);
- REGISTER_BASE_CLASS_NAME(Functor1D);
- };
- REGISTER_SERIALIZABLE(GLDrawShadowVolumeFunctor);
-#endif
-
class GlStateFunctor: public Functor1D<void,TYPELIST_1(const shared_ptr<State>&/*, draw parameters: color, scale, given from OpenGLRenderer, or sth.... */)>{
public :
virtual ~GlStateFunctor() {};
=== modified file 'pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.cpp'
--- pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.cpp 2010-01-10 09:09:32 +0000
+++ pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.cpp 2010-02-02 11:05:09 +0000
@@ -22,8 +22,6 @@
#include <Wm3Vector3.h>
#include <yade/lib-base/yadeWm3.hpp>
-#include <yade/core/GeometricalModel.hpp>
-
#include <iostream>
#include <fstream>
@@ -31,7 +29,7 @@
using namespace std;
-CapillaryCohesiveLaw::CapillaryCohesiveLaw() : InteractionSolver()
+CapillaryCohesiveLaw::CapillaryCohesiveLaw() : GlobalEngine()
{
sdecGroupMask=1;
=== modified file 'pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.hpp'
--- pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.hpp 2009-12-11 18:10:19 +0000
+++ pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.hpp 2010-02-02 11:05:09 +0000
@@ -10,7 +10,7 @@
#pragma once
-#include <yade/core/InteractionSolver.hpp>
+#include <yade/core/GlobalEngine.hpp>
#include <set>
#include <boost/tuple/tuple.hpp>
@@ -68,7 +68,7 @@
};
-class CapillaryCohesiveLaw : public InteractionSolver
+class CapillaryCohesiveLaw : public GlobalEngine
{
public :
int sdecGroupMask;
@@ -81,10 +81,10 @@
CapillaryCohesiveLaw();
void action(Scene * ncb);
- REGISTER_ATTRIBUTES(InteractionSolver,(sdecGroupMask)(CapillaryPressure)(fusionDetection)(binaryFusion));
+ REGISTER_ATTRIBUTES(GlobalEngine,(sdecGroupMask)(CapillaryPressure)(fusionDetection)(binaryFusion));
virtual void postProcessAttributes(bool deserializing);
REGISTER_CLASS_NAME(CapillaryCohesiveLaw);
- REGISTER_BASE_CLASS_NAME(InteractionSolver);
+ REGISTER_BASE_CLASS_NAME(GlobalEngine);
};
=== modified file 'pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp'
--- pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp 2010-01-21 14:02:40 +0000
+++ pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp 2010-02-02 11:05:09 +0000
@@ -16,7 +16,7 @@
Vector3r translation_vect_ ( 0.10,0,0 );
-CohesiveFrictionalContactLaw::CohesiveFrictionalContactLaw() : InteractionSolver()
+CohesiveFrictionalContactLaw::CohesiveFrictionalContactLaw() : GlobalEngine()
{
sdecGroupMask=1;
momentRotationLaw = true;
=== modified file 'pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp'
--- pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp 2009-12-04 23:07:34 +0000
+++ pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp 2010-02-02 11:05:09 +0000
@@ -8,13 +8,13 @@
#pragma once
-#include<yade/core/InteractionSolver.hpp>
+#include<yade/core/GlobalEngine.hpp>
#include <set>
#include <boost/tuple/tuple.hpp>
-class CohesiveFrictionalContactLaw : public InteractionSolver
+class CohesiveFrictionalContactLaw : public GlobalEngine
{
/// Attributes
public :
@@ -27,9 +27,9 @@
CohesiveFrictionalContactLaw();
void action(Scene*);
- REGISTER_ATTRIBUTES(InteractionSolver,(sdecGroupMask)(momentRotationLaw)(erosionActivated)(detectBrokenBodies)(always_use_moment_law)(shear_creep)(twist_creep)(creep_viscosity));
+ REGISTER_ATTRIBUTES(GlobalEngine,(sdecGroupMask)(momentRotationLaw)(erosionActivated)(detectBrokenBodies)(always_use_moment_law)(shear_creep)(twist_creep)(creep_viscosity));
REGISTER_CLASS_NAME(CohesiveFrictionalContactLaw);
- REGISTER_BASE_CLASS_NAME(InteractionSolver);
+ REGISTER_BASE_CLASS_NAME(GlobalEngine);
};
REGISTER_SERIALIZABLE(CohesiveFrictionalContactLaw);
=== modified file 'pkg/dem/Engine/GlobalEngine/ContactLaw1.cpp'
--- pkg/dem/Engine/GlobalEngine/ContactLaw1.cpp 2010-02-01 15:20:54 +0000
+++ pkg/dem/Engine/GlobalEngine/ContactLaw1.cpp 2010-02-02 11:05:09 +0000
@@ -19,7 +19,7 @@
Vector3r translation_vect (0.10,0,0);
-ContactLaw1::ContactLaw1() : InteractionSolver()
+ContactLaw1::ContactLaw1() : GlobalEngine()
{
sdecGroupMask=1;
momentRotationLaw = true;
=== modified file 'pkg/dem/Engine/GlobalEngine/ContactLaw1.hpp'
--- pkg/dem/Engine/GlobalEngine/ContactLaw1.hpp 2009-12-07 19:41:08 +0000
+++ pkg/dem/Engine/GlobalEngine/ContactLaw1.hpp 2010-02-02 11:05:09 +0000
@@ -8,7 +8,7 @@
#pragma once
-#include<yade/core/InteractionSolver.hpp>
+#include<yade/core/GlobalEngine.hpp>
#include <set>
#include <boost/tuple/tuple.hpp>
@@ -26,7 +26,7 @@
*/
-class ContactLaw1 : public InteractionSolver
+class ContactLaw1 : public GlobalEngine
{
/// Attributes
public :
@@ -37,9 +37,9 @@
ContactLaw1();
void action(Scene*);
- REGISTER_ATTRIBUTES(InteractionSolver,(sdecGroupMask)(momentRotationLaw)(coeff_dech)(momentAlwaysElastic));
+ REGISTER_ATTRIBUTES(GlobalEngine,(sdecGroupMask)(momentRotationLaw)(coeff_dech)(momentAlwaysElastic));
REGISTER_CLASS_NAME(ContactLaw1);
- REGISTER_BASE_CLASS_NAME(InteractionSolver);
+ REGISTER_BASE_CLASS_NAME(GlobalEngine);
};
REGISTER_SERIALIZABLE(ContactLaw1);
=== modified file 'pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp'
--- pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp 2010-01-21 07:53:17 +0000
+++ pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp 2010-02-02 11:05:09 +0000
@@ -16,7 +16,7 @@
YADE_PLUGIN((Law2_ScGeom_FrictPhys_Basic)(Law2_Dem3DofGeom_FrictPhys_Basic)(ElasticContactLaw)(Law2_Dem6DofGeom_FrictPhys_Beam));
-ElasticContactLaw::ElasticContactLaw() : InteractionSolver()
+ElasticContactLaw::ElasticContactLaw() : GlobalEngine()
{
sdecGroupMask=1;
momentRotationLaw = true;
=== modified file 'pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp'
--- pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp 2010-02-01 15:20:54 +0000
+++ pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp 2010-02-02 11:05:09 +0000
@@ -8,7 +8,7 @@
#pragma once
-#include<yade/core/InteractionSolver.hpp>
+#include<yade/core/GlobalEngine.hpp>
// only to see whether SCG_SHEAR is defined, may be removed in the future
#include<yade/pkg-dem/ScGeom.hpp>
@@ -70,7 +70,7 @@
};
REGISTER_SERIALIZABLE(Law2_Dem6DofGeom_FrictPhys_Beam);
-class ElasticContactLaw : public InteractionSolver
+class ElasticContactLaw : public GlobalEngine
{
/// Attributes
private :
@@ -88,13 +88,13 @@
shared_ptr<Law2_ScGeom_FrictPhys_Basic> functor;
- REGISTER_ATTRIBUTES(InteractionSolver,(sdecGroupMask)(momentRotationLaw)(neverErase)
+ REGISTER_ATTRIBUTES(GlobalEngine,(sdecGroupMask)(momentRotationLaw)(neverErase)
#ifdef SCG_SHEAR
(useShear)
#endif
);
REGISTER_CLASS_NAME(ElasticContactLaw);
- REGISTER_BASE_CLASS_NAME(InteractionSolver);
+ REGISTER_BASE_CLASS_NAME(GlobalEngine);
};
REGISTER_SERIALIZABLE(ElasticContactLaw);
=== modified file 'pkg/dem/Engine/PartialEngine/HydraulicForceEngine.cpp'
--- pkg/dem/Engine/PartialEngine/HydraulicForceEngine.cpp 2009-12-25 14:46:48 +0000
+++ pkg/dem/Engine/PartialEngine/HydraulicForceEngine.cpp 2010-02-02 11:05:09 +0000
@@ -77,7 +77,6 @@
{
ncb->forces.addForce(b->getId(),Vector3r(0,5,0));
}
- // else b->geometricalModel->diffuseColor= Vector3r(0.5,0.9,0.3);
}
}
}
=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp'
--- pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp 2010-02-02 09:59:57 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.cpp 2010-02-02 11:05:09 +0000
@@ -74,8 +74,6 @@
{
const shared_ptr<Body>& b = *bi;
- //int geometryIndex = b->geometricalModel->getClassIndex();
-
if ( b->isDynamic )
{
const Vector3r& v = b->state->vel;
=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp'
--- pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp 2010-02-02 09:59:57 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialStressController.cpp 2010-02-02 11:05:09 +0000
@@ -320,7 +320,6 @@
if ( ( *bi )->isDynamic )
{
( static_cast<Sphere*> ( ( *bi )->shape.get() ) )->radius *= multiplier;
- //( static_cast<SphereModel*> ( ( *bi )->geometricalModel.get() ) )->radius *= multiplier;
(*bi)->state->mass*=pow(multiplier,3);
(*bi)->state->inertia*=pow(multiplier,5);
=== modified file 'pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp'
--- pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp 2010-02-02 09:59:57 +0000
+++ pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp 2010-02-02 11:05:09 +0000
@@ -320,14 +320,6 @@
iSphere->wire = false;
body->shape = iSphere;
-// #ifdef YADE_GEOMETRICALMODEL
-// gSphere->radius = radius;
-// // gSphere->diffuseColor = ((int)(position[0]*400.0))%2?Vector3r(0.7,0.7,0.7):Vector3r(0.45,0.45,0.45);
-// gSphere->diffuseColor = spheresColor;
-// gSphere->wire = false;
-// gSphere->shadowCaster = true;
-// body->geometricalModel = gSphere;
-// #endif
body->bound = aabb;
body->material = physics;
}
=== modified file 'pkg/dem/PreProcessor/TriaxialTest.cpp'
--- pkg/dem/PreProcessor/TriaxialTest.cpp 2010-02-02 09:59:57 +0000
+++ pkg/dem/PreProcessor/TriaxialTest.cpp 2010-02-02 11:05:09 +0000
@@ -358,7 +358,6 @@
shared_ptr<Wall> wall(new Wall);
wall->sense=0; // interact from both sides, since unspecified here
wall->axis=ax0;
- // Wall has no geometricalModel, skip assignment to body->geometricalModel
body->shape=wall;
}
}
=== modified file 'pkg/dem/PreProcessor/TriaxialTestWater.cpp'
--- pkg/dem/PreProcessor/TriaxialTestWater.cpp 2010-02-02 09:59:57 +0000
+++ pkg/dem/PreProcessor/TriaxialTestWater.cpp 2010-02-02 11:05:09 +0000
@@ -344,14 +344,6 @@
iSphere->wire = false;
body->shape = iSphere;
-// #ifdef YADE_GEOMETRICALMODEL
-// gSphere->radius = radius;
-// // gSphere->diffuseColor = ((int)(position[0]*400.0))%2?Vector3r(0.7,0.7,0.7):Vector3r(0.45,0.45,0.45);
-// gSphere->diffuseColor = spheresColor;
-// gSphere->wire = false;
-// gSphere->shadowCaster = true;
-// body->geometricalModel = gSphere;
-// #endif
body->bound = aabb;
body->material = physics;
}
=== modified file 'pkg/dem/meta/Shop.cpp'
--- pkg/dem/meta/Shop.cpp 2010-02-02 09:59:57 +0000
+++ pkg/dem/meta/Shop.cpp 2010-02-02 11:05:09 +0000
@@ -1123,19 +1123,6 @@
return v0+((v2-v0)*(v1-v0).Length()+(v1-v0)*(v2-v0).Length())/((v1-v0).Length()+(v2-v1).Length()+(v0-v2).Length());
}
-#ifdef YADE_PHYSPAR
-void Shop::getViscoelasticFromSpheresInteraction( Real m, Real tc, Real en, Real es, shared_ptr<SimpleViscoelasticBodyParameters> b)
-{
- b->kn = m/tc/tc * ( Mathr::PI*Mathr::PI + Mathr::Pow(Mathr::Log(en),2) );
- b->cn = -2.0*m/tc * Mathr::Log(en);
- b->ks = 2.0/7.0 * m/tc/tc * ( Mathr::PI*Mathr::PI + Mathr::Pow(Mathr::Log(es),2) );
- b->cs = -2.0/7.0 * m/tc * Mathr::Log(es);
-
- if (Math<Real>::FAbs(b->cn) <= Math<Real>::ZERO_TOLERANCE ) b->cn=0;
- if (Math<Real>::FAbs(b->cs) <= Math<Real>::ZERO_TOLERANCE ) b->cs=0;
-}
-#endif
-
void Shop::getViscoelasticFromSpheresInteraction( Real m, Real tc, Real en, Real es, shared_ptr<SimpleViscoelasticMat> b)
{
b->kn = m/tc/tc * ( Mathr::PI*Mathr::PI + Mathr::Pow(Mathr::Log(en),2) );
=== modified file 'pkg/dem/meta/Shop.hpp'
--- pkg/dem/meta/Shop.hpp 2010-01-10 09:09:32 +0000
+++ pkg/dem/meta/Shop.hpp 2010-02-02 11:05:09 +0000
@@ -94,12 +94,9 @@
//! Calculate inscribed circle center of trianlge
static Vector3r inscribedCircleCenter(const Vector3r& v0, const Vector3r& v1, const Vector3r& v2);
- #ifdef YADE_PHYSPAR
/// Get viscoelastic parameters kn,cn,ks,cs from analytical solution of
/// a problem of interaction of pair spheres with mass m, collision
/// time tc and restitution coefficients en,es.
- static void getViscoelasticFromSpheresInteraction(Real m, Real tc, Real en, Real es, shared_ptr<SimpleViscoelasticBodyParameters> b);
- #endif
static void getViscoelasticFromSpheresInteraction(Real m, Real tc, Real en, Real es, shared_ptr<SimpleViscoelasticMat> b);
//! Get unbalanced force of the whole simulation
=== modified file 'pkg/dem/meta/Tetra.hpp'
--- pkg/dem/meta/Tetra.hpp 2009-12-18 15:04:57 +0000
+++ pkg/dem/meta/Tetra.hpp 2010-02-02 11:05:09 +0000
@@ -6,7 +6,7 @@
#include<yade/core/Shape.hpp>
#include<yade/core/InteractionGeometry.hpp>
-#include<yade/core/InteractionSolver.hpp>
+#include<yade/core/GlobalEngine.hpp>
#include<yade/pkg-common/Aabb.hpp>
#include<yade/pkg-common/BoundFunctor.hpp>
@@ -99,18 +99,18 @@
/*! Calculate physical response based on penetration configuration given by TetraBang. */
-class TetraLaw: public InteractionSolver {
+class TetraLaw: public GlobalEngine {
public:
- TetraLaw():InteractionSolver(){};
+ TetraLaw():GlobalEngine(){};
int sdecGroupMask; // probably unused?!
void action(Scene*);
DECLARE_LOGGER;
- REGISTER_ATTRIBUTES(InteractionSolver,/* nothing*/);
+ REGISTER_ATTRIBUTES(GlobalEngine,/* nothing*/);
REGISTER_CLASS_NAME(TetraLaw);
- REGISTER_BASE_CLASS_NAME(InteractionSolver);
+ REGISTER_BASE_CLASS_NAME(GlobalEngine);
};
REGISTER_SERIALIZABLE(TetraLaw);
=== modified file 'py/_utils.cpp'
--- py/_utils.cpp 2010-02-02 09:59:57 +0000
+++ py/_utils.cpp 2010-02-02 11:05:09 +0000
@@ -426,9 +426,6 @@
def("bodyNumInteractionsHistogram",bodyNumInteractionsHistogram,bodyNumInteractionsHistogram_overloads(args("aabb")));
def("elasticEnergy",elasticEnergyInAABB);
def("inscribedCircleCenter",inscribedCircleCenter);
- #ifdef YADE_PHYSPAR
- def("getViscoelasticFromSpheresInteraction",getViscoelasticFromSpheresInteraction);
- #endif
def("getViscoelasticFromSpheresInteraction",getViscoelasticFromSpheresInteraction);
def("unbalancedForce",&Shop::unbalancedForce,unbalancedForce_overloads(args("useMaxForce")));
def("kineticEnergy",Shop__kineticEnergy);
