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

发现粘性力功率计算的实现和公式(4.59)有出入 #11

Closed
wants to merge 8 commits into from
Closed

发现粘性力功率计算的实现和公式(4.59)有出入 #11

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9222a56
修改注释中的错别字&三次光滑函数中的写法有点冗杂，用注释说明了
ZZPHUB Dec 1, 2023
3da1963
修改了src/nnps/direct_find.f90中的注释，并且在doc/src/程序流程图.md中添加了各个源文件对应的基本介绍。
ZZPHUB Dec 1, 2023
36a6dae
发现粘性力功率计算中似乎有点小问题，用注释在/src/single_step/internal_force.f90中进行的重新实现。
ZZPHUB Dec 2, 2023
679bb9e
增加了一些注释
ZZPHUB Dec 2, 2023
10a07fd
新增了一些注释，并发现了一些不理解的实现方式。我认为是错误的地方都进行了修改，但都进行了注释，保留了原来的代码。
ZZPHUB Dec 3, 2023
31b90ca
修改了一些注释
ZZPHUB Dec 4, 2023
f08e0ca
Merge branch 'zoziha:main' into zzp
ZZPHUB Dec 6, 2023
5c06c28
改正了之前pr中的错误，同时在上次pr后又发现了一点小问题，并且在注释中说明了。
ZZPHUB Dec 6, 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
3 changes: 2 additions & 1 deletion src/kernel/kernel.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!> 计算光滑函数 Wij 及其倒数 dWdxij 的子例程
!> 计算光滑函数 Wij 及其导数 dWdxij 的子例程
!> subroutine to calculate the smoothing kernel wij and its
!> derivatives dwdxij.
subroutine kernel(r, dx, hsml, w, dwdx)
Expand Down Expand Up @@ -53,6 +53,7 @@ subroutine kernel(r, dx, hsml, w, dwdx)
w = factor*1._rk/6._rk*(2._rk - q)**3
do d = 1, dim
dwdx(d) = -factor*1._rk/6._rk*3.*(2._rk - q)**2/hsml*(dx(d)/r)
!dwda(d) =-factor*(2._rk - q)**2/2*hsml*(dx(d)/r)
Copy link
Owner

Choose a reason for hiding this comment

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

dwdx(d)应该没有问题？

Copy link
Author

Choose a reason for hiding this comment

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

原来的写着比较冗余，所以我简化了一下

end do
else
w = 0._rk
Expand Down