merge master to devel#295

Merged

amcadmus merged 5 commits intodeepmodeling:develfrom

Nov 24, 2020

Commits on Oct 12, 2020

Commits on Nov 9, 2020

Update Data.py
bwang-ecnu
authored

Commits on Nov 13, 2020

change "coeff_ener=1" to "coeff"
bwang-ecnu
authored

Commits on Nov 15, 2020

Merge pull request #290 from bwang-ecnu/test-pr
amcadmus
authored