Skip to content

changing physics interface. #206

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

Merged
cmhamel merged 2 commits into from
Nov 28, 2025
Merged

changing physics interface. #206

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
8126513
changing physics interface.
cmhamel Nov 28, 2025
66974af
Merge branch 'main' into change-physics-interface
cmhamel Nov 28, 2025
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "FiniteElementContainers"
uuid = "d08262e4-672f-4e7f-a976-f2cea5767631"
version = "0.9.5"
version = "0.10.0"
authors = ["Craig M. Hamel <[email protected]> and contributors"]

[deps]
Expand Down
4 changes: 4 additions & 0 deletions src/Functions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ function TensorFunction(fspace::FunctionSpace, sym; use_spatial_dimension=false)
:_yz, :_xz, :_xy,
:_zy, :_zx, :_yx
]
else
@assert false "TensorFunction likely doesn't make sense for ND not 2 or 3"
end

syms = ()
Expand Down Expand Up @@ -158,6 +160,8 @@ function SymmetricTensorFunction(fspace::FunctionSpace, sym; use_spatial_dimensi
:_xx, :_yy, :_zz,
:_yz, :_xz, :_xy,
]
else
@assert false "SymmetricTensorFunction likely doesn't make sense for ND not 2 or 3."
end

# finally set up component symbols
Expand Down
6 changes: 4 additions & 2 deletions src/assemblers/Matrix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ function _assemble_block_matrix!(
for q in 1:num_quadrature_points(ref_fe)
interps = _cell_interpolants(ref_fe, q)
state_old_q = _quadrature_level_state(state_old, q, e)
K_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, dt)
# K_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, dt)
K_q, state_new_q = func(physics, interps, x_el, t, dt, u_el, u_el_old, state_old_q, props_el)
K_el = K_el + K_q
for s in 1:length(state_old)
state_new[s, q, e] = state_new_q[s]
Expand Down Expand Up @@ -132,7 +133,8 @@ KA.@kernel function _assemble_block_matrix_kernel!(
for q in 1:num_quadrature_points(ref_fe)
interps = _cell_interpolants(ref_fe, q)
state_old_q = _quadrature_level_state(state_old, q, E)
K_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, dt)
# K_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, dt)
K_q, state_new_q = func(physics, interps, x_el, t, dt, u_el, u_el_old, state_old_q, props_el)
K_el = K_el + K_q
for s in 1:length(state_old)
state_new[s, q, E] = state_new_q[s]
Expand Down
4 changes: 2 additions & 2 deletions src/assemblers/MatrixAction.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function _assemble_block_matrix_action!(
for q in 1:num_quadrature_points(ref_fe)
interps = _cell_interpolants(ref_fe, q)
state_old_q = _quadrature_level_state(state_old, q, e)
K_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, Δt)
K_q, state_new_q = func(physics, interps, x_el, t, Δt, u_el, u_el_old, state_old_q, props_el)
K_el = K_el + K_q
# update state here
for s in 1:length(state_old)
Expand Down Expand Up @@ -131,7 +131,7 @@ KA.@kernel function _assemble_block_matrix_action_kernel!(
for q in 1:num_quadrature_points(ref_fe)
interps = _cell_interpolants(ref_fe, q)
state_old_q = _quadrature_level_state(state_old, q, E)
K_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, Δt)
K_q, state_new_q = func(physics, interps, x_el, t, Δt, u_el, u_el_old, state_old_q, props_el)
K_el = K_el + K_q
# update state here
for s in 1:length(state_old)
Expand Down
4 changes: 2 additions & 2 deletions src/assemblers/QuadratureQuantity.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function _assemble_block_quadrature_quantity!(
for q in 1:num_quadrature_points(ref_fe)
interps = _cell_interpolants(ref_fe, q)
state_old_q = _quadrature_level_state(state_old, q, e)
e_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, Δt)
e_q, state_new_q = func(physics, interps, x_el, t, Δt, u_el, u_el_old, state_old_q, props_el)
field[q, e] = e_q
# update state here
for s in 1:length(state_old)
Expand Down Expand Up @@ -122,7 +122,7 @@ KA.@kernel function _assemble_block_quadrature_quantity_kernel!(
KA.Extras.@unroll for q in 1:num_quadrature_points(ref_fe)
interps = _cell_interpolants(ref_fe, q)
state_old_q = _quadrature_level_state(state_old, q, E)
e_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, Δt)
e_q, state_new_q = func(physics, interps, x_el, t, Δt, u_el, u_el_old, state_old_q, props_el)
@inbounds field[q, E] = e_q
for s in 1:length(state_old)
@inbounds state_new[s, q, E] = state_new_q[s]
Expand Down
2 changes: 1 addition & 1 deletion src/assemblers/SparseMatrixAssembler.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ function _adjust_matrix_entries_for_constraints(
end

function _hessian(assembler::SparseMatrixAssembler, ::KA.CPU)
H = SparseArrays.sparse!(assembler.pattern, assembler.hessian_storage)
H = SparseArrays.sparse!(assembler.matrix_pattern, assembler.hessian_storage)

if _is_condensed(assembler.dof)
_adjust_matrix_entries_for_constraints!(H, assembler.constraint_storage, KA.get_backend(assembler))
Expand Down
6 changes: 4 additions & 2 deletions src/assemblers/Vector.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ function _assemble_block_vector!(
for q in 1:num_quadrature_points(ref_fe)
interps = _cell_interpolants(ref_fe, q)
state_old_q = _quadrature_level_state(state_old, q, e)
R_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, Δt)
# R_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, Δt)
R_q, state_new_q = func(physics, interps, x_el, t, Δt, u_el, u_el_old, state_old_q, props_el)
R_el = R_el + R_q
# update state here
for s in 1:length(state_old)
Expand Down Expand Up @@ -130,7 +131,8 @@ KA.@kernel function _assemble_block_vector_kernel!(
for q in 1:num_quadrature_points(ref_fe)
interps = _cell_interpolants(ref_fe, q)
state_old_q = _quadrature_level_state(state_old, q, E)
R_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, Δt)
# R_q, state_new_q = func(physics, interps, u_el, x_el, state_old_q, props_el, t, Δt)
R_q, state_new_q = func(physics, interps, x_el, t, Δt, u_el, u_el_old, state_old_q, props_el)
R_el = R_el + R_q
# update state here
for s in 1:length(state_old)
Expand Down
2 changes: 2 additions & 0 deletions src/bcs/BoundaryConditions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ function BCBookKeeping(
# setup dofs local to this BC
# all_dofs = reshape(1:length(dof), size(dof))
dofs = all_dofs[dof_index, nodes]
else
@assert false "Either you need to provide a nodeset, sideset or block"
end

return BCBookKeeping(
Expand Down
2 changes: 1 addition & 1 deletion src/ics/InitialConditions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ end

function _update_ic_values!(ic::InitialConditionContainer, func, X, backend::KA.Backend)
kernel! = _update_ic_values_kernel!(backend)
kernel!(ic, func, X, ndrange = length(bc))
kernel!(ic, func, X, ndrange = length(ic))
return nothing
end

Expand Down
6 changes: 3 additions & 3 deletions test/mechanics/TestMechanicsCommon.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ end
end

@inline function FiniteElementContainers.energy(
physics::Mechanics, interps, u_el, x_el, state_old_q, props_el, t, dt
physics::Mechanics, interps, x_el, t, dt, u_el, u_el_old, state_old_q, props_el
)
interps = map_interpolants(interps, x_el)
(; X_q, N, ∇N_X, JxW) = interps
Expand All @@ -50,7 +50,7 @@ end

# note for CUDA things crash without inline
@inline function FiniteElementContainers.residual(
physics::Mechanics, interps, u_el, x_el, state_old_q, props_el, t, dt
physics::Mechanics, interps, x_el, t, dt, u_el, u_el_old, state_old_q, props_el
)
interps = map_interpolants(interps, x_el)
(; X_q, N, ∇N_X, JxW) = interps
Expand All @@ -68,7 +68,7 @@ end
end

@inline function FiniteElementContainers.stiffness(
physics::Mechanics, interps, u_el, x_el, state_old_q, props_el, t, dt
physics::Mechanics, interps, x_el, t, dt, u_el, u_el_old, state_old_q, props_el
)
interps = map_interpolants(interps, x_el)
(; X_q, N, ∇N_X, JxW) = interps
Expand Down
8 changes: 4 additions & 4 deletions test/poisson/TestPoissonCommon.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ struct Poisson <: AbstractPhysics{1, 0, 0}
end

@inline function FiniteElementContainers.energy(
physics::Poisson, interps, u_el, x_el, state_old_q, props_el, t, dt
physics::Poisson, interps, x_el, t, dt, u_el, u_el_old, state_old_q, props_el
)
interps = map_interpolants(interps, x_el)
(; X_q, N, ∇N_X, JxW) = interps
Expand All @@ -15,7 +15,7 @@ end
end

@inline function FiniteElementContainers.mass(
physics::Poisson, interps, u_el, x_el, state_old_q, props_el, t, dt
physics::Poisson, interps, x_el, t, dt, u_el, u_el_old, state_old_q, props_el
)
interps = map_interpolants(interps, x_el)
(; X_q, N, ∇N_X, JxW) = interps
Expand All @@ -24,7 +24,7 @@ end
end

@inline function FiniteElementContainers.residual(
physics::Poisson, interps, u_el, x_el, state_old_q, props_el, t, dt
physics::Poisson, interps, x_el, t, dt, u_el, u_el_old, state_old_q, props_el
)
# interps = MappedInterpolants(interps, x_el)
interps = map_interpolants(interps, x_el)
Expand All @@ -35,7 +35,7 @@ end
end

@inline function FiniteElementContainers.stiffness(
physics::Poisson, interps, u_el, x_el, state_old_q, props_el, t, dt
physics::Poisson, interps, x_el, t, dt, u_el, u_el_old, state_old_q, props_el
)
# interps = MappedInterpolants(interps, x_el)
interps = map_interpolants(interps, x_el)
Expand Down
Loading