------------------------------------------------------------
revno: 2164
committer: Václav Šmilauer <[email protected]>
branch nick: trunk
timestamp: Tue 2010-04-20 01:00:31 +0200
message:
Fix unchanged name (Bruno, do you use scripts/rename-class.py, right?
https://www.yade-dem.org/sphinx/prog.html#renaming-class)
modified:
pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp
pkg/dem/PreProcessor/SimpleShear.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 'pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp'
--- pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp 2010-04-19 13:29:06 +0000
+++ pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp 2010-04-19 23:00:31 +0000
@@ -25,11 +25,6 @@
#include<yade/pkg-common/BoundDispatcher.hpp>
#include<yade/pkg-common/GravityEngines.hpp>
-<<<<<<< TREE
-//#include<yade/pkg-dem/HydraulicForceEngine.hpp>
-=======
-// #include<yade/pkg-dem/HydraulicForceEngine.hpp>
->>>>>>> MERGE-SOURCE
#include<yade/pkg-dem/NewtonIntegrator.hpp>
#include<yade/pkg-dem/Ig2_Sphere_Sphere_ScGeom.hpp>
#include<yade/pkg-dem/Ig2_Box_Sphere_ScGeom.hpp>
=== modified file 'pkg/dem/PreProcessor/SimpleShear.cpp'
--- pkg/dem/PreProcessor/SimpleShear.cpp 2010-04-19 10:18:42 +0000
+++ pkg/dem/PreProcessor/SimpleShear.cpp 2010-04-19 23:00:31 +0000
@@ -13,7 +13,7 @@
#include "SimpleShear.hpp"
-#include <yade/pkg-dem/CohesiveFrictionalMat.hpp>
+#include <yade/pkg-dem/CohFrictMat.hpp>
#include<yade/pkg-dem/NormalInelasticityLaw.hpp>
#include <yade/pkg-dem/Ip2_2xCohFrictMat_NormalInelasticityPhys.hpp>
#include<yade/pkg-dem/GlobalStiffnessTimeStepper.hpp>
@@ -160,7 +160,7 @@
void SimpleShear::createSphere(shared_ptr<Body>& body, Vector3r position, Real radius)
{
body = shared_ptr<Body>(new Body(0,1));
- shared_ptr<CohesiveFrictionalMat> mat(new CohesiveFrictionalMat);
+ shared_ptr<CohFrictMat> mat(new CohFrictMat);
shared_ptr<Aabb> aabb(new Aabb);
// shared_ptr<SphereModel> gSphere(new SphereModel);
shared_ptr<Sphere> iSphere(new Sphere);
@@ -205,7 +205,7 @@
void SimpleShear::createBox(shared_ptr<Body>& body, Vector3r position, Vector3r extents)
{
body = shared_ptr<Body>(new Body(0,1));
- shared_ptr<CohesiveFrictionalMat> mat(new CohesiveFrictionalMat);
+ shared_ptr<CohFrictMat> mat(new CohFrictMat);
shared_ptr<Aabb> aabb(new Aabb);
// shared_ptr<BoxModel> gBox(new BoxModel);
shared_ptr<Box> iBox(new Box);
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
