Skip to content

REFAC: rename data type QWVgrid and INTEGgrid #166

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
Dec 7, 2025
Merged

REFAC: rename data type QWVgrid and INTEGgrid #166

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
9 changes: 5 additions & 4 deletions pygrt/C_extension/include/grt/common/const.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,11 @@ typedef double complex cplx_t;

#define GRT_GTYPES_MAX 2 ///< 2, 所有震源根据是否使用格林函数导数分为两类

typedef cplx_t QWVgrid[GRT_SRC_M_NUM][GRT_QWV_NUM];
typedef cplx_t INTEGgrid[GRT_SRC_M_NUM][GRT_INTEG_NUM];
typedef real_t r_INTEGgrid[GRT_SRC_M_NUM][GRT_INTEG_NUM];
typedef size_t s_INTEGgrid[GRT_SRC_M_NUM][GRT_INTEG_NUM];
typedef cplx_t cplxQWVGrid[GRT_SRC_M_NUM][GRT_QWV_NUM];

typedef cplx_t cplxIntegGrid[GRT_SRC_M_NUM][GRT_INTEG_NUM];
typedef real_t realIntegGrid[GRT_SRC_M_NUM][GRT_INTEG_NUM];
typedef size_t sizeIntegGrid[GRT_SRC_M_NUM][GRT_INTEG_NUM];

/** 不同震源类型在大小为 GRT_SRC_M_NUM 的数组中的索引 */
enum {
Expand Down
6 changes: 3 additions & 3 deletions pygrt/C_extension/include/grt/common/dwm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
real_t grt_discrete_integ(
GRT_MODEL1D *mod1d, real_t dk, real_t kmax, real_t keps,
size_t nr, real_t *rs,
INTEGgrid sum_J[nr],
cplxIntegGrid sum_J[nr],
bool calc_upar,
INTEGgrid sum_uiz_J[nr],
INTEGgrid sum_uir_J[nr],
cplxIntegGrid sum_uiz_J[nr],
cplxIntegGrid sum_uir_J[nr],
FILE *fstats, GRT_KernelFunc kerfunc);
6 changes: 3 additions & 3 deletions pygrt/C_extension/include/grt/common/fim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
real_t grt_linear_filon_integ(
GRT_MODEL1D *mod1d, real_t k0, real_t dk0, real_t filondk, real_t kmax, real_t keps,
size_t nr, real_t *rs,
INTEGgrid sum_J[nr],
cplxIntegGrid sum_J[nr],
bool calc_upar,
INTEGgrid sum_uiz_J[nr],
INTEGgrid sum_uir_J[nr],
cplxIntegGrid sum_uiz_J[nr],
cplxIntegGrid sum_uir_J[nr],
FILE *fstats, GRT_KernelFunc kerfunc);


8 changes: 4 additions & 4 deletions pygrt/C_extension/include/grt/common/integral.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* @param[out] SUM 该dk区间内的积分值
*
*/
void grt_int_Pk(real_t k, real_t r, const QWVgrid QWV, bool calc_uir, INTEGgrid SUM);
void grt_int_Pk(real_t k, real_t r, const cplxQWVGrid QWV, bool calc_uir, cplxIntegGrid SUM);



Expand All @@ -35,7 +35,7 @@ void grt_int_Pk(real_t k, real_t r, const QWVgrid QWV, bool calc_uir, INTEGgrid
* @param[in] sum_J 积分结果
* @param[out] tol Z、R、T分量结果
*/
void grt_merge_Pk(const INTEGgrid sum_J, cplx_t tol[GRT_SRC_M_NUM][GRT_CHANNEL_NUM]);
void grt_merge_Pk(const cplxIntegGrid sum_J, cplx_t tol[GRT_SRC_M_NUM][GRT_CHANNEL_NUM]);



Expand All @@ -53,7 +53,7 @@ void grt_merge_Pk(const INTEGgrid sum_J, cplx_t tol[GRT_SRC_M_NUM][GRT_CHANNEL_N
* @param[out] SUM 该dk区间内的积分值
*
*/
void grt_int_Pk_filon(real_t k, real_t r, bool iscos, const QWVgrid QWV, bool calc_uir, INTEGgrid SUM);
void grt_int_Pk_filon(real_t k, real_t r, bool iscos, const cplxQWVGrid QWV, bool calc_uir, cplxIntegGrid SUM);


/**
Expand All @@ -68,4 +68,4 @@ void grt_int_Pk_filon(real_t k, real_t r, bool iscos, const QWVgrid QWV, bool ca
* @param[out] SUM 该三点区间内的积分值
*
*/
void grt_int_Pk_sa_filon(const real_t k3[3], real_t r, const QWVgrid QWV3[3], bool calc_uir, INTEGgrid SUM);
void grt_int_Pk_sa_filon(const real_t k3[3], real_t r, const cplxQWVGrid QWV3[3], bool calc_uir, cplxIntegGrid SUM);
6 changes: 3 additions & 3 deletions pygrt/C_extension/include/grt/common/iostats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* @note 文件记录的值均为波数积分的中间结果，与最终的结果还差一系列的系数，
* 记录其值主要用于参考其变化趋势。
*/
void grt_write_stats(FILE *f0, real_t k, const QWVgrid QWV);
void grt_write_stats(FILE *f0, real_t k, const cplxQWVGrid QWV);


/**
Expand Down Expand Up @@ -54,8 +54,8 @@ int grt_extract_stats(FILE *bf0, FILE *af0);
*/
void grt_write_stats_ptam(
FILE *f0,
r_INTEGgrid Kpt[GRT_PTAM_PT_MAX],
INTEGgrid Fpt[GRT_PTAM_PT_MAX]);
realIntegGrid Kpt[GRT_PTAM_PT_MAX],
cplxIntegGrid Fpt[GRT_PTAM_PT_MAX]);


/**
Expand Down
20 changes: 10 additions & 10 deletions pygrt/C_extension/include/grt/common/kernel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* 计算核函数的函数指针，动态与静态的接口一致
*/
typedef void (*GRT_KernelFunc) (
GRT_MODEL1D *mod1d, const real_t k, QWVgrid QWV,
bool calc_uiz, QWVgrid QWV_uiz);
GRT_MODEL1D *mod1d, const real_t k, cplxQWVGrid QWV,
bool calc_uiz, cplxQWVGrid QWV_uiz);


/**
Expand Down Expand Up @@ -89,26 +89,26 @@ typedef void (*GRT_KernelFunc) (
*
*/
void grt_kernel(
GRT_MODEL1D *mod1d, const real_t k, QWVgrid QWV,
bool calc_uiz, QWVgrid QWV_uiz);
GRT_MODEL1D *mod1d, const real_t k, cplxQWVGrid QWV,
bool calc_uiz, cplxQWVGrid QWV_uiz);

/** 构建广义反射透射系数矩阵。作为 kernel 函数中的第一部分 */
void grt_GRT_matrix(GRT_MODEL1D *mod1d, const real_t k);

/** 从广义 R/T 矩阵出发，计算每个震源对应的核函数 QWV。 作为 kernel 函数中的第二部分 */
void grt_GRT_build_QWV(
GRT_MODEL1D *mod1d, QWVgrid QWV,
bool calc_uiz, QWVgrid QWV_uiz);
GRT_MODEL1D *mod1d, cplxQWVGrid QWV,
bool calc_uiz, cplxQWVGrid QWV_uiz);

/** 静态解的核函数 */
void grt_static_kernel(
GRT_MODEL1D *mod1d, const real_t k, QWVgrid QWV,
bool calc_uiz, QWVgrid QWV_uiz);
GRT_MODEL1D *mod1d, const real_t k, cplxQWVGrid QWV,
bool calc_uiz, cplxQWVGrid QWV_uiz);

/** 静态广义反射透射系数矩阵 */
void grt_static_GRT_matrix(GRT_MODEL1D *mod1d, const real_t k);

/** 静态 QWV */
void grt_static_GRT_build_QWV(
GRT_MODEL1D *mod1d, QWVgrid QWV,
bool calc_uiz, QWVgrid QWV_uiz);
GRT_MODEL1D *mod1d, cplxQWVGrid QWV,
bool calc_uiz, cplxQWVGrid QWV_uiz);
4 changes: 2 additions & 2 deletions pygrt/C_extension/include/grt/common/model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ typedef struct {
cplx_t uiz_R_EVL;

/* 震源处的震源系数 \f$ P_m, SV_m, SH_m */
QWVgrid src_coefD;
QWVgrid src_coefU;
cplxQWVGrid src_coefD;
cplxQWVGrid src_coefU;

} GRT_MODEL1D;

Expand Down
6 changes: 3 additions & 3 deletions pygrt/C_extension/include/grt/common/ptam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
void grt_PTA_method(
GRT_MODEL1D *mod1d, real_t k0, real_t predk,
size_t nr, real_t *rs,
INTEGgrid sum_J0[nr],
cplxIntegGrid sum_J0[nr],
bool calc_upar,
INTEGgrid sum_uiz_J0[nr],
INTEGgrid sum_uir_J0[nr],
cplxIntegGrid sum_uiz_J0[nr],
cplxIntegGrid sum_uir_J0[nr],
FILE *ptam_fstatsnr[nr][2], GRT_KernelFunc kerfunc);

6 changes: 3 additions & 3 deletions pygrt/C_extension/include/grt/common/safim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
real_t grt_sa_filon_integ(
GRT_MODEL1D *mod1d, real_t k0, real_t dk0, real_t tol, real_t kmax, real_t kref,
size_t nr, real_t *rs,
INTEGgrid sum_J0[nr],
cplxIntegGrid sum_J0[nr],
bool calc_upar,
INTEGgrid sum_uiz_J0[nr],
INTEGgrid sum_uir_J0[nr],
cplxIntegGrid sum_uiz_J0[nr],
cplxIntegGrid sum_uir_J0[nr],
FILE *fstats, GRT_KernelFunc kerfunc);


12 changes: 6 additions & 6 deletions pygrt/C_extension/src/common/dwm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
real_t grt_discrete_integ(
GRT_MODEL1D *mod1d, real_t dk, real_t kmax, real_t keps,
size_t nr, real_t *rs,
INTEGgrid sum_J[nr],
cplxIntegGrid sum_J[nr],
bool calc_upar,
INTEGgrid sum_uiz_J[nr],
INTEGgrid sum_uir_J[nr],
cplxIntegGrid sum_uiz_J[nr],
cplxIntegGrid sum_uir_J[nr],
FILE *fstats, GRT_KernelFunc kerfunc)
{
INTEGgrid SUM = {0};
cplxIntegGrid SUM = {0};

// 不同震源不同阶数的核函数 F(k, w)
QWVgrid QWV = {0};
QWVgrid QWV_uiz = {0};
cplxQWVGrid QWV = {0};
cplxQWVGrid QWV_uiz = {0};

real_t k = 0.0;
size_t ik = 0;
Expand Down
22 changes: 11 additions & 11 deletions pygrt/C_extension/src/common/fim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@
real_t grt_linear_filon_integ(
GRT_MODEL1D *mod1d, real_t k0, real_t dk0, real_t dk, real_t kmax, real_t keps,
size_t nr, real_t *rs,
INTEGgrid sum_J0[nr],
cplxIntegGrid sum_J0[nr],
bool calc_upar,
INTEGgrid sum_uiz_J0[nr],
INTEGgrid sum_uir_J0[nr],
cplxIntegGrid sum_uiz_J0[nr],
cplxIntegGrid sum_uir_J0[nr],
FILE *fstats, GRT_KernelFunc kerfunc)
{
// 从0开始，存储第二部分Filon积分的结果
INTEGgrid *sum_J = (INTEGgrid *)calloc(nr, sizeof(*sum_J));
INTEGgrid *sum_uiz_J = (calc_upar)? (INTEGgrid *)calloc(nr, sizeof(*sum_uiz_J)) : NULL;
INTEGgrid *sum_uir_J = (calc_upar)? (INTEGgrid *)calloc(nr, sizeof(*sum_uir_J)) : NULL;
cplxIntegGrid *sum_J = (cplxIntegGrid *)calloc(nr, sizeof(*sum_J));
cplxIntegGrid *sum_uiz_J = (calc_upar)? (cplxIntegGrid *)calloc(nr, sizeof(*sum_uiz_J)) : NULL;
cplxIntegGrid *sum_uir_J = (calc_upar)? (cplxIntegGrid *)calloc(nr, sizeof(*sum_uir_J)) : NULL;

INTEGgrid SUM;
cplxIntegGrid SUM;

// 不同震源不同阶数的核函数 F(k, w)
QWVgrid QWV = {0};
QWVgrid QWV_uiz = {0};
cplxQWVGrid QWV = {0};
cplxQWVGrid QWV_uiz = {0};

real_t k=k0;
size_t ik=0;
Expand Down Expand Up @@ -158,8 +158,8 @@ real_t grt_linear_filon_integ(

// -------------------------------------------------------------------------------
// 计算余项, [2]表示k积分的第一个点和最后一个点
INTEGgrid SUM_Gc[2] = {0};
INTEGgrid SUM_Gs[2] = {0};
cplxIntegGrid SUM_Gc[2] = {0};
cplxIntegGrid SUM_Gs[2] = {0};


// 计算来自第一个点和最后一个点的余项
Expand Down
14 changes: 7 additions & 7 deletions pygrt/C_extension/src/common/integral.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@



void grt_int_Pk(real_t k, real_t r, const QWVgrid QWV, bool calc_uir, INTEGgrid SUM)
void grt_int_Pk(real_t k, real_t r, const cplxQWVGrid QWV, bool calc_uir, cplxIntegGrid SUM)
{
real_t bjmk[GRT_MORDER_MAX+1] = {0};
real_t kr = k*r;
Expand Down Expand Up @@ -64,7 +64,7 @@ void grt_int_Pk(real_t k, real_t r, const QWVgrid QWV, bool calc_uir, INTEGgrid
}


void grt_int_Pk_filon(real_t k, real_t r, bool iscos, const QWVgrid QWV, bool calc_uir, INTEGgrid SUM)
void grt_int_Pk_filon(real_t k, real_t r, bool iscos, const cplxQWVGrid QWV, bool calc_uir, cplxIntegGrid SUM)
{
real_t phi0 = 0.0;
if(! iscos) phi0 = - HALFPI; // 在cos函数中添加的相位差，用于计算sin函数
Expand Down Expand Up @@ -149,7 +149,7 @@ static cplx_t interg_quad_cos(



void grt_int_Pk_sa_filon(const real_t k3[3], real_t r, const QWVgrid QWV3[3], bool calc_uir, INTEGgrid SUM)
void grt_int_Pk_sa_filon(const real_t k3[3], real_t r, const cplxQWVGrid QWV3[3], bool calc_uir, cplxIntegGrid SUM)
{
// 使用bessel递推公式 Jm'(x) = m/x * Jm(x) - J_{m+1}(x)
// 考虑大震中距，忽略第一项，再使用bessel渐近公式
Expand All @@ -159,9 +159,9 @@ void grt_int_Pk_sa_filon(const real_t k3[3], real_t r, const QWVgrid QWV3[3], bo

// 对sqrt(k)*F(k,w)进行二次曲线拟合，再计算 (a*k^2 + b*k + c) * cos(kr - (2m+1)/4) 的积分
// 拟合二次函数的参数
QWVgrid quad_a={0};
QWVgrid quad_b={0};
QWVgrid quad_c={0};
cplxQWVGrid quad_a={0};
cplxQWVGrid quad_b={0};
cplxQWVGrid quad_c={0};
for(int im=0; im<GRT_SRC_M_NUM; ++im){
int modr = GRT_SRC_M_ORDERS[im];
for(int c=0; c<GRT_QWV_NUM; ++c){
Expand Down Expand Up @@ -194,7 +194,7 @@ void grt_int_Pk_sa_filon(const real_t k3[3], real_t r, const QWVgrid QWV3[3], bo



void grt_merge_Pk(const INTEGgrid sum_J, cplx_t tol[GRT_SRC_M_NUM][GRT_CHANNEL_NUM])
void grt_merge_Pk(const cplxIntegGrid sum_J, cplx_t tol[GRT_SRC_M_NUM][GRT_CHANNEL_NUM])
{
for(int i=0; i<GRT_SRC_M_NUM; ++i){
int modr = GRT_SRC_M_ORDERS[i];
Expand Down
6 changes: 3 additions & 3 deletions pygrt/C_extension/src/common/iostats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@



void grt_write_stats(FILE *f0, real_t k, const QWVgrid QWV)
void grt_write_stats(FILE *f0, real_t k, const cplxQWVGrid QWV)
{
fwrite(&k, sizeof(real_t), 1, f0);

Expand Down Expand Up @@ -74,8 +74,8 @@ int grt_extract_stats(FILE *bf0, FILE *af0){

void grt_write_stats_ptam(
FILE *f0,
r_INTEGgrid Kpt[GRT_PTAM_PT_MAX],
INTEGgrid Fpt[GRT_PTAM_PT_MAX]
realIntegGrid Kpt[GRT_PTAM_PT_MAX],
cplxIntegGrid Fpt[GRT_PTAM_PT_MAX]
){

for(int i=0; i<GRT_PTAM_PT_MAX; ++i){
Expand Down
2 changes: 1 addition & 1 deletion pygrt/C_extension/src/common/kernel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ inline GCC_ALWAYS_INLINE void grt_construct_qwv(
bool ircvup,
const cplx_t R1[2][2], cplx_t RL1,
const cplx_t R2[2][2], cplx_t RL2,
const QWVgrid coefD, const QWVgrid coefU, QWVgrid QWV)
const cplxQWVGrid coefD, const cplxQWVGrid coefU, cplxQWVGrid QWV)
{
for(int i = 0; i < GRT_SRC_M_NUM; ++i)
{
Expand Down
8 changes: 4 additions & 4 deletions pygrt/C_extension/src/common/kernel_template.c_
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ void __GRT_MATRIX_FUNC__(GRT_MODEL1D *mod1d, const real_t k)


void __BUILD_QWV__(
GRT_MODEL1D *mod1d, QWVgrid QWV,
bool calc_uiz, QWVgrid QWV_uiz)
GRT_MODEL1D *mod1d, cplxQWVGrid QWV,
bool calc_uiz, cplxQWVGrid QWV_uiz)
{
// 初始化qwv为0
memset(QWV, 0, sizeof(cplx_t)*GRT_SRC_M_NUM*GRT_QWV_NUM);
Expand Down Expand Up @@ -263,8 +263,8 @@ void __BUILD_QWV__(


void __KERNEL_FUNC__(
GRT_MODEL1D *mod1d, const real_t k, QWVgrid QWV,
bool calc_uiz, QWVgrid QWV_uiz)
GRT_MODEL1D *mod1d, const real_t k, cplxQWVGrid QWV,
bool calc_uiz, cplxQWVGrid QWV_uiz)
{
__GRT_MATRIX_FUNC__(mod1d, k);
__BUILD_QWV__(mod1d, QWV, calc_uiz, QWV_uiz);
Expand Down
Loading