Skip to content

Merge devel into master#464

Merged
amcadmus merged 15 commits intodeepmodeling:masterfrom
amcadmus:master
May 4, 2023
Merged

Merge devel into master#464
amcadmus merged 15 commits intodeepmodeling:masterfrom
amcadmus:master

Conversation

@amcadmus
Copy link
Member

@amcadmus amcadmus commented May 4, 2023

No description provided.

amcadmus and others added 15 commits February 28, 2023 13:17
Remove the outlier frames that satisfy 

$$
\frac{\left \| E - \bar{E} \right \|}{\sigma(E)} \geq \text{threshold}
$$

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/psf/black: 22.12.0 →
23.1.0](psf/black@22.12.0...23.1.0)
<!--pre-commit.ci end-->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
From QE v7.2, pw.x prints each contributions to forces acting on atoms
(i.e. non-local, ionic, local, core correction, etc...), right after
original 'Forces acting on atoms' without blank line. Thus, it make
'list index out of range' error, from ret.append(...) in get_force.

This changes make length of list blk in get_forces same as total number
of atoms, avoiding out of range error.

---------

Signed-off-by: pee8379 <pee8379@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/psf/black: 23.1.0 →
23.3.0](psf/black@23.1.0...23.3.0)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
modification:
1.  float precision from float32 to float 64
2. comparison between pos.xyz and log file is too strict!. just
approximately checking is sufficient.
math.isclose(log_info_dict["energies"], xyz_info_dict["energies"],
abs_tol=1.0e-6),

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
In ABACUS version >= v3.1.4, the format of file "MD_dump" is different.
The lattice constant line is added by the unit "Angstrom" at the end,
and the position is the real cartesian coordinate.
MD_dump is changed from 
```
MDSTEP:  0
LATTICE_CONSTANT: 23.453780000000
LATTICE_VECTORS
  1.000000000000  0.000000000000  0.000000000000
  0.000000000000  1.000000000000  0.000000000000
  0.000000000000  0.000000000000  1.000000000000
VIRIAL (KBAR)
  36.689617311102  0.000000000001  -0.000000000000
  0.000000000001  36.689617311104  -0.000000000001
  -0.000000000000  -0.000000000001  36.689617311147
INDEX    LABEL    POSITIONS    FORCE (eV/Angstrom)
  0  Sn  0.000000000000  0.000000000000  0.000000000000  -0.000000000000  0.000000000000  -0.000000000000
  1  Sn  0.000000000000  0.250000000000  0.250000000000  -0.000186795145  -0.000453823732  -0.000453823732
```

to

```
MDSTEP:  0
LATTICE_CONSTANT: 12.411200939060 Angstrom
LATTICE_VECTORS
  1.000000000000  0.000000000000  0.000000000000
  0.000000000000  1.000000000000  0.000000000000
  0.000000000000  0.000000000000  1.000000000000
VIRIAL (kbar)
  36.689617311101  0.000000000003  -0.000000000000
  0.000000000003  36.689617311089  -0.000000000001
  -0.000000000000  -0.000000000001  36.689617311135
INDEX    LABEL    POSITION (Angstrom)    FORCE (eV/Angstrom)    VELOCITY (Angstrom/fs)
  0  Sn  0.000000000000  0.000000000000  0.000000000000  -0.000000000000  -0.000000000001  -0.000000000001  0.001244557166  -0.000346684288  0.000768457739
  1  Sn  0.000000000000  3.102800034079  3.102800034079  -0.000186795145  -0.000453823768  -0.000453823768  0.000550996187  -0.000886442775  0.001579501983
```

---------

Signed-off-by: pxlxingliang <91927439+pxlxingliang@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
<!--pre-commit.ci start-->
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.243 →
v0.0.262](astral-sh/ruff-pre-commit@v0.0.243...v0.0.262)
<!--pre-commit.ci end-->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Split a MultiSystems into training and test sub sets

---------

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
<!--pre-commit.ci start-->
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.262 →
v0.0.263](astral-sh/ruff-pre-commit@v0.0.262...v0.0.263)
<!--pre-commit.ci end-->

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@codecov
Copy link

codecov bot commented May 4, 2023

Codecov Report

Patch coverage: 91.07% and project coverage change: +0.25 🎉

Comparison is base (9507165) 82.51% compared to head (b73b239) 82.76%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #464      +/-   ##
==========================================
+ Coverage   82.51%   82.76%   +0.25%     
==========================================
  Files          68       70       +2     
  Lines        6198     6313     +115     
==========================================
+ Hits         5114     5225     +111     
- Misses       1084     1088       +4     
Impacted Files Coverage Δ
dpdata/amber/mask.py 84.21% <ø> (ø)
dpdata/amber/md.py 97.53% <ø> (ø)
dpdata/amber/sqm.py 98.85% <ø> (ø)
dpdata/cli.py 0.00% <ø> (ø)
dpdata/deepmd/hdf5.py 86.07% <0.00%> (ø)
dpdata/deepmd/mixed.py 85.40% <0.00%> (ø)
dpdata/format.py 88.13% <ø> (-0.20%) ⬇️
dpdata/md/rdf.py 0.00% <ø> (ø)
dpdata/md/water.py 63.11% <ø> (-0.60%) ⬇️
dpdata/plugins/3dmol.py 46.66% <ø> (ø)
... and 41 more

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@amcadmus amcadmus merged commit 85a3b5e into deepmodeling:master May 4, 2023
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.

5 participants