From 3bf683b0fbb30877792fde1984621a46d8aeac06 Mon Sep 17 00:00:00 2001 From: Takuya Iwanaga Date: Mon, 29 Jan 2024 16:48:00 +1100 Subject: [PATCH 1/2] Revert to original --- src/ecosystem/corals/growth.jl | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/ecosystem/corals/growth.jl b/src/ecosystem/corals/growth.jl index 5d2e724e9..3a208b938 100644 --- a/src/ecosystem/corals/growth.jl +++ b/src/ecosystem/corals/growth.jl @@ -671,20 +671,13 @@ function settler_cover( valid_sinks::BitVector = vec(sum(conn, dims=1) .> 0.0) # Send larvae out into the world (reuse potential_settlers to reduce allocations) - @floop for src in findall(valid_sources) - @views potential_settlers[:, valid_sinks] .+= ( - fec_scope[:, src] .* conn[src, valid_sinks]' - ) - end - # [Larval pool for each location in larvae/m²] * [survival rate] # this is known as in-water mortality. # Set to 0.0 as it is now taken care of by connectivity data. # Mwater::Float64 = 0.0 - # @views potential_settlers[:, valid_sinks] .= ( - # fec_scope[:, valid_sources] - # * TP_data[valid_sources, valid_sinks] - # ) .* (1.0 .- Mwater) + @views potential_settlers[:, valid_sinks] .= ( + fec_scope[:, valid_sources] * conn[valid_sources, valid_sinks] + ) # Larvae have landed, work out how many are recruited # Determine area covered by recruited larvae (settler cover) per m^2 From 0eaa038247ffc98e11b74c3966f95a3580b9059c Mon Sep 17 00:00:00 2001 From: Takuya Iwanaga Date: Mon, 29 Jan 2024 16:55:18 +1100 Subject: [PATCH 2/2] Add note on connectivity matrix --- src/ecosystem/corals/growth.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ecosystem/corals/growth.jl b/src/ecosystem/corals/growth.jl index 3a208b938..3cc16674b 100644 --- a/src/ecosystem/corals/growth.jl +++ b/src/ecosystem/corals/growth.jl @@ -671,6 +671,8 @@ function settler_cover( valid_sinks::BitVector = vec(sum(conn, dims=1) .> 0.0) # Send larvae out into the world (reuse potential_settlers to reduce allocations) + # Note, conn rows need not sum to 1.0 as this missing probability accounts for larvae + # which do not settle. Pers comm with C. Ani (2023-01-29 13:24 AEST). # [Larval pool for each location in larvae/m²] * [survival rate] # this is known as in-water mortality. # Set to 0.0 as it is now taken care of by connectivity data.