Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mpcd Cosine and CosineExpansionContraction Channels #1836

Merged
merged 31 commits into from
Sep 10, 2024

Conversation

baho-cb
Copy link
Contributor

@baho-cb baho-cb commented Jul 5, 2024

Description

This PR adds two new mpcd streaming geometries: Serpentine channel (CosineChannel) and sinusoidal expansion and contraction channel (CosineExpansionContraction).

This PR should be merged after the rejection filler PR (#1822). This PR has been merged.

Motivation and context

Resolves #1775, #1776

How has this been tested?

Python tests are added for the geometries and streaming.

Change log

* `mpcd.geometry.CosineChannel` for a serpentine (cosine) channel.
* `mpcd.geometry.CosineExpansionContraction` for an expansion-contraction channel.

Checklist:

baho-cb and others added 18 commits June 13, 2024 14:46
Move Tzortzis's files to the branch

Add new geometries to Cmakelists

Add new geometries to StreamingGeometry.h and cc

Change geometry filenames

Add geometries to module.cc

some fixes

more changes in geometry files

More fixes

Fix compile errors

Fix import errors

Fix cuda compile errors

Fix more compile errors

Fix import errors

Fix more import errors for GPU

Fix typo

Fix geometry names

Fix gpu array error

Add pytests

Fix pytest out of box

Fix tests

fix comments

Remove fillers

Run pre-commit on geometry files
@baho-cb baho-cb requested review from a team, joaander, SchoeniPhlippsn and rayasare and removed request for a team July 5, 2024 22:59
hoomd/mpcd/geometry.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@mphoward mphoward left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! I have a couple small comments on the code, but then I think this is ready for review by others.

hoomd/mpcd/CosineChannelGeometry.h Outdated Show resolved Hide resolved
hoomd/mpcd/CosineChannelGeometry.h Show resolved Hide resolved
hoomd/mpcd/CosineChannelGeometry.h Outdated Show resolved Hide resolved
hoomd/mpcd/CosineChannelGeometry.h Outdated Show resolved Hide resolved
hoomd/mpcd/CosineChannelGeometry.h Outdated Show resolved Hide resolved
hoomd/mpcd/CosineChannelGeometry.h Outdated Show resolved Hide resolved
hoomd/mpcd/CosineChannelGeometry.h Outdated Show resolved Hide resolved
hoomd/mpcd/CosineChannelGeometry.h Outdated Show resolved Hide resolved
hoomd/mpcd/CosineExpansionContractionGeometry.h Outdated Show resolved Hide resolved
Copy link

github-actions bot commented Aug 8, 2024

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@github-actions github-actions bot added the stale There has been no activity on this for some time. label Aug 8, 2024
@github-actions github-actions bot removed the stale There has been no activity on this for some time. label Aug 15, 2024
Copy link

github-actions bot commented Sep 5, 2024

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@github-actions github-actions bot added the stale There has been no activity on this for some time. label Sep 5, 2024
@mphoward mphoward removed the stale There has been no activity on this for some time. label Sep 6, 2024
Copy link
Collaborator

@mphoward mphoward left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! We have been using CosineExpansionContractionGeometry extensively in DPD simulations without any issues. This is ready for other reviewers to take a look and approve before merging.

@joaander
Copy link
Member

joaander commented Sep 6, 2024

Please merge the latest glotzerlab:trunk-minor and see if that allows the unit tests to execute.

@mphoward
Copy link
Collaborator

mphoward commented Sep 6, 2024

Oops, sorry about that! Should be taken care of.

Copy link
Member

@joaander joaander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@joaander joaander merged commit 9d56480 into glotzerlab:trunk-minor Sep 10, 2024
35 checks passed
@mphoward mphoward added the mpcd MPCD component label Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mpcd MPCD component
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants