combine them

trixi-framework · Aug 9, 2024 · d6c316d · d6c316d
1 parent c21168f
commit d6c316d
Show file tree

Hide file tree

Showing 4 changed files with 133 additions and 110 deletions.
diff --git a/examples/fluid/accelerated_tank_2d.jl b/examples/fluid/accelerated_tank_2d.jl
@@ -17,4 +17,4 @@ boundary_movement = BoundaryMovement(movement_function, is_moving)
 trixi_include(@__MODULE__,
               joinpath(examples_dir(), "fluid", "hydrostatic_water_column_2d.jl"),
               fluid_particle_spacing=fluid_particle_spacing, movement=boundary_movement,
-              tspan=(0.0, 1.0))
+              tspan=(0.0, 1.0), system_acceleration=(0.0, 0.0))
diff --git a/examples/fluid/hydrostatic_water_column_2d.jl b/examples/fluid/hydrostatic_water_column_2d.jl
@@ -35,10 +35,13 @@ alpha = 0.02
 viscosity = ArtificialViscosityMonaghan(alpha=alpha, beta=0.0)
 
 fluid_density_calculator = ContinuityDensity()
+
+# This is to set acceleration with `trixi_include`
+system_acceleration = (0.0, -gravity)
 fluid_system = WeaklyCompressibleSPHSystem(tank.fluid, fluid_density_calculator,
                                            state_equation, smoothing_kernel,
                                            smoothing_length, viscosity=viscosity,
-                                           acceleration=(0.0, -gravity),
+                                           acceleration=system_acceleration,
                                            source_terms=nothing)
 
 # ==========================================================================================

diff --git a/src/general/semidiscretization.jl b/src/general/semidiscretization.jl
@@ -715,7 +715,7 @@ function update_nhs!(neighborhood_search,
             points_moving=(true, neighbor.ismoving[]))
 end
 
-# If declared as a union with the `TotalLagrangianSPHSystem` version will be ambiguous with another dispatch
+# This function is the same as the one below to avoid ambiguous dispatch when using `Union`
 function update_nhs!(neighborhood_search,
                      system::BoundarySPHSystem{<:BoundaryModelDummyParticles},
                      neighbor::FluidSystem, u_system, u_neighbor)
@@ -732,7 +732,7 @@ function update_nhs!(neighborhood_search,
             points_moving=(system.ismoving[], true))
 end
 
-# If declared as a union with the `FluidSystem` version will be ambiguous with another dispatch
+# This function is the same as the one above to avoid ambiguous dispatch when using `Union`
 function update_nhs!(neighborhood_search,
                      system::BoundarySPHSystem{<:BoundaryModelDummyParticles},
                      neighbor::TotalLagrangianSPHSystem, u_system, u_neighbor)