Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adds field name to particle interpolation #223

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −3
Draft

adds field name to particle interpolation #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d3e004
adds field name to particle interpolation
jagoosw Oct 22, 2024
cbc9768
add particle update state
jagoosw Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Particles/Particles.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,11 @@ const MODEL_WITH_BGC_PARTICLES =
@inline function update_lagrangian_particle_properties!(particles::BiogeochemicalParticles, model, bgc, Δt)
advect_particles!(particles.advection, particles, model, Δt)
time_step_particle_fields!(particles.timestepper, particles, model, Δt)
update_particle_state!(particles, model, Δt)
end

@inline update_particle_state!(particles, model, Δt) = nothing

size(particles::BiogeochemicalParticles) = (length(particles), )
length(::BiogeochemicalParticles{N}) where N = N

Expand Down
2 changes: 1 addition & 1 deletion src/Particles/tendencies.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ end

field_values = ntuple(nf->particles.fields[nf][n], Val(Nf))

tracer_values = extract_tracer_values(particles.field_interpolation, particles, grid, fields, n)
tracer_values = extract_tracer_values(val_field_name, particles.field_interpolation, particles, grid, fields, n)

tendencies[field_name][n] = particles.biogeochemistry(val_field_name, t, field_values..., tracer_values...)
end
2 changes: 1 addition & 1 deletion src/Particles/tracer_interpolation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Specifies that tracer values should be taken from the nearst center point.
"""
struct NearestPoint end

@inline function extract_tracer_values(::NearestPoint, particles, grid, fields, n)
@inline function extract_tracer_values(val_field_name, ::NearestPoint, particles, grid, fields, n)
x = @inbounds particles.x[n]
y = @inbounds particles.y[n]
z = @inbounds particles.z[n]
Expand Down
2 changes: 1 addition & 1 deletion src/Particles/update_tracer_tendencies.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ possible_tuple_value(::Tuple, field_name) = field_name

field_values = ntuple(nf->particles.fields[nf][n], Val(Nf))

tracer_values = extract_tracer_values(particles.field_interpolation, particles, grid, fields, n)
tracer_values = extract_tracer_values(val_field_name, particles.field_interpolation, particles, grid, fields, n)

particle_tendency = particles.biogeochemistry(val_field_name, t, field_values..., tracer_values...)

Expand Down