use same save_solution_file as Cartesian

trixi-framework · Dec 4, 2024 · 21ef2ee · 21ef2ee
1 parent 9965222
commit 21ef2ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 28 deletions.
diff --git a/src/callbacks_step/save_solution_2d_manifold_in_3d_cartesian.jl b/src/callbacks_step/save_solution_2d_manifold_in_3d_cartesian.jl
@@ -42,7 +42,9 @@ end
 
 function Trixi.save_solution_file(u, time, dt, timestep,
                                   mesh::P4estMesh{2},
-                                  equations::AbstractEquations{3}, dg::DG, cache,
+                                  equations::Union{AbstractEquations{3},
+                                                   AbstractCovariantEquations{2}},
+                                  dg::DG, cache,
                                   solution_callback,
                                   element_variables = Dict{Symbol, Any}(),
                                   node_variables = Dict{Symbol, Any}();

diff --git a/src/callbacks_step/save_solution_covariant.jl b/src/callbacks_step/save_solution_covariant.jl
@@ -4,7 +4,7 @@
 # Convert to another set of variables using a solution_variables function that depends on 
 # auxiliary variables
 function convert_variables(u, solution_variables, mesh::P4estMesh{2},
-                           equations, dg, cache)
+                           equations::AbstractCovariantEquations{2}, dg, cache)
     (; aux_node_vars) = cache.auxiliary_variables
 
     # Extract the number of solution variables to be output 
@@ -29,30 +29,4 @@ function convert_variables(u, solution_variables, mesh::P4estMesh{2},
     end
     return data
 end
-
-# Specialized save_solution_file method that supports a solution_variables function which 
-# depends on auxiliary variables. The conversion must be defined as solution_variables(u, 
-# aux_vars, equations), and an additional method must be defined as solution_variables(u,
-# equations) = u, such that no conversion is done when auxiliary variables are not provided.
-function Trixi.save_solution_file(u_ode, t, dt, iter,
-                                  semi::SemidiscretizationHyperbolic{<:Trixi.AbstractMesh,
-                                                                     <:AbstractCovariantEquations},
-                                  solution_callback,
-                                  element_variables = Dict{Symbol, Any}(),
-                                  node_variables = Dict{Symbol, Any}();
-                                  system = "")
-    mesh, equations, solver, cache = Trixi.mesh_equations_solver_cache(semi)
-    u = Trixi.wrap_array_native(u_ode, semi)
-
-    # Perform the variable conversion at each node
-    data = convert_variables(u, solution_callback.solution_variables, mesh, equations,
-                             solver, cache)
-
-    # Call the existing Trixi.save_solution_file, which will use solution_variables(u, 
-    # equations). Since the variables are already converted above, we therefore require 
-    # solution_variables(u, equations) = u.
-    Trixi.save_solution_file(data, t, dt, iter, mesh, equations, solver, cache,
-                             solution_callback, element_variables,
-                             node_variables, system = system)
-end
 end # muladd