Dem dmt force model #1045

OGaboriault · 2024-02-27T23:29:08Z

New feature

New DMT contact force model.

How Has This Been Tested?

Application test need to be added. I think I'm just going to use the same test as the JKR model. Coming soon

Documentation

Theory has been refactor.

include/dem/particle_particle_contact_force.h

blaisb

fiest batch

doc/source/theory/dem/dem.rst

acdaigneault

This is the first batch because I saw Bruno posted a review.

doc/source/theory/dem/dem.rst

acdaigneault

Nice model! Some comments for the doc. Also, I think you did update the theory guide, but not the parameter guide.

doc/source/theory/dem/dem.rst

applications_tests/lethe-particles/pp_jkr_equilibrium.prm

acdaigneault

Nothing else to say except that p-w contact models really need a refactor as p-p contact, lots of copy and paste

source/dem/particle_wall_dmt_force.cc

blaisb

Some more comments. I will finish the rest tomorrow

doc/source/theory/dem/dem.rst

include/dem/particle_wall_dmt_force.h

blaisb · 2024-03-03T16:28:23Z

@voferreira could y ou also give it a look?

voferreira · 2024-03-03T16:30:52Z

@blaisb Absolutely. I will start looking into it Today and finish Tomorrow or so.

acdaigneault

I reviewed everything and compared the much I could with the code. I would say maybe make sure it fits, but it's a pretty good work with the references. (I like to check the equation haha)
I have another comment, we can discuss it in person, but since you use many time variables store (i.e. surface energy, young modulus, ...) in tables, use variables so you prevent many access to the value and also it helps to read the code. I can help you with refactoring if you want (for another PR)

applications_tests/lethe-particles/pp_jkr_equilibrium.output

acdaigneault · 2024-03-05T14:50:41Z

applications_tests/lethe-particles/pp_jkr_equilibrium.prm

@@ -28,7 +28,7 @@ subsection model parameters
    set neighborhood threshold                  = 20
  end
  subsection load balancing
-    set load balance method = once
+    set load balance method = none


You can remove the load balancing for all test

doc/source/theory/dem/dem.rst

source/dem/particle_particle_contact_force.cc

voferreira

Good job! Nice that you implemented the models separately (2 prs) and also took the time to do a theory guide on it. I would change a bit the architecture here to reduce the amount of repeated code, but we already talked about this. Let me know what you have decided and I will give it a read again when you have the final version.

doc/source/theory/dem/dem.rst

include/dem/particle_particle_contact_force.h

include/dem/particle_wall_contact_force.h

source/core/parameters_lagrangian.cc

source/dem/particle_wall_dmt_force.cc

Applying comments Co-authored-by: Audrey Collard-Daigneault <[email protected]> Co-authored-by: Victor Oliveira Ferreira <[email protected]>

New feature New DMT contact force model. How Has This Been Tested? Application test need to be added. I think I'm just going to use the same test as the JKR model. Coming soon Documentation Theory has been refactor. Co-authored-by: Audrey Collard-Daigneault <[email protected]> Co-authored-by: Victor Oliveira Ferreira <[email protected]> Former-commit-id: d3ef43a

OGaboriault added Enhancement New feature or request Ready for review labels Feb 27, 2024

OGaboriault requested review from blaisb and acdaigneault February 27, 2024 23:29

OGaboriault self-assigned this Feb 27, 2024

acdaigneault reviewed Feb 28, 2024

View reviewed changes

include/dem/particle_particle_contact_force.h Outdated Show resolved Hide resolved

OGaboriault force-pushed the dem_DMT_force_model branch from e79887d to 77b4b42 Compare February 28, 2024 15:49

acdaigneault self-requested a review February 29, 2024 19:24

blaisb requested changes Feb 29, 2024

View reviewed changes

doc/source/theory/dem/dem.rst Outdated Show resolved Hide resolved

doc/source/theory/dem/dem.rst Outdated Show resolved Hide resolved

doc/source/theory/dem/dem.rst Outdated Show resolved Hide resolved

doc/source/theory/dem/dem.rst Outdated Show resolved Hide resolved

acdaigneault reviewed Feb 29, 2024

View reviewed changes

blaisb requested changes Feb 29, 2024

View reviewed changes

acdaigneault requested changes Feb 29, 2024

View reviewed changes

source/dem/particle_wall_dmt_force.cc Show resolved Hide resolved

blaisb requested changes Mar 1, 2024

View reviewed changes

blaisb added Reviewed and waiting for changes and removed Ready for review labels Mar 1, 2024

OGaboriault force-pushed the dem_DMT_force_model branch from 8add0da to 09c280f Compare March 3, 2024 02:02

OGaboriault requested review from acdaigneault and blaisb March 3, 2024 02:08

voferreira self-requested a review March 3, 2024 16:31

acdaigneault requested changes Mar 5, 2024

View reviewed changes

voferreira requested changes Mar 6, 2024

View reviewed changes

OGaboriault added 6 commits March 6, 2024 13:59

Erroe in the @param of the JKR model

6384a14

Errors in the comments of JKR pw

aab4639

pw DMT works

e529a60

Small correction to the coulomb limit

c927889

P_P contact is compiling, need to be tested.

36df409

Updating tests

1864d94

OGaboriault added 13 commits March 6, 2024 13:59

Refactor theory, last step is the application tests

b60fd95

Comments and theory

593aecc

Revert application test

dcf8fb7

Went back for the tangential force for the nonlinear model...

4626013

Update doc

0d0d43d

JKR test were taking to long to run (2 minutes)

934176d

Revert JKR model

1e44882

DMT tests

4689414

Start to apply comments

dd0c961

Applying other comments

799ece5

Need to update tests

2844846

Doc is done

b8c2f06

Applying comments

100de8a

OGaboriault force-pushed the dem_DMT_force_model branch from 09c280f to 100de8a Compare March 6, 2024 20:31

OGaboriault and others added 4 commits March 6, 2024 15:45

Apply suggestions from code review

023e435

Applying comments Co-authored-by: Audrey Collard-Daigneault <[email protected]> Co-authored-by: Victor Oliveira Ferreira <[email protected]>

Comments local

be6cb09

Application test are remaining

9990e8d

Update tests

3c2af06

OGaboriault added Ready for review and removed Reviewed and waiting for changes labels Mar 7, 2024

acdaigneault approved these changes Mar 7, 2024

View reviewed changes

blaisb approved these changes Mar 7, 2024

View reviewed changes

blaisb requested a review from voferreira March 7, 2024 21:35

voferreira approved these changes Mar 7, 2024

View reviewed changes

blaisb added Reviewed and ready to merge and removed Ready for review labels Mar 8, 2024

blaisb merged commit d3ef43a into master Mar 8, 2024
8 checks passed

blaisb deleted the dem_DMT_force_model branch March 8, 2024 22:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dem dmt force model #1045

Dem dmt force model #1045

OGaboriault commented Feb 27, 2024

blaisb left a comment

acdaigneault left a comment

acdaigneault left a comment

acdaigneault left a comment

blaisb left a comment

blaisb commented Mar 3, 2024

voferreira commented Mar 3, 2024

acdaigneault left a comment •

edited

Loading

acdaigneault Mar 5, 2024

voferreira left a comment •

edited

Loading

Dem dmt force model #1045

Dem dmt force model #1045

Conversation

OGaboriault commented Feb 27, 2024

New feature

How Has This Been Tested?

Documentation

blaisb left a comment

Choose a reason for hiding this comment

acdaigneault left a comment

Choose a reason for hiding this comment

acdaigneault left a comment

Choose a reason for hiding this comment

acdaigneault left a comment

Choose a reason for hiding this comment

blaisb left a comment

Choose a reason for hiding this comment

blaisb commented Mar 3, 2024

voferreira commented Mar 3, 2024

acdaigneault left a comment • edited Loading

Choose a reason for hiding this comment

acdaigneault Mar 5, 2024

Choose a reason for hiding this comment

voferreira left a comment • edited Loading

Choose a reason for hiding this comment

acdaigneault left a comment •

edited

Loading

voferreira left a comment •

edited

Loading