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.

Sign up for GitHub

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

Jump to bottom

update devel with master #474

Merged
merged 29 commits into from
Jul 20, 2021
Merged

update devel with master #474

merged 29 commits into from
Jul 20, 2021

Commits on Jul 6, 2020

  1. fix the bug of the units of taut and taup

    Han Wang committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    2cac452 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2020

  1. Merge pull request #296 from amcadmus/master 

    fix the bug of the units of taut and taup
    @amcadmus
    amcadmus authored Jul 7, 2020
    Configuration menu
    Copy the full SHA
    413d945 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2020

  1. Merge pull request #318 from deepmodeling/devel 

    merge devel into master
    @amcadmus
    amcadmus authored Sep 9, 2020
    Configuration menu
    Copy the full SHA
    f8d70a4 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2021

  1. Merge pull request #353 from deepmodeling/devel 

    merge recent development on devel to master
    @amcadmus
    amcadmus authored Feb 23, 2021
    Configuration menu
    Copy the full SHA
    769ccf4 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. Merge pull request #358 from deepmodeling/devel 

    Solve the comparability issue of the pymatgen v2022.0.*
    @amcadmus
    amcadmus authored Mar 24, 2021
    Configuration menu
    Copy the full SHA
    b4e7264 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2021

  1. stop printing the dependencies, working around the issue of pymatgen.… 

    …__version__
    Han Wang committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    6eebb5a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #359 from amcadmus/master 

    stop printing the dependencies
    @amcadmus
    amcadmus authored Mar 25, 2021
    Configuration menu
    Copy the full SHA
    9b28d24 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2021

  1. Update issue templates

    @tuoping
    tuoping authored Apr 1, 2021
    Configuration menu
    Copy the full SHA
    ba613a0 View commit details
    Browse the repository at this point in the history

  2. Update issue templates

    @tuoping
    tuoping authored Apr 1, 2021
    Configuration menu
    Copy the full SHA
    adc7144 View commit details
    Browse the repository at this point in the history

  3. Update issue templates

    @tuoping
    tuoping authored Apr 1, 2021
    1 Configuration menu
    Copy the full SHA
    18f3b28 View commit details
    Browse the repository at this point in the history

  4. Update issue templates

    @tuoping
    tuoping authored Apr 1, 2021
    Configuration menu
    Copy the full SHA
    26e8e20 View commit details
    Browse the repository at this point in the history

  5. Update issue templates

    @tuoping
    tuoping authored Apr 1, 2021
    Configuration menu
    Copy the full SHA
    b03d8da View commit details
    Browse the repository at this point in the history

  6. Update issue templates

    @tuoping
    tuoping authored Apr 1, 2021
    Configuration menu
    Copy the full SHA
    54fbb94 View commit details
    Browse the repository at this point in the history

  7. Update issue templates

    @tuoping
    tuoping authored Apr 1, 2021
    Configuration menu
    Copy the full SHA
    c1625f4 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2021

  1. fix badge & add more badges

    @njzjz
    njzjz authored Apr 24, 2021
    Configuration menu
    Copy the full SHA
    f9e935d View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2021

  1. Merge pull request #377 from njzjz/patch-1 

    fix badge & add more badges
    @amcadmus
    amcadmus authored Apr 25, 2021
    Configuration menu
    Copy the full SHA
    00432d2 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2021

  1. add another check_status option for psate (PBS)

    Manyi Yang authored and Manyi Yang committed May 5, 2021
    Configuration menu
    Copy the full SHA
    d2e7971 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2021

  1. Merge pull request #396 from Manyi-Yang/master 

    add another check_status option for psate (PBS)
    @amcadmus
    amcadmus authored May 6, 2021
    Configuration menu
    Copy the full SHA
    0aa1b4f View commit details
    Browse the repository at this point in the history

Commits on May 19, 2021

  1. Add a local submission json file with 4-GPU. (#400) 

    * Add a local submission json file with 4-GPU.

* Update machine-local-4GPU.json

Added some comments. Thanks Yinan for checking.
    @Kick-H
    Kick-H authored May 19, 2021
    Configuration menu
    Copy the full SHA
    5af1fd5 View commit details
    Browse the repository at this point in the history

  2. Incorperate Yuzhis change to 4-GPU example

    Han Wang committed May 19, 2021
    Configuration menu
    Copy the full SHA
    650893f View commit details
    Browse the repository at this point in the history

Commits on May 24, 2021

  1. Incorperate Yuzhis change to 4-GPU example (#412) 

    Co-authored-by: Han Wang <[email protected]>
    @amcadmus
    amcadmus and Han Wang authored May 24, 2021
    Configuration menu
    Copy the full SHA
    fb08b80 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    Han Wang committed May 24, 2021
    Configuration menu
    Copy the full SHA
    0b922f2 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2021

  1. Fixed a bug in dpgen/auto_test/Lammps.py

    tuoping authored and tuoping committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    47645a5 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. Merge pull request #423 from tuoping/master 

    Fixed a bug in dpgen/auto_test/Lammps.py
    @amcadmus
    amcadmus authored Jun 3, 2021
    Configuration menu
    Copy the full SHA
    b3a6f4b View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Changed the error log of too many failed frames

    tuoping authored and tuoping committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    b4bd8a5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #428 from tuoping/master 

    Changed the error log of too many failed frames
    @amcadmus
    amcadmus authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    cc816d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2021

  1. Merge remote-tracking branch 'upstream/master'

    Han Wang committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    b36cf59 View commit details
    Browse the repository at this point in the history

  2. merge devel into master

    Han Wang committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    ea8a419 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #473 from amcadmus/master 

    merge devel into master
    @amcadmus
    amcadmus authored Jul 20, 2021
    Configuration menu
    Copy the full SHA
    da49465 View commit details
    Browse the repository at this point in the history