Commit 84ad9031 authored by Victor Boussange's avatar Victor Boussange
Browse files

fixing the merge request

parent 8ec7f87f
......@@ -200,12 +200,8 @@ function runWorld_store_G(p,world0;init = ([.0],),reflected=false)
# We decide that we store agents ninit events where ninit is the initial population
# length of worldall should be changed at some point
worldall = reshape(copy.(world0),N,1)
# we instantiate C as the biggest size it can take
<<<<<<< HEAD
C = SharedArray{Float64}((N,N))
update_rates_std!(skipmissing(world0),C,p,0.)
while tspan[i]<p["tend"] && count(ismissing,world0) < p["NMax"] && count(ismissing,world0) > 0
=======
update_rates_std!(skipmissing(world0),p,0.)
while tspan[i]<p["tend"]
if dt < 0
......@@ -217,7 +213,6 @@ function runWorld_store_G(p,world0;init = ([.0],),reflected=false)
@info "We have reached the maximum number of individuals allowed"
break
end
>>>>>>> origin/no_C_matrix
# we save every ninit times
if dt < 0
throw("We obtained negative time step dt = $dt at event $i")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment