Skip to content

Commit f8e768f

Browse files
benegeeranocha
andauthored
Remove initial_cache (#2399)
* remove initial_cache * fmt * add news entry * add white space --------- Co-authored-by: Hendrik Ranocha <[email protected]>
1 parent a51dade commit f8e768f

File tree

4 files changed

+21
-27
lines changed

4 files changed

+21
-27
lines changed

NEWS.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@ for human readability.
2424
#### Deprecated
2525

2626
#### Removed
27-
- The shallow-water equation types `ShallowWaterEquations1D`, `ShallowWaterEquations2D`, and `ShallowWaterEquationsQuasi1D` have been removed from Trixi.jl and are now available via [TrixiShallowWater.jl](https://github.com/trixi-framework/TrixiShallowWater.jl/). This also affects the related functions `hydrostatic_reconstruction_audusse_etal`, `flux_nonconservative_audusse_etal`, and `FluxHydrostaticReconstruction`. ([#2379])
27+
28+
- The shallow-water equation types `ShallowWaterEquations1D`, `ShallowWaterEquations2D`, and
29+
`ShallowWaterEquationsQuasi1D` have been removed from Trixi.jl and are now available via
30+
[TrixiShallowWater.jl](https://github.com/trixi-framework/TrixiShallowWater.jl/).
31+
This also affects the related functions `hydrostatic_reconstruction_audusse_etal`,
32+
`flux_nonconservative_audusse_etal`, and `FluxHydrostaticReconstruction`. ([#2379])
33+
- The additional `ìnitial_cache` entries in the caches of `SemidiscretizationHyperbolic`
34+
and `SemidiscretizationHyperbolicParabolic`, and the corresponding keyword arguments of
35+
their constructors have been removed. ([#2399])
2836

2937
## Changes in the v0.11 lifecycle
3038

docs/literate/src/files/behind_the_scenes_simulation_setup_plots/src/SemidiscretizationHyperbolic_structure_figure.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plot(Shape([(-2.3, 4.5), (2.35, 4.5), (2.35, 2.5), (-2.3, 2.5)]), linecolor = "b
44
grid = false, xlim = (-2.4, 2.8), ylim = (-25, 5.5))
55
annotate!(2.3, 3.5,
66
("SemidiscretizationHyperbolic(mesh, equations, initial_conditions, solver; source_terms,
7-
boundary_conditions, RealT, uEltype, initial_cache) ", 10, :black, :right))
7+
boundary_conditions, RealT, uEltype) ", 10, :black, :right))
88
annotate!(-2.3, 1.5,
99
("creates and returns SemidiscretizationHyperbolic object, initialized using a mesh, equations,
1010
initial_conditions, boundary_conditions, source_terms, solver and cache", 9, :black, :left))

src/semidiscretization/semidiscretization_hyperbolic.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ end
5353
source_terms=nothing,
5454
boundary_conditions=boundary_condition_periodic,
5555
RealT=real(solver),
56-
uEltype=RealT,
57-
initial_cache=NamedTuple())
56+
uEltype=RealT)
5857
5958
Construct a semidiscretization of a hyperbolic PDE.
6059
"""
@@ -63,12 +62,10 @@ function SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver
6362
boundary_conditions = boundary_condition_periodic,
6463
# `RealT` is used as real type for node locations etc.
6564
# while `uEltype` is used as element type of solutions etc.
66-
RealT = real(solver), uEltype = RealT,
67-
initial_cache = NamedTuple())
65+
RealT = real(solver), uEltype = RealT)
6866
@assert ndims(mesh) == ndims(equations)
6967

70-
cache = (; create_cache(mesh, equations, solver, RealT, uEltype)...,
71-
initial_cache...)
68+
cache = create_cache(mesh, equations, solver, RealT, uEltype)
7269
_boundary_conditions = digest_boundary_conditions(boundary_conditions, mesh, solver,
7370
cache)
7471

src/semidiscretization/semidiscretization_hyperbolic_parabolic.jl

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ end
8787
source_terms=nothing,
8888
both_boundary_conditions=(boundary_condition_periodic, boundary_condition_periodic),
8989
RealT=real(solver),
90-
uEltype=RealT,
91-
both_initial_caches=(NamedTuple(), NamedTuple()))
90+
uEltype=RealT)
9291
9392
Construct a semidiscretization of a hyperbolic-parabolic PDE.
9493
"""
@@ -100,22 +99,17 @@ function SemidiscretizationHyperbolicParabolic(mesh, equations::Tuple,
10099
boundary_condition_periodic),
101100
# `RealT` is used as real type for node locations etc.
102101
# while `uEltype` is used as element type of solutions etc.
103-
RealT = real(solver), uEltype = RealT,
104-
initial_caches = (NamedTuple(),
105-
NamedTuple()))
102+
RealT = real(solver), uEltype = RealT)
106103
equations_hyperbolic, equations_parabolic = equations
107104
boundary_conditions_hyperbolic, boundary_conditions_parabolic = boundary_conditions
108-
initial_hyperbolic_cache, initial_cache_parabolic = initial_caches
109105

110106
return SemidiscretizationHyperbolicParabolic(mesh, equations_hyperbolic,
111107
equations_parabolic,
112108
initial_condition, solver;
113109
solver_parabolic, source_terms,
114110
boundary_conditions = boundary_conditions_hyperbolic,
115111
boundary_conditions_parabolic = boundary_conditions_parabolic,
116-
RealT, uEltype,
117-
initial_cache = initial_hyperbolic_cache,
118-
initial_cache_parabolic = initial_cache_parabolic)
112+
RealT, uEltype)
119113
end
120114

121115
function SemidiscretizationHyperbolicParabolic(mesh, equations, equations_parabolic,
@@ -126,23 +120,18 @@ function SemidiscretizationHyperbolicParabolic(mesh, equations, equations_parabo
126120
boundary_conditions_parabolic = boundary_condition_periodic,
127121
# `RealT` is used as real type for node locations etc.
128122
# while `uEltype` is used as element type of solutions etc.
129-
RealT = real(solver), uEltype = RealT,
130-
initial_cache = NamedTuple(),
131-
initial_cache_parabolic = NamedTuple())
132-
cache = (; create_cache(mesh, equations, solver, RealT, uEltype)...,
133-
initial_cache...)
123+
RealT = real(solver), uEltype = RealT)
124+
cache = create_cache(mesh, equations, solver, RealT, uEltype)
134125
_boundary_conditions = digest_boundary_conditions(boundary_conditions, mesh, solver,
135126
cache)
136127
_boundary_conditions_parabolic = digest_boundary_conditions(boundary_conditions_parabolic,
137128
mesh, solver, cache)
138129

139130
check_periodicity_mesh_boundary_conditions(mesh, _boundary_conditions)
140131

141-
cache_parabolic = (;
142-
create_cache_parabolic(mesh, equations, equations_parabolic,
143-
solver, solver_parabolic, RealT,
144-
uEltype)...,
145-
initial_cache_parabolic...)
132+
cache_parabolic = create_cache_parabolic(mesh, equations, equations_parabolic,
133+
solver, solver_parabolic, RealT,
134+
uEltype)
146135

147136
SemidiscretizationHyperbolicParabolic{typeof(mesh), typeof(equations),
148137
typeof(equations_parabolic),

0 commit comments

Comments
 (0)