REFAC: remove macro GRT_QWV_NUM, and some adjustments to the related date types. (#168)

Author: Dengda98

pygrt/C_extension/include/grt/common/const.h

@@ -106,9 +106,8 @@ typedef double complex cplx_t;
 })
 
 // -----------------------------------------------------------------------------
-#define GRT_CHANNEL_NUM    3     ///< 3, 代码中分量个数（ZRT，ZNE）
+#define GRT_CHANNEL_NUM    3     ///< 3, 代码中分量个数（ZRT，ZNE），也是核函数类型个数(q, w, v)
 
-#define GRT_QWV_NUM     3   ///< 3, 代码中核函数类型个数(q, w, v)
 #define GRT_INTEG_NUM   4    ///< 4, 代码中积分类型个数
 #define GRT_MORDER_MAX   2    ///< 2, 代码中阶数m的最大值
 #define GRT_SRC_M_NUM    6   ///< 6, 代码中不同震源、不同阶数的个数
@@ -123,7 +122,11 @@ typedef double complex cplx_t;
 
 #define GRT_GTYPES_MAX   2      ///< 2, 所有震源根据是否使用格林函数导数分为两类
 
-typedef cplx_t cplxQWVGrid[GRT_SRC_M_NUM][GRT_QWV_NUM];
+typedef cplx_t     cplxChnlGrid[GRT_SRC_M_NUM][GRT_CHANNEL_NUM];
+typedef cplx_t *pt_cplxChnlGrid[GRT_SRC_M_NUM][GRT_CHANNEL_NUM];
+typedef real_t     realChnlGrid[GRT_SRC_M_NUM][GRT_CHANNEL_NUM];
+typedef real_t *pt_realChnlGrid[GRT_SRC_M_NUM][GRT_CHANNEL_NUM];
+typedef int        intChnlGrid [GRT_SRC_M_NUM][GRT_CHANNEL_NUM];
 
 typedef cplx_t cplxIntegGrid[GRT_SRC_M_NUM][GRT_INTEG_NUM];
 typedef real_t realIntegGrid[GRT_SRC_M_NUM][GRT_INTEG_NUM];

pygrt/C_extension/include/grt/common/integral.h

@@ -24,7 +24,7 @@
  * @param[out]    SUM            该dk区间内的积分值
  * 
  */
-void grt_int_Pk(real_t k, real_t r, const cplxQWVGrid QWV, bool calc_uir, cplxIntegGrid SUM);
+void grt_int_Pk(real_t k, real_t r, const cplxChnlGrid QWV, bool calc_uir, cplxIntegGrid SUM);
 
 
 
@@ -35,7 +35,7 @@ void grt_int_Pk(real_t k, real_t r, const cplxQWVGrid QWV, bool calc_uir, cplxIn
  * @param[in]     sum_J           积分结果
  * @param[out]    tol             Z、R、T分量结果
  */
-void grt_merge_Pk(const cplxIntegGrid sum_J, cplx_t tol[GRT_SRC_M_NUM][GRT_CHANNEL_NUM]);
+void grt_merge_Pk(const cplxIntegGrid sum_J, cplxChnlGrid tol);
 
 
 
@@ -53,7 +53,7 @@ void grt_merge_Pk(const cplxIntegGrid sum_J, cplx_t tol[GRT_SRC_M_NUM][GRT_CHANN
  * @param[out]    SUM            该dk区间内的积分值
  *  
  */
-void grt_int_Pk_filon(real_t k, real_t r, bool iscos, const cplxQWVGrid QWV, bool calc_uir, cplxIntegGrid SUM);
+void grt_int_Pk_filon(real_t k, real_t r, bool iscos, const cplxChnlGrid QWV, bool calc_uir, cplxIntegGrid SUM);
 
 
 /**
@@ -68,4 +68,4 @@ void grt_int_Pk_filon(real_t k, real_t r, bool iscos, const cplxQWVGrid QWV, boo
  * @param[out]    SUM           该三点区间内的积分值
  * 
  */
-void grt_int_Pk_sa_filon(const real_t k3[3], real_t r, const cplxQWVGrid QWV3[3], bool calc_uir, cplxIntegGrid SUM);
+void grt_int_Pk_sa_filon(const real_t k3[3], real_t r, const cplxChnlGrid QWV3[3], bool calc_uir, cplxIntegGrid SUM);

pygrt/C_extension/include/grt/common/iostats.h

@@ -26,7 +26,7 @@
  * @note     文件记录的值均为波数积分的中间结果，与最终的结果还差一系列的系数，
  *           记录其值主要用于参考其变化趋势。
  */
-void grt_write_stats(FILE *f0, real_t k, const cplxQWVGrid QWV);
+void grt_write_stats(FILE *f0, real_t k, const cplxChnlGrid QWV);
 
 
 /**

pygrt/C_extension/include/grt/common/kernel.h

@@ -16,8 +16,8 @@
  * 计算核函数的函数指针，动态与静态的接口一致
  */
 typedef void (*GRT_KernelFunc) (
-    GRT_MODEL1D *mod1d, const real_t k, cplxQWVGrid QWV,
-    bool calc_uiz, cplxQWVGrid QWV_uiz);
+    GRT_MODEL1D *mod1d, const real_t k, cplxChnlGrid QWV,
+    bool calc_uiz, cplxChnlGrid QWV_uiz);
 
 
 /**
@@ -89,26 +89,26 @@ typedef void (*GRT_KernelFunc) (
  * 
  */
 void grt_kernel(
-    GRT_MODEL1D *mod1d, const real_t k, cplxQWVGrid QWV,
-    bool calc_uiz, cplxQWVGrid QWV_uiz);
+    GRT_MODEL1D *mod1d, const real_t k, cplxChnlGrid QWV,
+    bool calc_uiz, cplxChnlGrid 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, cplxQWVGrid QWV,
-    bool calc_uiz, cplxQWVGrid QWV_uiz);
+    GRT_MODEL1D *mod1d, cplxChnlGrid QWV,
+    bool calc_uiz, cplxChnlGrid QWV_uiz);
 
 /** 静态解的核函数 */
 void grt_static_kernel(
-    GRT_MODEL1D *mod1d, const real_t k, cplxQWVGrid QWV,
-    bool calc_uiz, cplxQWVGrid QWV_uiz);
+    GRT_MODEL1D *mod1d, const real_t k, cplxChnlGrid QWV,
+    bool calc_uiz, cplxChnlGrid QWV_uiz);
 
 /** 静态广义反射透射系数矩阵 */
 void grt_static_GRT_matrix(GRT_MODEL1D *mod1d, const real_t k);
 
 /** 静态 QWV */
 void grt_static_GRT_build_QWV(
-    GRT_MODEL1D *mod1d, cplxQWVGrid QWV,
-    bool calc_uiz, cplxQWVGrid QWV_uiz);
+    GRT_MODEL1D *mod1d, cplxChnlGrid QWV,
+    bool calc_uiz, cplxChnlGrid QWV_uiz);

pygrt/C_extension/include/grt/common/model.h

@@ -68,8 +68,8 @@ typedef struct {
     cplx_t uiz_R_EVL;
 
     /* 震源处的震源系数 \f$ P_m, SV_m, SH_m  */
-    cplxQWVGrid src_coefD;
-    cplxQWVGrid src_coefU;
+    cplxChnlGrid src_coefD;
+    cplxChnlGrid src_coefU;
 
 } GRT_MODEL1D;
 

pygrt/C_extension/include/grt/common/radiation.h

@@ -34,6 +34,6 @@
  *                                   对于张量源，mchn={Mxx, Mxy, Mxz, Myy, Myz, Mzz}
  */
 void grt_set_source_radiation(
-    real_t srcRadi[GRT_SRC_M_NUM][GRT_CHANNEL_NUM], const int computeType, const bool par_theta,
+    realChnlGrid srcRadi, const int computeType, const bool par_theta,
     const real_t M0, const real_t coef, const real_t azrad, const real_t mchn[GRT_MECHANISM_NUM]
 );

pygrt/C_extension/include/grt/common/util.h

@@ -131,6 +131,6 @@ void grt_GF_freq2time_write_to_file(
     const real_t delayT0, const real_t delayV0, const bool calc_upar,
     const bool doEX, const bool doVF, const bool doHF, const bool doDC, 
     const char *chalst,
-    cplx_t *grn[nr][GRT_SRC_M_NUM][GRT_CHANNEL_NUM], 
-    cplx_t *grn_uiz[nr][GRT_SRC_M_NUM][GRT_CHANNEL_NUM], 
-    cplx_t *grn_uir[nr][GRT_SRC_M_NUM][GRT_CHANNEL_NUM]);
+    pt_cplxChnlGrid grn[nr], 
+    pt_cplxChnlGrid grn_uiz[nr], 
+    pt_cplxChnlGrid grn_uir[nr]);

pygrt/C_extension/include/grt/dynamic/grn.h

@@ -56,11 +56,11 @@ void grt_integ_grn_spec(
     bool print_progressbar, 
 
     // 返回值，代表Z、R、T分量
-    cplx_t *grn[nr][GRT_SRC_M_NUM][GRT_CHANNEL_NUM],
+    pt_cplxChnlGrid grn[nr],
 
     bool calc_upar,
-    cplx_t *grn_uiz[nr][GRT_SRC_M_NUM][GRT_CHANNEL_NUM],
-    cplx_t *grn_uir[nr][GRT_SRC_M_NUM][GRT_CHANNEL_NUM],
+    pt_cplxChnlGrid grn_uiz[nr],
+    pt_cplxChnlGrid grn_uir[nr],
 
     const char *statsstr, // 积分过程输出
     size_t  nstatsidxs, // 仅输出特定频点

pygrt/C_extension/include/grt/static/static_grn.h

@@ -46,11 +46,11 @@ void grt_integ_static_grn(
     real_t filonLength, real_t safilonTol, real_t filonCut, 
 
     // 返回值，代表Z、R、T分量
-    real_t grn[nr][GRT_SRC_M_NUM][GRT_CHANNEL_NUM],
+    realChnlGrid grn[nr],
 
     bool calc_upar,
-    real_t grn_uiz[nr][GRT_SRC_M_NUM][GRT_CHANNEL_NUM],
-    real_t grn_uir[nr][GRT_SRC_M_NUM][GRT_CHANNEL_NUM],
+    realChnlGrid grn_uiz[nr],
+    realChnlGrid grn_uir[nr],
 
     const char *statsstr // 积分结果输出
 );

pygrt/C_extension/src/common/dwm.c

@@ -36,8 +36,8 @@ real_t grt_discrete_integ(
     cplxIntegGrid SUM = {0};
 
     // 不同震源不同阶数的核函数 F(k, w) 
-    cplxQWVGrid QWV = {0};
-    cplxQWVGrid QWV_uiz = {0};
+    cplxChnlGrid QWV = {0};
+    cplxChnlGrid QWV_uiz = {0};
 
     real_t k = 0.0;
     size_t ik = 0;