From 716771f1cbd779966b0411f59dce5d7c4dd3b2d5 Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Mon, 6 Nov 2023 16:44:39 -0600 Subject: [PATCH 1/6] remove previously deprecated functions --- src/solvers/dgmulti/types.jl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/solvers/dgmulti/types.jl b/src/solvers/dgmulti/types.jl index fe6510856b0..921e8278f86 100644 --- a/src/solvers/dgmulti/types.jl +++ b/src/solvers/dgmulti/types.jl @@ -438,10 +438,3 @@ end # @muladd @deprecate DGMultiMesh(dg::DGMulti{NDIMS}; cells_per_dimension, kwargs...) where {NDIMS} DGMultiMesh(dg, cells_per_dimension; kwargs...) - -# TODO: deprecations introduced in Trixi.jl v0.5 -@deprecate DGMultiMesh(vertex_coordinates, EToV, dg::DGMulti{NDIMS}; - kwargs...) where {NDIMS} DGMultiMesh(dg, vertex_coordinates, EToV; - kwargs...) -@deprecate DGMultiMesh(triangulateIO, dg::DGMulti{2, Tri}, boundary_dict::Dict{Symbol, Int}; - kwargs...) DGMultiMesh(dg, triangulateIO, boundary_dict; kwargs...) From 6b03020a8c881a86550484891a0f53bca018e447 Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Mon, 6 Nov 2023 16:44:51 -0600 Subject: [PATCH 2/6] fix typo in NEWS.md about deprecation vs removal --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index bc213fcea55..26eb17bce6b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -58,7 +58,7 @@ for human readability. argument now comes first. - The undocumented and unused `DGMultiMesh(triangulateIO, rd::RefElemData{2, Tri}, boundary_dict::Dict{Symbol, Int})` - constructor was removed. + constructor was deprecated. #### Removed From 5855e0e43d803b54862fb003890b7f35e5c56c00 Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Mon, 6 Nov 2023 18:32:36 -0600 Subject: [PATCH 3/6] fix literate tutorial --- docs/literate/src/files/DGMulti_1.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/literate/src/files/DGMulti_1.jl b/docs/literate/src/files/DGMulti_1.jl index 5ef577e8eeb..6c9a5aea936 100644 --- a/docs/literate/src/files/DGMulti_1.jl +++ b/docs/literate/src/files/DGMulti_1.jl @@ -168,7 +168,7 @@ meshIO = StartUpDG.triangulate_domain(StartUpDG.RectangularDomainWithHole()); # The pre-defined Triangulate geometry in StartUpDG has integer boundary tags. With [`DGMultiMesh`](@ref) # we assign boundary faces based on these integer boundary tags and create a mesh compatible with Trixi.jl. -mesh = DGMultiMesh(meshIO, dg, Dict(:outer_boundary=>1, :inner_boundary=>2)) +mesh = DGMultiMesh(dg, meshIO, Dict(:outer_boundary=>1, :inner_boundary=>2)) #- boundary_condition_convergence_test = BoundaryConditionDirichlet(initial_condition) boundary_conditions = (; :outer_boundary => boundary_condition_convergence_test, From 4b63761a0f2c142864336937c0fd20787c8d82df Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Mon, 6 Nov 2023 21:32:45 -0600 Subject: [PATCH 4/6] removing other deprecation --- src/solvers/dgmulti/types.jl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/solvers/dgmulti/types.jl b/src/solvers/dgmulti/types.jl index 921e8278f86..a2b8db251de 100644 --- a/src/solvers/dgmulti/types.jl +++ b/src/solvers/dgmulti/types.jl @@ -434,7 +434,3 @@ function LinearAlgebra.mul!(b_in, A_kronecker::SimpleKronecker{3}, x_in) end end # @muladd -# TODO: deprecations introduced in Trixi.jl v0.6 -@deprecate DGMultiMesh(dg::DGMulti{NDIMS}; cells_per_dimension, kwargs...) where {NDIMS} DGMultiMesh(dg, - cells_per_dimension; - kwargs...) From 0ba2d134b3b4afa311202c61952f0d827c970cbf Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Mon, 6 Nov 2023 21:36:01 -0600 Subject: [PATCH 5/6] format --- src/solvers/dgmulti/types.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/solvers/dgmulti/types.jl b/src/solvers/dgmulti/types.jl index a2b8db251de..ae1eed7fd52 100644 --- a/src/solvers/dgmulti/types.jl +++ b/src/solvers/dgmulti/types.jl @@ -433,4 +433,3 @@ function LinearAlgebra.mul!(b_in, A_kronecker::SimpleKronecker{3}, x_in) return nothing end end # @muladd - From 6167e415674c0d29a368d0e376bbf361b530cc38 Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Tue, 7 Nov 2023 10:20:04 -0600 Subject: [PATCH 6/6] Revert "fix typo in NEWS.md about deprecation vs removal" This reverts commit 6b03020a8c881a86550484891a0f53bca018e447. --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 26eb17bce6b..bc213fcea55 100644 --- a/NEWS.md +++ b/NEWS.md @@ -58,7 +58,7 @@ for human readability. argument now comes first. - The undocumented and unused `DGMultiMesh(triangulateIO, rd::RefElemData{2, Tri}, boundary_dict::Dict{Symbol, Int})` - constructor was deprecated. + constructor was removed. #### Removed