The following commit has been merged in the master branch:
commit 70d3b9eeb6997f17edd7b0a56c89f576f619c457
Author: Anton Gladky <[email protected]>
Date: Wed May 4 20:54:41 2011 +0200
Added syncSizesOfContainers to forceContainer
diff --git a/debian/changelog b/debian/changelog
index 5f341b2..0f1a372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ yade (0.60.2-2) unstable; urgency=low
* [5d2ac1e] Increase debhelper version number for BD to 7.0.50
* [abd1f59] Add dh binary-indep
* [fccb8c8] Fix crash, when force applied to non existing body
+ * Added syncSizesOfContainers to forceContainer
-- Anton Gladky <[email protected]> Fri, 22 Apr 2011 14:01:08 +0200
diff --git a/debian/patches/fix_absent_syncSizesOfContainers.patch
b/debian/patches/fix_absent_syncSizesOfContainers.patch
new file mode 100644
index 0000000..1f60a8d
--- /dev/null
+++ b/debian/patches/fix_absent_syncSizesOfContainers.patch
@@ -0,0 +1,15 @@
+Description: Added syncSizesOfContainers to forceContainer::reset() for the
case of not using NewtonIntegrator in scripts
+Author: Anton Gladky <[email protected]>
+Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2571
+Last-Update: 2011-05-04
+
+--- a/core/ForceContainer.hpp
++++ b/core/ForceContainer.hpp
+@@ -152,6 +152,7 @@
+ /*! Reset all data, also reset summary forces/torques and mark
the container clean. */
+ // perhaps should be private and friend Scene or whatever the
only caller should be
+ void reset(long iter){
++ syncSizesOfContainers();
+ for(int thread=0; thread<nThreads; thread++){
+ memset(&_forceData
[thread][0],0,sizeof(Vector3r)*sizeOfThreads[thread]);
+
memset(&_torqueData[thread][0],0,sizeof(Vector3r)*sizeOfThreads[thread]);
diff --git a/debian/patches/series b/debian/patches/series
index b8a4621..8a99a70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
fix_memory_wrong_accces_after_body_erase.patch
fix_spelling_errors.patch
fix_force_applying_to_non_existing_body.patch
+fix_absent_syncSizesOfContainers.patch
--
Yet Another Dynamic Engine. Platform for discrete element modeling.
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
