Merge branch 'main' into move_boundaries

trixi-framework · Jul 3, 2023 · a089fcf · a089fcf
2 parents ec8df26 + 1f981e0
commit a089fcf
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/src/schemes/fluid/fluid.jl b/src/schemes/fluid/fluid.jl
@@ -0,0 +1,2 @@
+include("viscosity.jl")
+include("weakly_compressible_sph/weakly_compressible_sph.jl")
diff --git a/...luid/weakly_compressible_sph/viscosity.jl → src/schemes/fluid/viscosity.jl b/...luid/weakly_compressible_sph/viscosity.jl → src/schemes/fluid/viscosity.jl
diff --git a/src/schemes/fluid/weakly_compressible_sph/weakly_compressible_sph.jl b/src/schemes/fluid/weakly_compressible_sph/weakly_compressible_sph.jl
@@ -1,3 +1,2 @@
 include("state_equations.jl")
-include("viscosity.jl")
 include("system.jl")
diff --git a/src/schemes/schemes.jl b/src/schemes/schemes.jl
@@ -1,6 +1,6 @@
 # Include all schemes without rhs first. The rhs depends on the systems to define
 # interactions between the different system types.
-include("fluid/weakly_compressible_sph/weakly_compressible_sph.jl")
+include("fluid/fluid.jl")
 include("boundary/boundary.jl")
 include("solid/total_lagrangian_sph/total_lagrangian_sph.jl")