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

Fix dplr error #2436

Merged
merged 51 commits into from
Apr 17, 2023
Merged

Fix dplr error #2436

merged 51 commits into from
Apr 17, 2023

Conversation

Yi-FanLi
Copy link
Collaborator

@Yi-FanLi Yi-FanLi commented Apr 1, 2023

DPLR is broken due to the change of coeff(int narg, char **arg) function. The current coeff function requires that the number of types in LAMMPS no more than that in model. In dplr, however, there might be more types in LAMMPS than in the model. This check should be bypassed.

Yi-FanLi and others added 30 commits December 24, 2021 00:10
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
njzjz
njzjz previously approved these changes Apr 1, 2023
Copy link
Member

@njzjz njzjz left a comment

Choose a reason for hiding this comment

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

Approve, although I hope a test

@Yi-FanLi
Copy link
Collaborator Author

Yi-FanLi commented Apr 1, 2023

I added a test. However, I am not able to set up the pytest environment on my local computer right now. I pushed the test to this branch, and let's see how github actions perform on this test.

@njzjz njzjz self-requested a review April 1, 2023 23:05
@njzjz njzjz dismissed their stale review April 1, 2023 23:05

I will fix tests

@njzjz
Copy link
Member

njzjz commented Apr 1, 2023

I add select_real_atoms to model deviation in Yi-FanLi#2. It seems to me that the model deviation never works for DPLR?

@github-actions github-actions bot added the C++ label Apr 1, 2023
Copy link
Member

@njzjz njzjz left a comment

Choose a reason for hiding this comment

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

Ok, the tests have passed

@njzjz njzjz requested a review from wanghan-iapcm April 2, 2023 01:33
source/lmp/tests/data_type_map2.lmp Outdated Show resolved Hide resolved
source/lmp/tests/data2.lmp Outdated Show resolved Hide resolved
source/api_cc/src/DeepPot.cc Outdated Show resolved Hide resolved
@wanghan-iapcm wanghan-iapcm enabled auto-merge (squash) April 17, 2023 04:04
@wanghan-iapcm wanghan-iapcm merged commit 69e712c into deepmodeling:devel Apr 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants