Skip to content

REFAC: replace sqrt(x*x+y*y) with hypot for 2D distance #280

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

Merged
Dengda98 merged 1 commit into from
Aug 4, 2026
Merged

REFAC: replace sqrt(x*x+y*y) with hypot for 2D distance #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pygrt/C_extension/src/common/travt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ real_t grt_compute_travt1d(
// =========================================================
// ------------------- 同层直达波 ----------------------
if(imax - imin == 1){ // 位于同一物理层
travt = sqrt(dist*dist + depdif*depdif) / vsrc;
travt = hypot(dist, depdif) / vsrc;
// printf("direct wave in same layer, travt=%f\n", travt);
}
else {
Expand Down
2 changes: 1 addition & 1 deletion pygrt/C_extension/src/dynamic/grt_greenfn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ int greenfn_main(int argc, char **argv) {
real_t delayT = 0.0;
if (! Ctrl->E.refFirstP){
delayT = Ctrl->E.delayT0;
if(Ctrl->E.delayV0 > 0.0) delayT += sqrt( GRT_SQUARE(dist) + GRT_SQUARE(Ctrl->D.deprcv - Ctrl->D.depsrc) ) / Ctrl->E.delayV0;
if(Ctrl->E.delayV0 > 0.0) delayT += hypot( dist, Ctrl->D.deprcv - Ctrl->D.depsrc ) / Ctrl->E.delayV0;
} else {
delayT = Ctrl->E.delayT0 + travtPS[ir][0];
}
Expand Down
2 changes: 1 addition & 1 deletion pygrt/C_extension/src/modal/grt_modsum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ int modsum_main(int argc, char **argv){
real_t delayT = 0.0;
if (! Ctrl->E.refFirstP){
delayT = Ctrl->E.delayT0;
if(Ctrl->E.delayV0 > 0.0) delayT += sqrt( GRT_SQUARE(dist) + GRT_SQUARE(Ctrl->D.deprcv - Ctrl->D.depsrc) ) / Ctrl->E.delayV0;
if(Ctrl->E.delayV0 > 0.0) delayT += hypot( dist, Ctrl->D.deprcv - Ctrl->D.depsrc ) / Ctrl->E.delayV0;
} else {
delayT = Ctrl->E.delayT0 + sac->hd.t0;
}
Expand Down
4 changes: 2 additions & 2 deletions pygrt/C_extension/src/modal/secular.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,8 @@ void grt_secular_function_potential_Rayl(
// 返回对应的垂直波函数
if(ppot != NULL){
// 假设一个比例
ppot[2] = - Det[0][1] / sqrt( GRT_SQUARE(fabs(Det[0][0])) + GRT_SQUARE(fabs(Det[0][1])) );
ppot[3] = + Det[0][0] / sqrt( GRT_SQUARE(fabs(Det[0][0])) + GRT_SQUARE(fabs(Det[0][1])) );
ppot[2] = - Det[0][1] / hypot( fabs(Det[0][0]), fabs(Det[0][1]) );
ppot[3] = + Det[0][0] / hypot( fabs(Det[0][0]), fabs(Det[0][1]) );
grt_cmat2x1_mul(mstat->M_BL.RD, ppot+2, ppot);
}
}
Expand Down
2 changes: 1 addition & 1 deletion pygrt/C_extension/src/static/grt_static_greenfn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ static void getopt_from_command(GRT_MODULE_CTRL *Ctrl, int argc, char **argv){
Ctrl->rs = (real_t*)calloc(Ctrl->nr, sizeof(real_t));
for(size_t ix=0; ix<Ctrl->X.nx; ++ix){
for(size_t iy=0; iy<Ctrl->Y.ny; ++iy){
Ctrl->rs[iy + ix*Ctrl->Y.ny] = GRT_MAX(sqrt(GRT_SQUARE(Ctrl->X.xs[ix]) + GRT_SQUARE(Ctrl->Y.ys[iy])), GRT_MIN_DISTANCE); // 避免0震中距
Ctrl->rs[iy + ix*Ctrl->Y.ny] = GRT_MAX(hypot(Ctrl->X.xs[ix], Ctrl->Y.ys[iy]), GRT_MIN_DISTANCE); // 避免0震中距
}
}

Expand Down
4 changes: 2 additions & 2 deletions pygrt/pymod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ def _get_stream_from_grn_spectra(
# 计算延迟
delayT = delayT0
if delayV0 > 0.0:
delayT += np.sqrt(dist**2 + (deprcv-depsrc)**2)/delayV0
delayT += np.hypot(dist, deprcv-depsrc)/delayV0

# 计算走时
travtP, travtS = self.compute_travt1d(dist)
Expand Down Expand Up @@ -638,7 +638,7 @@ def compute_static_grn(
rs = np.zeros((nr,), dtype=NPCT_REAL_TYPE)
for iy in range(ny):
for ix in range(nx):
rs[ix + iy*nx] = max(np.sqrt(xarr[ix]**2 + yarr[iy]**2), 1e-5)
rs[ix + iy*nx] = max(np.hypot(xarr[ix], yarr[iy]), 1e-5)
c_rs = npct.as_ctypes(rs)

# 设置波数积分间隔
Expand Down
Loading