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

Revert the sloppy intraBonded PR #474

Merged
merged 2 commits into from
Nov 29, 2022

Conversation

GregorySchwing
Copy link
Collaborator

Treating the energy members as public variables, and accessing them from multiple locations in the code is sloppy and difficult to maintain. The EnergyType variables should be made private and only modified/set by the CalcEn function of each move. This requires specifying one method signature for all the moves, instead of the current two formed approach.

Non-cbmc moves take a molecule index as the argument
CBMC moves pass a CBMC molecule object.

The molecule index can be used to retrieve a CBMC object, so it seems the molecule index should be passed to all methods as the argument, and CBMC moves can create/retrieve the CBMC molecule object internally.

Until this is finalized, this PR reverts the hacked together intraBonded terms.

@GregorySchwing GregorySchwing requested review from LSchwiebert, YounesN, bc118 and jpotoff and removed request for LSchwiebert November 7, 2022 16:59
@GregorySchwing
Copy link
Collaborator Author

fixes #473

@GregorySchwing GregorySchwing linked an issue Nov 7, 2022 that may be closed by this pull request
Copy link
Collaborator

@LSchwiebert LSchwiebert left a comment

Choose a reason for hiding this comment

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

The code looks fine but reverts some of the formatting that Younes fixed by running:

clang-format -style=llvm -i

If possible, please do that and then I will approve. If there is some reason not to run this, just comment on the request and I'll approve it.

@GregorySchwing
Copy link
Collaborator Author

clang-format -style=llvm -i

done

@LSchwiebert LSchwiebert merged commit 61fe617 into GOMC-WSU:development Nov 29, 2022
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.

Running IntraBond energy not being maintained in some cases
3 participants