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

Dplr unittest #2545

Merged
merged 43 commits into from
May 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
83242e7
explicitly set neighbor request to full in compute deeptensor/atom to…
Yi-FanLi Dec 24, 2021
181d967
Merge branch 'deepmodeling:devel' into devel
Yi-FanLi Jan 2, 2022
763dccc
Merge branch 'deepmodeling:devel' into devel
Yi-FanLi Mar 21, 2022
508be0b
Merge branch 'deepmodeling:devel' into devel
Yi-FanLi Apr 13, 2022
19c72f1
Corrected the pppm_dplr forward communication for ik differentiation …
Yi-FanLi Apr 14, 2022
4c94352
Merge branch 'deepmodeling:devel' into devel
Yi-FanLi Apr 14, 2022
9e0a8db
modify plugin so that it could find lammps in Yi-FanLi repo
Yi-FanLi May 8, 2022
ebca302
Merge branch 'deepmodeling:devel' into devel
Yi-FanLi Nov 17, 2022
f033fbf
Corrected convert 0.12 to 1.0
Yi-FanLi Nov 19, 2022
81e1ee9
Merge branch 'devel' of github.com:Yi-FanLi/deepmd-kit into devel
Yi-FanLi Nov 19, 2022
1b431ab
Merge branch 'deepmodeling:devel' into devel
Yi-FanLi Nov 19, 2022
518be7f
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
Yi-FanLi Jan 25, 2023
ded9aed
Fix merge conflict from upstream devel
Yi-FanLi Feb 4, 2023
8f98b54
change gridcomm to grid3d to support LAMMPS after commit 72b0a2d
Yi-FanLi Feb 4, 2023
69566ae
fix merge conflict
Yi-FanLi Feb 14, 2023
a01155f
Add a script to detect model version in deepmd/utils
Yi-FanLi Feb 14, 2023
a2a405d
make deep_pot.py consistent with deepmodeling devel branch
Yi-FanLi Feb 14, 2023
bf58952
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
Yi-FanLi Feb 17, 2023
8d81d69
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
Yi-FanLi Feb 19, 2023
3cd5aa1
delect detect_version.py as it is added into convert.py
Yi-FanLi Feb 20, 2023
f124213
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
Yi-FanLi Feb 20, 2023
cdd354c
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
Yi-FanLi Mar 3, 2023
698fc03
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
Yi-FanLi Mar 22, 2023
91770b4
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
Yi-FanLi Mar 24, 2023
33ba40d
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
Yi-FanLi Apr 1, 2023
c2bfab6
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
Yi-FanLi May 9, 2023
f4e2729
Merge branch 'devel' of https://github.com/deepmodeling/deepmd-kit in…
Yi-FanLi May 10, 2023
3571f0c
Correct dplr output in step 0
Yi-FanLi May 11, 2023
94b9be3
lmp: test dplr
Yi-FanLi May 19, 2023
b5f2736
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 19, 2023
81ea667
delete dpdipole model
Yi-FanLi May 19, 2023
8e93636
Merge branch 'dplr_unittest' of github.com:Yi-FanLi/deepmd-kit into d…
Yi-FanLi May 19, 2023
2b88c3e
build MOLECULE PKG for lammps
Yi-FanLi May 19, 2023
6852d76
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 19, 2023
7d84bc6
fix build_lammps typo
Yi-FanLi May 19, 2023
14ea08d
fix merge conflict
Yi-FanLi May 19, 2023
2e17f36
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 19, 2023
b1e5ff4
fix expected_e shapes
Yi-FanLi May 20, 2023
e33bfb5
Merge branch 'dplr_unittest' of github.com:Yi-FanLi/deepmd-kit into d…
Yi-FanLi May 20, 2023
0ca2329
fix write_lmp_data
Yi-FanLi May 20, 2023
4b2dc96
fix test_pair_deepmd_sr_virial
Yi-FanLi May 20, 2023
29a7a89
fix test_pair_deepmd_sr_virial by dumping atomic virials of only real…
Yi-FanLi May 20, 2023
704c58e
correct test_dplr
Yi-FanLi May 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/install/build_lammps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fi
cd ${BUILD_TMP_DIR}/lammps-${LAMMPS_VERSION}
mkdir -p ${BUILD_TMP_DIR}/lammps-${LAMMPS_VERSION}/build
cd ${BUILD_TMP_DIR}/lammps-${LAMMPS_VERSION}/build
cmake -C ../cmake/presets/all_off.cmake -D PKG_PLUGIN=ON -D PKG_KSPACE=ON -DLAMMPS_EXCEPTIONS=yes -D BUILD_SHARED_LIBS=yes -D LAMMPS_INSTALL_RPATH=ON -D CMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} -D CMAKE_INSTALL_LIBDIR=lib -D CMAKE_INSTALL_FULL_LIBDIR=${INSTALL_PREFIX}/lib ../cmake
cmake -C ../cmake/presets/all_off.cmake -D PKG_PLUGIN=ON -D PKG_KSPACE=ON -D PKG_MOLECULE=ON -DLAMMPS_EXCEPTIONS=yes -D BUILD_SHARED_LIBS=yes -D LAMMPS_INSTALL_RPATH=ON -D CMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} -D CMAKE_INSTALL_LIBDIR=lib -D CMAKE_INSTALL_FULL_LIBDIR=${INSTALL_PREFIX}/lib ../cmake

make -j${NPROC}
make install
Expand Down
4 changes: 3 additions & 1 deletion source/lmp/fix_dplr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,11 @@ void FixDPLR::init() {
// }
}

void FixDPLR::setup_pre_force(int vflag) { pre_force(vflag); }
wanghan-iapcm marked this conversation as resolved.
Show resolved Hide resolved

void FixDPLR::setup(int vflag) {
// if (strstr(update->integrate_style,"verlet"))
// post_force(vflag);
post_force(vflag);
// else {
// error->all(FLERR, "respa is not supported by this fix");
// }
Expand Down
1 change: 1 addition & 0 deletions source/lmp/fix_dplr.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class FixDPLR : public Fix {
~FixDPLR() override{};
int setmask() override;
void init() override;
void setup_pre_force(int) override;
void setup(int) override;
void post_integrate() override;
void pre_force(int) override;
Expand Down
Loading