yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4156
committer: Anton Gladky <gladk@xxxxxxxxxx>
timestamp: Wed 2014-09-10 22:45:19 +0200
message:
  Return fictional value from deprecated functions.
modified:
  pkg/dem/SpherePack.cpp


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'pkg/dem/SpherePack.cpp'
--- pkg/dem/SpherePack.cpp	2014-09-03 15:59:54 +0000
+++ pkg/dem/SpherePack.cpp	2014-09-10 20:45:19 +0000
@@ -276,17 +276,20 @@
 long SpherePack::particleSD2(const vector<Real>& radii, const vector<Real>& passing, int numSph, bool periodic, Real cloudPorosity, int seed){
 	//deprecated (https://bugs.launchpad.net/yade/+bug/1024443)
 	LOG_ERROR("particleSD2() has been removed. Please use makeCloud() instead.");
+	return 1;
 };
 
 // Discrete particle size distribution
 long SpherePack::particleSD(Vector3r mn, Vector3r mx, Real rMean, bool periodic, string name, int numSph, const vector<Real>& radii, const vector<Real>& passing, bool passingIsNotPercentageButCount, int seed){
 	//deprecated (https://bugs.launchpad.net/yade/+bug/1024443)
 	LOG_ERROR("particleSD() has been removed. Please use makeCloud() instead.");
+	return 1;
 }
 
 long SpherePack::particleSD_2d(Vector2r mn, Vector2r mx, Real rMean, bool periodic, string name, int numSph, const vector<Real>& radii, const vector<Real>& passing, bool passingIsNotPercentageButCount, int seed){
 	//deprecated (https://bugs.launchpad.net/yade/+bug/1024443)
 	LOG_ERROR("particleSD_2d() has been removed. Please use makeCloud() instead.");
+	return 1;
 }
 
 long SpherePack::makeClumpCloud(const Vector3r& mn, const Vector3r& mx, const vector<shared_ptr<SpherePack> >& _clumps, bool periodic, int num, int seed){