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

Update: Organize e3, add e3 statistics in LMDB dataset and add e3 fitting of overlap #183

Merged
merged 16 commits into from
Jun 6, 2024

Conversation

floatingCatty
Copy link
Member

No description provided.

@floatingCatty floatingCatty requested a review from QG-phy June 5, 2024 09:08
# Hamiltonian_blocks should be a h5 group in the current version
assert blocks != False or overlap_blocks!=False, "Both feature block and overlap blocks are not provided."

if blocks != False:
Copy link
Collaborator

Choose a reason for hiding this comment

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

这里隐含逻辑 block 和 overlap_block 不能同时!=False。 所以可以if else
是不是加一个assert block 和overlap block 只能有一个。不能同时存在

Copy link
Member Author

Choose a reason for hiding this comment

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

现在是可以同时存在,都有的话,block parse到edge/node feature, overlap block parse 到 node/edge overlap

if blocks:
onsite_ham = []
if overlap_blocks and not orthogonal:
Copy link
Collaborator

Choose a reason for hiding this comment

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

有overlap 不就是不正交? 这两个参数是不是冗余了?

Copy link
Member Author

Choose a reason for hiding this comment

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

orthogonal 本来是想设计一个控制有没有onsite 相同l的轨道之间的overlap的开关,但现在没用到

Comment on lines +731 to +741
for j, jo in enumerate(self.full_basis[i:]):
ir, jr = int(io[0]), int(jo[0])
iio, jjo = io[1], jo[1]
if iio == jjo:
orbcount = self.orbtype_count[iio]
full_basis_pair = io+"-"+jo
start = int(self.skonsitetype_maps[iio].start + ((2*self.orbtype_count[jjo]-ir+2) * (ir-1) / 2 + jr - ir))
# start = int(self.skonsitetype_maps[iio].start + (ir-1))
self.skonsite_maps[full_basis_pair] = slice(start, start+1)
if io == jo:
self.mask_diag[start] = True
Copy link
Collaborator

Choose a reason for hiding this comment

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

这个新情况下的 onsitemap 和 onsitetype_map 测试新加了吗? 之前的测试里面应该是没这样重复轨道出现的情况。

Copy link
Member Author

Choose a reason for hiding this comment

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

这个没加,我看看

@QG-phy
Copy link
Collaborator

QG-phy commented Jun 6, 2024

我审完了,没问题。

@floatingCatty floatingCatty merged commit 476c215 into deepmodeling:main Jun 6, 2024
2 checks passed
@floatingCatty floatingCatty deleted the organize_e3 branch June 14, 2024 04:30
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.

2 participants