From 6d9918ed7b5290e211d9e9fe8d9b84d07ebcd7ad Mon Sep 17 00:00:00 2001 From: Jago Strong-Wright Date: Fri, 24 Jan 2025 14:43:48 +0000 Subject: [PATCH 1/2] abstract out biogeochemical particles so I can do more complicated things Maybe BiogeochemicalParticles should be renamed ContinuousBiogeochemicalParticles --- src/Particles/Particles.jl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Particles/Particles.jl b/src/Particles/Particles.jl index 3488249ee..1a6453f45 100644 --- a/src/Particles/Particles.jl +++ b/src/Particles/Particles.jl @@ -20,7 +20,9 @@ import Oceananigans.OutputWriters: fetch_output import Base: length, size, show, summary import Adapt: adapt_structure -struct BiogeochemicalParticles{N, B, A, F, T, I, S, X, Y, Z} +abstract type AbstractBiogeochemicalParticles end + +struct BiogeochemicalParticles{N, B, A, F, T, I, S, X, Y, Z} <: AbstractBiogeochemicalParticles biogeochemistry :: B advection :: A fields :: F @@ -119,8 +121,8 @@ Adapt.adapt_structure(to, p::BiogeochemicalParticles{N}) where N = adapt(to, p.z)) # Type piracy...oops -const BGC_WITH_PARTICLES = Union{<:DiscreteBiogeochemistry{<:Any, <:Any, <:Any, <:BiogeochemicalParticles}, - <:ContinuousBiogeochemistry{<:Any, <:Any, <:Any, <:BiogeochemicalParticles}} +const BGC_WITH_PARTICLES = Union{<:DiscreteBiogeochemistry{<:Any, <:Any, <:Any, <:AbstractBiogeochemicalParticles}, + <:ContinuousBiogeochemistry{<:Any, <:Any, <:Any, <:AbstractBiogeochemicalParticles}} const MODEL_WITH_BGC_PARTICLES = Union{<:NonhydrostaticModel{<:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:Any, <:BGC_WITH_PARTICLES}, From 02a95abb1e6b5d2a0fa21f92cc773c09a814a651 Mon Sep 17 00:00:00 2001 From: Jago Strong-Wright Date: Mon, 27 Jan 2025 13:44:53 +0000 Subject: [PATCH 2/2] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 49b7ea19c..72ec2d839 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "OceanBioME" uuid = "a49af516-9db8-4be4-be45-1dad61c5a376" authors = ["Jago Strong-Wright and contributors"] -version = "0.13.4" +version = "0.13.5" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"