Generalize surface normal calc #539

svchb · 2024-05-29T10:49:04Z

Depends on #599
extracted from #584

Conflicts: src/schemes/fluid/weakly_compressible_sph/system.jl

…vchb/TrixiParticles.jlOpen into generalize_surface_normal_calc

test/schemes/fluid/surface_normal_sph.jl

Project.toml

src/schemes/fluid/surface_normal_sph.jl

test/schemes/fluid/surface_normal_sph.jl

src/schemes/fluid/fluid.jl

efaulhaber · 2024-12-09T08:19:03Z

src/schemes/boundary/system.jl

+function initialize_colorfield!(system, ::BoundaryModelDummyParticles, neighborhood_search)
+    system_coords = system.coordinates
+    (; smoothing_kernel, smoothing_length) = system.boundary_model
+
+    foreach_point_neighbor(system, system,
+                           system_coords, system_coords,
+                           neighborhood_search,
+                           points=eachparticle(system)) do particle, neighbor, pos_diff,
+                                                           distance
+        system.boundary_model.cache.colorfield_bnd[particle] += kernel(smoothing_kernel,
+                                                                       distance,
+                                                                       smoothing_length)
+        system.boundary_model.cache.neighbor_count[particle] += 1
+    end
+    return system
+end


Please add a test.

I have added a test but this test will change in all subsequent PRs

I think that is better than reducing coverage here and potentially forgetting about it.

I am currently working on #680 and #681. There are only merge errors accumulating in the rest of the chain...

efaulhaber · 2024-12-09T08:21:59Z

src/general/system.jl

+    return floor(Int, pi * compact_support^2 / particle_spacing^2)
+end
+
+@inline @fastpow function ideal_neighbor_count(::Val{3}, particle_spacing, compact_support)


Please check the codecov report. This is not covered, but the 2D version is.

A test for this exists in #584

Can you add it here or does it require other code from #584?

Its indirectly tested since it is used in a tested function.

efaulhaber · 2024-12-09T08:24:06Z

src/schemes/fluid/surface_normal_sph.jl

+# Section 2.2 in Akinci et al. 2013 "Versatile Surface Tension and Adhesion for SPH Fluids"
+# Note: This is the simplest form of normal approximation commonly used in SPH and comes
+# with serious deficits in accuracy especially at corners, small neighborhoods and boundaries
+function calc_normal_akinci!(system, neighbor_system::BoundarySystem, u_system, v,


Please check Codecov report. This is missing tests.

Testing this doesn't make much sense. Since there is no analytical value. And it will change in all subsequent PRs.

Let me restate that there is a analytical value but the results will not be close. Just closer than without it.

There must be some useful way to test this. Maybe with a high resolution and very large smoothing length?

It should be noted that I am currently only working on a much different code. So I am completely confused.
Anyway this function is renamed in a future version since it is merged with the other normal method and then split because it became too long. The condition that is used here is also changed.

What I mean here is that the results close to the wall in all versions are not reliable anyway. So the test would break down to testing that a nonzero value exists in this version.

efaulhaber

A bunch of small remarks, otherwise this is ready to merge from my side.

efaulhaber · 2025-01-24T14:02:26Z

docs/make.jl

                 "Systems" => [
-                     "Discrete Element Method (Solid)" => joinpath("systems",
-                                                                   "dem.md"),
+                     "Fluid Models" => joinpath("systems", "fluid.md"),
+                     "Discrete Element Method (Solid)" => joinpath("systems", "dem.md"),


Would it make more sense to make it like this:

Systems

Fluid Models

Overview (with the new content that you added in "fluid.md")

WCSPH

EDAC

DEM

Now we have "Fluid Models" on the same level as "WCSPH" and "EDAC", which is confusing to me, as these are fluid models.

efaulhaber · 2025-01-24T14:06:36Z

docs/src/systems/fluid.md

+The classical model is composed of the curvature minimization and cohesion force.
+
+#### Cohesion force
+The model calculates the cohesion force based on the distance between particles and the support radius ``h_c``.


Suggested change

The model calculates the cohesion force based on the distance between particles and the support radius ``h_c``.

The model calculates the cohesion force based on the support radius ``h_c`` and the distance between particles.

I read this as "distance between (particles and support radius)".

efaulhaber · 2025-01-24T14:06:54Z

docs/src/systems/fluid.md

+The model calculates the cohesion force based on the distance between particles and the support radius ``h_c``.
+This force is determined using two distinct regimes within the support radius:
+- For particles closer than half the support radius,
+  a repulsive force is calculated to prevent particle clustering too tightly,


Suggested change

a repulsive force is calculated to prevent particle clustering too tightly,

a repulsive force is calculated to prevent particles from clustering too tightly,

efaulhaber · 2025-01-24T14:14:46Z

examples/fluid/dam_break_oil_film_2d.jl

+              gravity=gravity, tspan=tspan, density_diffusion=nothing,
+              sound_speed=sound_speed, prefix="")


I'm confused. Why is the tspan needed when sol = nothing?

efaulhaber · 2025-01-24T14:19:49Z

examples/fluid/falling_water_spheres_2d.jl

@@ -40,7 +40,7 @@ sphere2 = SphereShape(fluid_particle_spacing, sphere_radius, sphere2_center,

 # ==========================================================================================
 # ==== Fluid
-fluid_smoothing_length = 1.0 * fluid_particle_spacing
+fluid_smoothing_length = 1.0 * fluid_particle_spacing - eps()


Why is this necessary? It shouldn't be necessary, that would be confusing. Is this trixi-framework/PointNeighbors.jl#19?

efaulhaber · 2025-01-24T14:49:58Z

test/schemes/fluid/surface_normal_sph.jl

+    @test isapprox(computed_normals[:, surface_particles],
+                   expected_normals[:, surface_particles], norm=x -> norm(x, Inf),
+                   atol=0.05)


Suggested change

@test isapprox(computed_normals[:, surface_particles],

expected_normals[:, surface_particles], norm=x -> norm(x, Inf),

atol=0.05)

@test isapprox.(computed_normals[:, surface_particles],

expected_normals[:, surface_particles], atol=0.05)

My earlier suggestions were stupid.

efaulhaber · 2025-01-24T14:51:23Z

test/schemes/fluid/surface_normal_sph.jl

+    # end
+end
+
+@testset "Sphere Surface Normals with wall" begin


Suggested change

@testset "Sphere Surface Normals with wall" begin

@testset "Sphere Surface Normals with Wall" begin

efaulhaber · 2025-01-24T14:52:07Z

test/schemes/fluid/surface_normal_sph.jl

+
+    # Boundary system
+    bnd_color = bnd_system.boundary_model.cache.colorfield_bnd
+    # this is only true since it assumed that the color is 1


Suggested change

# this is only true since it assumed that the color is 1

# This is only true since it assumed that the color is 1

efaulhaber · 2025-01-24T14:52:36Z

test/schemes/fluid/surface_normal_sph.jl

+    @test isapprox(computed_normals[:, surface_particles],
+                   expected_normals[:, surface_particles], norm=x -> norm(x, Inf),
+                   atol=0.5)


Suggested change

@test isapprox(computed_normals[:, surface_particles],

expected_normals[:, surface_particles], norm=x -> norm(x, Inf),

atol=0.5)

@test isapprox.(computed_normals[:, surface_particles],

expected_normals[:, surface_particles], atol=0.5)

efaulhaber · 2025-01-24T14:53:14Z

test/schemes/fluid/surface_normal_sph.jl

+    # Optionally, check that normals for interior particles are zero
+    # for i in setdiff(1:nparticles, surface_particles)
+    #     @test isapprox(norm(system.cache.surface_normal[:, i]), 0.0, atol=1e-4)
+    # end


Can you add a comment then, please?

svchb added 30 commits September 6, 2023 01:01

Merge remote-tracking branch 'origin/main' into main

f90f017

Merge branch 'trixi-framework:main' into main

372d67c

Merge branch 'main' of github.com:svchb/TrixiParticles.jl

f564478

Merge branch 'trixi-framework:main' into main

9c9e182

Merge branch 'main' of github.com:svchb/TrixiParticles.jl

90897f6

Merge branch 'main' of github.com:svchb/TrixiParticles.jl

1df6912

Merge branch 'main' of github.com:svchb/TrixiParticles.jl

6449b5f

merge by hand

439210f

Merge branch 'HEAD' into ipf_surface_tension

b31640f

Merge branch 'HEAD' into ipf_surface_tension

675c030

Merge branch 'HEAD' into ipf_surface_tension

2b0b09c

Merge branch 'HEAD' into ipf_surface_tension

b812869

Merge branch 'HEAD' into ipf_surface_tension

c3884d7

Merge branch 'HEAD' into ipf_surface_tension

45938eb

Merge tag 'HEAD' into ipf_surface_tension

3bdfc20

Merge branch 'conflict1'

de4f0e8

Conflicts: src/schemes/fluid/weakly_compressible_sph/system.jl

fix merge problems

c49dd87

fix merge

780cee3

fix merge

7550c3d

fix merge

87c21b9

fix merge

9cab05f

fix merge

896faef

more merge fixes

b567c55

format

3de9a75

fix

06a1223

fix

31d4404

fix

a95a54a

fix

ce74643

fix

17da7ef

more fixes

f002d2b

svchb added 4 commits December 4, 2024 13:56

review comments

dd56f47

Merge branch 'generalize_surface_normal_calc' of https://github.com/s…

306f96d

…vchb/TrixiParticles.jlOpen into generalize_surface_normal_calc

fix test

93630aa

typo

9f758be

efaulhaber reviewed Dec 9, 2024

View reviewed changes

test/schemes/fluid/surface_normal_sph.jl Outdated Show resolved Hide resolved

test/schemes/fluid/surface_normal_sph.jl Outdated Show resolved Hide resolved

efaulhaber requested changes Dec 9, 2024

View reviewed changes

svchb added 19 commits December 12, 2024 16:15

Merge branch 'main' into generalize_surface_normal_calc

cd26885

review updates

80e51ba

review update

4721aec

add boundary system

98a5f6c

update

e05edea

update

36741d7

format

ba8765f

Merge branch 'main' into generalize_surface_normal_calc

e174b1c

Merge branch 'main' into generalize_surface_normal_calc

fa6274d

remove color since it is unused in this PR

8a413d6

review comment

c737197

format

5f3c7ed

merge error

dafb7df

review comment

1ce2af5

fix

73cfc8f

remove surface_normal_method()

4b5a1ab

merge error

a7764d2

function was renamed in PN

ca0de6a

format

32f12de

svchb requested a review from efaulhaber January 21, 2025 17:56

svchb added 3 commits January 21, 2025 20:52

fix test

d64343a

fix error

f7f8620

fix

e783541

efaulhaber requested changes Jan 24, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Generalize surface normal calc #539

Generalize surface normal calc #539

svchb commented May 29, 2024 •

edited

Loading

efaulhaber Dec 9, 2024

svchb Dec 13, 2024

efaulhaber Dec 16, 2024

svchb Jan 21, 2025 •

edited

Loading

efaulhaber Dec 9, 2024

svchb Dec 12, 2024

efaulhaber Dec 16, 2024

svchb Jan 21, 2025

efaulhaber Dec 9, 2024

svchb Dec 13, 2024

svchb Dec 13, 2024

efaulhaber Dec 16, 2024

svchb Jan 21, 2025

efaulhaber left a comment

efaulhaber Jan 24, 2025

efaulhaber Jan 24, 2025

efaulhaber Jan 24, 2025

efaulhaber Jan 24, 2025

efaulhaber Jan 24, 2025

efaulhaber Jan 24, 2025

efaulhaber Jan 24, 2025

efaulhaber Jan 24, 2025

efaulhaber Jan 24, 2025

efaulhaber Jan 24, 2025

	The model calculates the cohesion force based on the distance between particles and the support radius ``h_c``.
	The model calculates the cohesion force based on the support radius ``h_c`` and the distance between particles.

	a repulsive force is calculated to prevent particle clustering too tightly,
	a repulsive force is calculated to prevent particles from clustering too tightly,

		gravity=gravity, tspan=tspan, density_diffusion=nothing,
		sound_speed=sound_speed, prefix="")

	@testset "Sphere Surface Normals with wall" begin
	@testset "Sphere Surface Normals with Wall" begin

	# this is only true since it assumed that the color is 1
	# This is only true since it assumed that the color is 1

Generalize surface normal calc #539

Are you sure you want to change the base?

Generalize surface normal calc #539

Conversation

svchb commented May 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

svchb Jan 21, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

efaulhaber left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

svchb commented May 29, 2024 •

edited

Loading

svchb Jan 21, 2025 •

edited

Loading