Skip to content

REFAC: demote Python-era C dual-call APIs to file-local helpers #288

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 12, 2026
Merged

REFAC: demote Python-era C dual-call APIs to file-local helpers #288

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: 0 additions & 2 deletions pygrt/C_extension/include/grt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include "grt/dynamic/grn.h"
#include "grt/dynamic/grnspec.h"
#include "grt/dynamic/layer.h"
#include "grt/dynamic/dyn_postprocess.h"
#include "grt/dynamic/signals.h"
#include "grt/dynamic/source.h"

Expand All @@ -59,7 +58,6 @@

#include "grt/static/static_grn.h"
#include "grt/static/static_layer.h"
#include "grt/static/static_postprocess.h"
#include "grt/static/static_source.h"


Expand Down
38 changes: 0 additions & 38 deletions pygrt/C_extension/include/grt/dynamic/dyn_postprocess.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pygrt/C_extension/include/grt/dynamic/grn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "grt/integral/integ_process.h"

/**
* 积分计算Z, R, T三个分量格林函数的频谱的核心函数（被Python调用）
* 积分计算Z, R, T三个分量格林函数的频谱的核心函数
*
* @param[in,out] mod1d `MODEL1D` 结构体指针
* @param[in,out] Kproc 波数积分相关参数的结构体指针
Expand Down
2 changes: 1 addition & 1 deletion pygrt/C_extension/include/grt/dynamic/signals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ float * grt_get_ricker_wave(float dt, float f0, int *Nt);
float * grt_get_custom_wave(int *Nt, const char *tfparams);

/**
* 专用于在Python端释放C中申请的内存
* 释放 C 侧 malloc 的一维数组
*
* @param[out] pt 指针
*/
Expand Down
45 changes: 0 additions & 45 deletions pygrt/C_extension/include/grt/static/static_postprocess.h
View file
Open in desktop

This file was deleted.

38 changes: 11 additions & 27 deletions 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 @@ -53,13 +53,8 @@ typedef struct {
struct {
bool active;
size_t nt;
size_t nf;
real_t dt;
real_t df;
real_t winT; ///< 时窗长度
real_t zeta; ///< 虚频率系数， w <- w - zeta*PI/r* 1j
real_t wI; ///< 虚频率 zeta*PI/r
real_t *freqs;
real_t zeta; ///< 虚频率系数， w <- w - zeta*PI/T * 1j
size_t upsample_n; ///< 升采样倍数
bool keepAllFreq; ///< 计算所有频率，不论频率多低
bool skipImagComps; ///< 跳过虚频率的补偿
Expand All @@ -74,8 +69,6 @@ typedef struct {
bool active;
real_t freq1;
real_t freq2;
size_t nf1;
size_t nf2;
} H;
/** 波数积分间隔以及方法 */
struct {
Expand Down Expand Up @@ -163,9 +156,6 @@ static void free_Ctrl(GRT_MODULE_CTRL *Ctrl){
GRT_SAFE_FREE_PTR(Ctrl->D.s_depsrc);
GRT_SAFE_FREE_PTR(Ctrl->D.s_deprcv);

// N
GRT_SAFE_FREE_PTR(Ctrl->N.freqs);

// O
GRT_SAFE_FREE_PTR(Ctrl->O.s_output_dir);

Expand Down Expand Up @@ -851,11 +841,11 @@ static void getopt_from_command(GRT_MODULE_CTRL *Ctrl, int argc, char **argv){


/**
* 频谱积分前的共享准备：自动 Length、wI、频点网格、nf1/nf2、填充 KPROC 与 GRNSPEC 元数据。
* grn->freqs 由本函数 malloc，调用方负责释放；grn->rs 借用调用方指针。
* 不分配 u/uiz/uir，不处理 stats 路径。
* 频谱积分前准备：自动 Length、wI、频点网格、nf1/nf2、填充 KPROC 与 GRNSPEC 元数据
* grn->freqs 由本函数 malloc，调用方负责释放；grn->rs 借用调用方指针
* 不分配 u/uiz/uir，不处理 stats 路径
*/
void grt_prepare_grn_spec(
static void prepare_grn_spec(
MODEL1D *mod1d,
size_t nr, real_t *rs,
size_t nt, real_t dt, real_t zeta, bool keepAllFreq,
Expand Down Expand Up @@ -989,7 +979,7 @@ int greenfn_main(int argc, char **argv) {
K_INTEG_PROCESS KPROC = {0};
GRNSPEC grn_storage = {0};
GRNSPEC *grn = &grn_storage;
grt_prepare_grn_spec(
prepare_grn_spec(
mod1d,
Ctrl->R.nr, Ctrl->R.rs,
Ctrl->N.nt, Ctrl->N.dt, Ctrl->N.zeta, Ctrl->N.keepAllFreq,
Expand All @@ -1004,19 +994,12 @@ int greenfn_main(int argc, char **argv) {
Ctrl->e.active,
&KPROC, grn);

// 写回 Ctrl，供后续 IFFT/SAC/free_Ctrl 使用
Ctrl->N.winT = Ctrl->N.nt * Ctrl->N.dt;
Ctrl->N.nf = grn->nf;
Ctrl->N.df = 1.0 / Ctrl->N.winT;
Ctrl->N.freqs = grn->freqs;
Ctrl->N.wI = grn->wI;
Ctrl->H.nf1 = grn->nf1;
Ctrl->H.nf2 = grn->nf2;
real_t df = 1.0 / (Ctrl->N.nt * Ctrl->N.dt);

// 如果只传入了 -S, 未指定索引，则默认所有频率索引
if(Ctrl->S.active && Ctrl->S.statsidxs == NULL){
// 另外两个字符相关的指针仍指向 NULL
Ctrl->S.nstatsidxs = Ctrl->N.nf;
Ctrl->S.nstatsidxs = grn->nf;
Ctrl->S.statsidxs = (size_t*)realloc(Ctrl->S.statsidxs, sizeof(size_t)*(Ctrl->S.nstatsidxs));
for(size_t i=0; i < Ctrl->S.nstatsidxs; ++i){
Ctrl->S.statsidxs[i] = i;
Expand Down Expand Up @@ -1047,7 +1030,7 @@ int greenfn_main(int argc, char **argv) {

// 使用fftw3做反傅里叶变换，并保存到 SAC
// 其中考虑了升采样倍数
GRT_FFTW_HOLDER *fh = grt_create_fftw_holder_C2R_1D(Ctrl->N.nt*Ctrl->N.upsample_n, Ctrl->N.dt/Ctrl->N.upsample_n, Ctrl->N.nf, Ctrl->N.df);
GRT_FFTW_HOLDER *fh = grt_create_fftw_holder_C2R_1D(Ctrl->N.nt*Ctrl->N.upsample_n, Ctrl->N.dt/Ctrl->N.upsample_n, grn->nf, df);

// 建立 SAC 文件原型，包含必要的头变量
SACTRACE *sac = grt_new_SACTRACE(fh->dt, fh->nt, 0.0);
Expand All @@ -1058,7 +1041,7 @@ int greenfn_main(int argc, char **argv) {
sac->hd.evdp = Ctrl->D.depsrc; // km
sac->hd.stel = (-1.0)*Ctrl->D.deprcv*1e3; // m
// 写入虚频率
sac->hd.user0 = Ctrl->N.wI;
sac->hd.user0 = grn->wI;
// 写入接受点的Vp,Vs,rho
sac->hd.user1 = mod1d->Va[mod1d->ircv];
sac->hd.user2 = mod1d->Vb[mod1d->ircv];
Expand Down Expand Up @@ -1112,6 +1095,7 @@ int greenfn_main(int argc, char **argv) {

// 释放内存
grt_grnspec_free_u(grn);
GRT_SAFE_FREE_PTR(grn->freqs);
GRT_SAFE_FREE_PTR(travtPS);
GRT_SAFE_FREE_PTR(begintimes);
grt_free_SACTRACE(sac);
Expand Down
5 changes: 3 additions & 2 deletions pygrt/C_extension/src/dynamic/grt_rotation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ static void getopt_from_command(GRT_MODULE_CTRL *Ctrl, int argc, char **argv){
GRTCheckOptionSet(argc > 1);
}

void grt_compute_rotation(
/** 由位移偏导合成旋转张量 */
static void compute_rotation(
size_t npts, float dist, float *const u[GRT_CHANNEL_NUM],
float *const upar[GRT_CHANNEL_NUM][GRT_CHANNEL_NUM],
float *const res[GRT_CHANNEL_NUM][GRT_CHANNEL_NUM], bool rot2ZNE)
Expand Down Expand Up @@ -131,7 +132,7 @@ int rotation_main(int argc, char **argv){
res[c2][c] = calloc(npts, sizeof(*res[c2][c]));
}
}
grt_compute_rotation(npts, dist, u, upar, res, rot2ZNE);
compute_rotation(npts, dist, u, upar, res, rot2ZNE);

// 写出3个分量
for(int i1=0; i1<2; ++i1){
Expand Down
5 changes: 3 additions & 2 deletions pygrt/C_extension/src/dynamic/grt_strain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ static void getopt_from_command(GRT_MODULE_CTRL *Ctrl, int argc, char **argv){
GRTCheckOptionSet(argc > 1);
}

void grt_compute_strain(
/** 由位移偏导合成应变张量 */
static void compute_strain(
size_t npts, float dist, float *const u[GRT_CHANNEL_NUM],
float *const upar[GRT_CHANNEL_NUM][GRT_CHANNEL_NUM],
float *const res[GRT_CHANNEL_NUM][GRT_CHANNEL_NUM], bool rot2ZNE)
Expand Down Expand Up @@ -133,7 +134,7 @@ int strain_main(int argc, char **argv){
res[c2][c] = calloc(npts, sizeof(*res[c2][c]));
}
}
grt_compute_strain(npts, dist, u, upar, res, rot2ZNE);
compute_strain(npts, dist, u, upar, res, rot2ZNE);

// 写出6个分量
for(int i1=0; i1<3; ++i1){
Expand Down
5 changes: 3 additions & 2 deletions pygrt/C_extension/src/dynamic/grt_stress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ static void getopt_from_command(GRT_MODULE_CTRL *Ctrl, int argc, char **argv){
GRTCheckOptionSet(argc > 1);
}

void grt_compute_stress(
/** 在频域由位移偏导合成应力张量 */
static void compute_stress(
size_t npts, float dt, float dist, float va, float vb, float rho,
float Qainv, float Qbinv, float *const u[GRT_CHANNEL_NUM],
float *const upar[GRT_CHANNEL_NUM][GRT_CHANNEL_NUM],
Expand Down Expand Up @@ -201,7 +202,7 @@ int stress_main(int argc, char **argv){
res[c2][c] = calloc(npts, sizeof(*res[c2][c]));
}
}
grt_compute_stress(npts, dt, dist, va, vb, rho, Qainv, Qbinv, u, upar, res, rot2ZNE);
compute_stress(npts, dt, dist, va, vb, rho, Qainv, Qbinv, u, upar, res, rot2ZNE);

// 写出6个分量
for(int i1=0; i1<3; ++i1){
Expand Down
10 changes: 5 additions & 5 deletions pygrt/C_extension/src/dynamic/grt_syn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,18 +531,18 @@ static void syn_accum_from_gf(


/**
* 由动态格林函数合成三分量地震图（及可选空间偏导）。
* 由动态格林函数合成三分量地震图（及可选空间偏导）
*
* 数组布局：gf[震源][分量][采样点]、syn[分量][采样点]、
* syn_upar[偏导方向][分量][采样点]。gf_uiz/gf_uir 在 calc_upar=false
* 时可传 NULL；单个分量指针为 NULL 时跳过该道。
* 时可传 NULL；单个分量指针为 NULL 时跳过该道
*
* r=0 时强制 *azrad=0（e_r→N、e_θ→E）并告警；
* 并用 ∂_r 格林函数合成 (1/r)∂_θ 的有限部分（见函数内注释）。
* 并用 ∂_r 格林函数合成 (1/r)∂_θ 的有限部分（见函数内注释）
*
* @param[in,out] azrad 方位角（弧度）；r=0 时写回 0
*/
void grt_syn_from_gf(
static void syn_from_gf(
size_t npts, float dist,
const pfloatChnlGrid gf, const pfloatChnlGrid gf_uiz, const pfloatChnlGrid gf_uir,
GRT_SYN_TYPE computeType, real_t M0, real_t VpVs_ratio, real_t *azrad,
Expand Down Expand Up @@ -768,7 +768,7 @@ int syn_main(int argc, char **argv)
}
}

grt_syn_from_gf(
syn_from_gf(
(size_t)npts, Ctrl->dist,
gf, calc_upar ? gf_uiz : NULL, calc_upar ? gf_uir : NULL,
Ctrl->computeType, Ctrl->S.M0, Ctrl->VpVs_ratio, &Ctrl->A.azrad, Ctrl->mchn,
Expand Down
8 changes: 4 additions & 4 deletions 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 @@ -567,10 +567,10 @@ static void getopt_from_command(GRT_MODULE_CTRL *Ctrl, int argc, char **argv){


/**
* 静态积分前准备：默认 Length，填充 K_INTEG_PROCESS。
* 不分配输出缓冲，不处理 stats 路径。
* 静态积分前准备：默认 Length，填充 K_INTEG_PROCESS
* 不分配输出缓冲，不处理 stats 路径
*/
void grt_prepare_static_grn(
static void prepare_static_grn(
MODEL1D *mod1d,
size_t nr, real_t *rs,
real_t Length,
Expand Down Expand Up @@ -649,7 +649,7 @@ int static_greenfn_main(int argc, char **argv){
realChnlGrid *grn_uir = (Ctrl->e.active)? (realChnlGrid *) calloc(Ctrl->nr, sizeof(*grn_uir)) : NULL;

K_INTEG_PROCESS KPROC = {0};
grt_prepare_static_grn(
prepare_static_grn(
mod1d,
Ctrl->nr, Ctrl->rs,
Ctrl->L.Length,
Expand Down
5 changes: 3 additions & 2 deletions pygrt/C_extension/src/static/grt_static_rotation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ static void getopt_from_command(GRT_MODULE_CTRL *Ctrl, int argc, char **argv){
// 暂不支持设置其它参数
}

void grt_static_compute_rotation(
/** 由静态位移偏导合成旋转张量 */
static void compute_rotation(
size_t nnorth, size_t neast, const real_t *norths, const real_t *easts,
real_t *const u[GRT_CHANNEL_NUM],
real_t *const upar[GRT_CHANNEL_NUM][GRT_CHANNEL_NUM],
Expand Down Expand Up @@ -186,7 +187,7 @@ int static_rotation_main(int argc, char **argv){
}
}

grt_static_compute_rotation(nnorth, neast, norths, easts, u, upar, res, rot2ZNE);
compute_rotation(nnorth, neast, norths, easts, u, upar, res, rot2ZNE);

// 写入 nc 文件
for(int c=0; c<GRT_CHANNEL_NUM; ++c){
Expand Down
5 changes: 3 additions & 2 deletions pygrt/C_extension/src/static/grt_static_strain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ static void getopt_from_command(GRT_MODULE_CTRL *Ctrl, int argc, char **argv){
// 暂不支持设置其它参数
}

void grt_static_compute_strain(
/** 由静态位移偏导合成应变张量 */
static void compute_strain(
size_t nnorth, size_t neast, const real_t *norths, const real_t *easts,
real_t *const u[GRT_CHANNEL_NUM],
real_t *const upar[GRT_CHANNEL_NUM][GRT_CHANNEL_NUM],
Expand Down Expand Up @@ -188,7 +189,7 @@ int static_strain_main(int argc, char **argv){
}
}

grt_static_compute_strain(nnorth, neast, norths, easts, u, upar, res, rot2ZNE);
compute_strain(nnorth, neast, norths, easts, u, upar, res, rot2ZNE);

// 写入 nc 文件
for(int c=0; c<GRT_CHANNEL_NUM; ++c){
Expand Down
5 changes: 3 additions & 2 deletions pygrt/C_extension/src/static/grt_static_stress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ static void getopt_from_command(GRT_MODULE_CTRL *Ctrl, int argc, char **argv){
// 暂不支持设置其它参数
}

void grt_static_compute_stress(
/** 由静态位移偏导合成应力张量 */
static void compute_stress(
size_t nnorth, size_t neast, const real_t *norths, const real_t *easts,
real_t *const u[GRT_CHANNEL_NUM],
real_t *const upar[GRT_CHANNEL_NUM][GRT_CHANNEL_NUM],
Expand Down Expand Up @@ -206,7 +207,7 @@ int static_stress_main(int argc, char **argv){
}
}

grt_static_compute_stress(nnorth, neast, norths, easts, u, upar, res, rot2ZNE, rcv_mu, rcv_lam);
compute_stress(nnorth, neast, norths, easts, u, upar, res, rot2ZNE, rcv_mu, rcv_lam);

// 写入 nc 文件
for(int c=0; c<GRT_CHANNEL_NUM; ++c){
Expand Down
Loading
Loading