Skip to content

Problem 2: Rebase rigid-shear and Cherry-Pick Override Commit#13

Open
SukiCai wants to merge 2 commits intoChem281Materials:developfrom
SukiCai:rigid-shear
Open

Problem 2: Rebase rigid-shear and Cherry-Pick Override Commit#13
SukiCai wants to merge 2 commits intoChem281Materials:developfrom
SukiCai:rigid-shear

Conversation

@SukiCai
Copy link

@SukiCai SukiCai commented Oct 10, 2025

Summary

This PR is to complete Problem 2 for CHEM281 Homework 2.

Related Issue(s)

  • rigid-shear branch rebased to develop branch
  • add missing override commit has been cherry pick from maintenance to rigid-shear branch
    • Note: add missing override is an empty commit, git commit --allow-empty has been applied according to the instructions

The commit dcf2dd2 ("indexing bug fix for ghost comm of remapped velocities across PBC when group all is not used") was dropped because it already exists in the develop branch. During the rebase of rigid-shear onto develop, this commit appeared in the branch history as part of the common base, but it does not represent any unique changes introduced by the rigid-shear branch. Keeping it would duplicate a commit that’s already part of the upstream develop history. Therefore, it was safe and appropriate to drop it to ensure the rebased branch contains only the two required commits :)

Author(s)

@SukiCai

Licensing

By submitting this pull request, I agree, that my contribution will be included in LAMMPS and redistributed under either the GNU General Public License version 2 (GPL v2) or the GNU Lesser General Public License version 2.1 (LGPL v2.1).

Backward Compatibility

Implementation Notes

Post Submission Checklist

  • The feature or features in this pull request is complete
  • Licensing information is complete
  • Corresponding author information is complete
  • The source code follows the LAMMPS formatting guidelines
  • Suitable new documentation files and/or updates to the existing docs are included
  • The added/updated documentation is integrated and tested with the documentation build system
  • The feature has been verified to work with the conventional build system
  • The feature has been verified to work with the CMake based build system
  • Suitable tests have been added to the unittest tree.
  • A package specific README file has been included or updated
  • One or more example input decks are included

Further Information, Files, and Links

@SukiCai SukiCai changed the title Rigid shear Problem 2: Rebase rigid-shear onto develop and Cherry-Pick Override Commit Oct 10, 2025
@SukiCai SukiCai changed the title Problem 2: Rebase rigid-shear onto develop and Cherry-Pick Override Commit Problem 2: Rebase rigid-shear and Cherry-Pick Override Commit Oct 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants