From bc73b63ad6904e8a1a4f6bbc22d26e1620e97c4d Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Wed, 14 May 2025 15:55:35 +0200 Subject: [PATCH 1/4] remove initial_cache --- ...scretizationHyperbolic_structure_figure.jl | 2 +- .../semidiscretization_hyperbolic.jl | 9 +++---- ...semidiscretization_hyperbolic_parabolic.jl | 25 ++++++------------- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/docs/literate/src/files/behind_the_scenes_simulation_setup_plots/src/SemidiscretizationHyperbolic_structure_figure.jl b/docs/literate/src/files/behind_the_scenes_simulation_setup_plots/src/SemidiscretizationHyperbolic_structure_figure.jl index 3066a0a515a..7c3ebd244f5 100644 --- a/docs/literate/src/files/behind_the_scenes_simulation_setup_plots/src/SemidiscretizationHyperbolic_structure_figure.jl +++ b/docs/literate/src/files/behind_the_scenes_simulation_setup_plots/src/SemidiscretizationHyperbolic_structure_figure.jl @@ -4,7 +4,7 @@ plot(Shape([(-2.3, 4.5), (2.35, 4.5), (2.35, 2.5), (-2.3, 2.5)]), linecolor = "b grid = false, xlim = (-2.4, 2.8), ylim = (-25, 5.5)) annotate!(2.3, 3.5, ("SemidiscretizationHyperbolic(mesh, equations, initial_conditions, solver; source_terms, -boundary_conditions, RealT, uEltype, initial_cache) ", 10, :black, :right)) +boundary_conditions, RealT, uEltype) ", 10, :black, :right)) annotate!(-2.3, 1.5, ("creates and returns SemidiscretizationHyperbolic object, initialized using a mesh, equations, initial_conditions, boundary_conditions, source_terms, solver and cache", 9, :black, :left)) diff --git a/src/semidiscretization/semidiscretization_hyperbolic.jl b/src/semidiscretization/semidiscretization_hyperbolic.jl index c909196b5db..7496a345661 100644 --- a/src/semidiscretization/semidiscretization_hyperbolic.jl +++ b/src/semidiscretization/semidiscretization_hyperbolic.jl @@ -53,8 +53,7 @@ end source_terms=nothing, boundary_conditions=boundary_condition_periodic, RealT=real(solver), - uEltype=RealT, - initial_cache=NamedTuple()) + uEltype=RealT) Construct a semidiscretization of a hyperbolic PDE. """ @@ -63,12 +62,10 @@ function SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver boundary_conditions = boundary_condition_periodic, # `RealT` is used as real type for node locations etc. # while `uEltype` is used as element type of solutions etc. - RealT = real(solver), uEltype = RealT, - initial_cache = NamedTuple()) + RealT = real(solver), uEltype = RealT) @assert ndims(mesh) == ndims(equations) - cache = (; create_cache(mesh, equations, solver, RealT, uEltype)..., - initial_cache...) + cache = create_cache(mesh, equations, solver, RealT, uEltype) _boundary_conditions = digest_boundary_conditions(boundary_conditions, mesh, solver, cache) diff --git a/src/semidiscretization/semidiscretization_hyperbolic_parabolic.jl b/src/semidiscretization/semidiscretization_hyperbolic_parabolic.jl index 1af65995e79..95934042566 100644 --- a/src/semidiscretization/semidiscretization_hyperbolic_parabolic.jl +++ b/src/semidiscretization/semidiscretization_hyperbolic_parabolic.jl @@ -87,8 +87,7 @@ end source_terms=nothing, both_boundary_conditions=(boundary_condition_periodic, boundary_condition_periodic), RealT=real(solver), - uEltype=RealT, - both_initial_caches=(NamedTuple(), NamedTuple())) + uEltype=RealT) Construct a semidiscretization of a hyperbolic-parabolic PDE. """ @@ -100,12 +99,9 @@ function SemidiscretizationHyperbolicParabolic(mesh, equations::Tuple, boundary_condition_periodic), # `RealT` is used as real type for node locations etc. # while `uEltype` is used as element type of solutions etc. - RealT = real(solver), uEltype = RealT, - initial_caches = (NamedTuple(), - NamedTuple())) + RealT = real(solver), uEltype = RealT) equations_hyperbolic, equations_parabolic = equations boundary_conditions_hyperbolic, boundary_conditions_parabolic = boundary_conditions - initial_hyperbolic_cache, initial_cache_parabolic = initial_caches return SemidiscretizationHyperbolicParabolic(mesh, equations_hyperbolic, equations_parabolic, @@ -113,9 +109,7 @@ function SemidiscretizationHyperbolicParabolic(mesh, equations::Tuple, solver_parabolic, source_terms, boundary_conditions = boundary_conditions_hyperbolic, boundary_conditions_parabolic = boundary_conditions_parabolic, - RealT, uEltype, - initial_cache = initial_hyperbolic_cache, - initial_cache_parabolic = initial_cache_parabolic) + RealT, uEltype) end function SemidiscretizationHyperbolicParabolic(mesh, equations, equations_parabolic, @@ -126,11 +120,8 @@ function SemidiscretizationHyperbolicParabolic(mesh, equations, equations_parabo boundary_conditions_parabolic = boundary_condition_periodic, # `RealT` is used as real type for node locations etc. # while `uEltype` is used as element type of solutions etc. - RealT = real(solver), uEltype = RealT, - initial_cache = NamedTuple(), - initial_cache_parabolic = NamedTuple()) - cache = (; create_cache(mesh, equations, solver, RealT, uEltype)..., - initial_cache...) + RealT = real(solver), uEltype = RealT) + cache = create_cache(mesh, equations, solver, RealT, uEltype) _boundary_conditions = digest_boundary_conditions(boundary_conditions, mesh, solver, cache) _boundary_conditions_parabolic = digest_boundary_conditions(boundary_conditions_parabolic, @@ -138,11 +129,9 @@ function SemidiscretizationHyperbolicParabolic(mesh, equations, equations_parabo check_periodicity_mesh_boundary_conditions(mesh, _boundary_conditions) - cache_parabolic = (; - create_cache_parabolic(mesh, equations, equations_parabolic, + cache_parabolic = create_cache_parabolic(mesh, equations, equations_parabolic, solver, solver_parabolic, RealT, - uEltype)..., - initial_cache_parabolic...) + uEltype) SemidiscretizationHyperbolicParabolic{typeof(mesh), typeof(equations), typeof(equations_parabolic), From c85374edf4e33365389d76ca0ccf08d9f1219e2c Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Wed, 14 May 2025 15:57:57 +0200 Subject: [PATCH 2/4] fmt --- .../semidiscretization_hyperbolic_parabolic.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/semidiscretization/semidiscretization_hyperbolic_parabolic.jl b/src/semidiscretization/semidiscretization_hyperbolic_parabolic.jl index 95934042566..72e79dde853 100644 --- a/src/semidiscretization/semidiscretization_hyperbolic_parabolic.jl +++ b/src/semidiscretization/semidiscretization_hyperbolic_parabolic.jl @@ -130,8 +130,8 @@ function SemidiscretizationHyperbolicParabolic(mesh, equations, equations_parabo check_periodicity_mesh_boundary_conditions(mesh, _boundary_conditions) cache_parabolic = create_cache_parabolic(mesh, equations, equations_parabolic, - solver, solver_parabolic, RealT, - uEltype) + solver, solver_parabolic, RealT, + uEltype) SemidiscretizationHyperbolicParabolic{typeof(mesh), typeof(equations), typeof(equations_parabolic), From 2fcf2c8740fb03bcd9a600be853c8f912138d458 Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Thu, 15 May 2025 09:41:10 +0200 Subject: [PATCH 3/4] add news entry --- NEWS.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS.md b/NEWS.md index 637b46b692c..af8d9faf5b2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,6 +5,18 @@ Trixi.jl follows the interpretation of used in the Julia ecosystem. Notable changes will be documented in this file for human readability. +## Changes when updating to v0.12 from v0.11.x + +#### Added + +#### Changed + +#### Deprecated + +#### Removed +- The additional `ìnitial_cache` entries in the caches of `SemidiscretizationHyperbolic` + and `SemidiscretizationHyperbolicParabolic`, and the corresponding keyword arguments of + their constructors have been removed. ([#2399]) ## Changes in the v0.11 lifecycle From bf12dba2e3aef21665614063dc4e35adfa171cf5 Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Tue, 27 May 2025 14:53:19 +0200 Subject: [PATCH 4/4] add white space --- .../src/SemidiscretizationHyperbolic_structure_figure.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/literate/src/files/behind_the_scenes_simulation_setup_plots/src/SemidiscretizationHyperbolic_structure_figure.jl b/docs/literate/src/files/behind_the_scenes_simulation_setup_plots/src/SemidiscretizationHyperbolic_structure_figure.jl index 7c3ebd244f5..4b2afbb273f 100644 --- a/docs/literate/src/files/behind_the_scenes_simulation_setup_plots/src/SemidiscretizationHyperbolic_structure_figure.jl +++ b/docs/literate/src/files/behind_the_scenes_simulation_setup_plots/src/SemidiscretizationHyperbolic_structure_figure.jl @@ -4,7 +4,7 @@ plot(Shape([(-2.3, 4.5), (2.35, 4.5), (2.35, 2.5), (-2.3, 2.5)]), linecolor = "b grid = false, xlim = (-2.4, 2.8), ylim = (-25, 5.5)) annotate!(2.3, 3.5, ("SemidiscretizationHyperbolic(mesh, equations, initial_conditions, solver; source_terms, -boundary_conditions, RealT, uEltype) ", 10, :black, :right)) +boundary_conditions, RealT, uEltype) ", 10, :black, :right)) annotate!(-2.3, 1.5, ("creates and returns SemidiscretizationHyperbolic object, initialized using a mesh, equations, initial_conditions, boundary_conditions, source_terms, solver and cache", 9, :black, :left))