Granular.jl

commit 8deef26410a7c1879ab698a6f5f7bfcb06faea59
parent be609c80406b4b964b420d58d939fb3dd6e62647
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Wed, 17 Jan 2018 16:31:00 -0500

Do register contacts between fixed grains

Diffstat:
M
src/contact_search.jl
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/contact_search.jl b/src/contact_search.jl
@@ -68,7 +68,7 @@ export findContactsAllToAll!
     findContactsAllToAll!(simulation)
 
 Perform an O(n^2) all-to-all contact search between all grains in the 
-`simulation` object.  Contacts between fixed grains are ignored.
+`simulation` object.
 """
 function findContactsAllToAll!(simulation::Simulation)
 
@@ -102,7 +102,7 @@ export findContactsInGrid!
     findContactsInGrid!(simulation)
 
 Perform an O(n*log(n)) cell-based contact search between all grains in the 
-`simulation` object.  Contacts between fixed or disabled grains are ignored.
+`simulation` object.
 """
 function findContactsInGrid!(simulation::Simulation, grid::Any)
 
@@ -275,8 +275,7 @@ function checkAndAddContact!(sim::Simulation, i::Int, j::Int,
                              distance_modifier::Vector{Float64} = [0., 0.])
     if i < j
 
-        @inbounds if (sim.grains[i].fixed && sim.grains[j].fixed) ||
-            !sim.grains[i].enabled || !sim.grains[j].enabled
+        @inbounds if !sim.grains[i].enabled || !sim.grains[j].enabled
             return
         end