From 75486bf64b5ab8d349feb4261add6d578194924d Mon Sep 17 00:00:00 2001 From: Dengda98 Date: Tue, 16 Sep 2025 14:06:15 +0800 Subject: [PATCH 1/3] STYLE: rename grt_b2a.c, grt_k2a.c files --- pygrt/C_extension/src/common/{grt_k2a.c => grt_ker2asc.c} | 0 pygrt/C_extension/src/common/{grt_b2a.c => grt_sac2asc.c} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename pygrt/C_extension/src/common/{grt_k2a.c => grt_ker2asc.c} (100%) rename pygrt/C_extension/src/common/{grt_b2a.c => grt_sac2asc.c} (100%) diff --git a/pygrt/C_extension/src/common/grt_k2a.c b/pygrt/C_extension/src/common/grt_ker2asc.c similarity index 100% rename from pygrt/C_extension/src/common/grt_k2a.c rename to pygrt/C_extension/src/common/grt_ker2asc.c diff --git a/pygrt/C_extension/src/common/grt_b2a.c b/pygrt/C_extension/src/common/grt_sac2asc.c similarity index 100% rename from pygrt/C_extension/src/common/grt_b2a.c rename to pygrt/C_extension/src/common/grt_sac2asc.c From 4149bf17bb38fabd0f31d4ada9c173a41f2c4503 Mon Sep 17 00:00:00 2001 From: Dengda98 Date: Tue, 16 Sep 2025 14:13:33 +0800 Subject: [PATCH 2/3] STYLE: rename `b2a` to `sac2asc`, `k2a` to `ker2asc` --- .../Advanced/integ_converg/integ_converg.rst | 12 ++++++------ docs/source/Advanced/integ_converg/run/run.sh | 18 +++++++++--------- docs/source/Tutorial/dynamic/gfunc.rst | 6 +++--- docs/source/Tutorial/dynamic/run/run.sh | 6 +++--- pygrt/C_extension/include/grt.h | 4 ++-- pygrt/C_extension/src/common/grt_ker2asc.c | 8 ++++---- pygrt/C_extension/src/common/grt_sac2asc.c | 8 ++++---- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/source/Advanced/integ_converg/integ_converg.rst b/docs/source/Advanced/integ_converg/integ_converg.rst index 0d386b7b..7b5a79da 100644 --- a/docs/source/Advanced/integ_converg/integ_converg.rst +++ b/docs/source/Advanced/integ_converg/integ_converg.rst @@ -39,12 +39,12 @@ C和Python导出的核函数文件是一致的，底层调用的是相同的函 .. group-tab:: C - :command:`k2a` 模块可将单个核函数文件转为文本格式。 + :command:`ker2asc` 模块可将单个核函数文件转为文本格式。 .. literalinclude:: run/run.sh :language: bash - :start-after: BEGIN grt.k2a - :end-before: END grt.k2a + :start-after: BEGIN grt.ker2asc + :end-before: END grt.ker2asc 输出的文件如下， @@ -143,12 +143,12 @@ C和Python导出的核函数文件是一致的，底层调用的是相同的函 .. note:: - :command:`k2a` 模块也支持将 ``PTAM_{ir}_{dist}/PTAM_{iw}_{freq}`` 文件转为文本格式， + :command:`ker2asc` 模块也支持将 ``PTAM_{ir}_{dist}/PTAM_{iw}_{freq}`` 文件转为文本格式， .. literalinclude:: run/run.sh :language: bash - :start-after: BEGIN grt.k2a ptam - :end-before: END grt.k2a ptam + :start-after: BEGIN grt.ker2asc ptam + :end-before: END grt.ker2asc ptam 输出的文件如下， diff --git a/docs/source/Advanced/integ_converg/run/run.sh b/docs/source/Advanced/integ_converg/run/run.sh index 3fe59c91..25f273f3 100755 --- a/docs/source/Advanced/integ_converg/run/run.sh +++ b/docs/source/Advanced/integ_converg/run/run.sh @@ -11,9 +11,9 @@ grt greenfn -Mmilrow -D2/0 -N500/0.02 -OGRN -R5,8,10 -S50,100 # ------------------------------------------------------------------- # ------------------------------------------------------------------- -# BEGIN grt.k2a -grt k2a GRN_grtstats/milrow_2_0/K_0050_5.00000e+00 > stats -# END grt.k2a +# BEGIN grt.ker2asc +grt ker2asc GRN_grtstats/milrow_2_0/K_0050_5.00000e+00 > stats +# END grt.ker2asc # ------------------------------------------------------------------- head -n 10 stats > stats_head @@ -23,15 +23,15 @@ echo "..." >> stats_head # ------------------------------------------------------------------- # BEGIN DEPSRC 0.0 DGRN grt greenfn -Mmilrow -D0/0 -N500/0.02 -OGRN -R5,8,10 -S50,100 -grt k2a GRN_grtstats/milrow_0_0/K_0050_5.00000e+00 > stats +grt ker2asc GRN_grtstats/milrow_0_0/K_0050_5.00000e+00 > stats # 绘制图像部分见Python # END DEPSRC 0.0 DGRN # ------------------------------------------------------------------- # ------------------------------------------------------------------- -# BEGIN grt.k2a ptam -grt k2a GRN_grtstats/milrow_0_0/PTAM_0002_1.00000e+01/PTAM_0050_5.00000e+00 > ptam_stats -# END grt.k2a ptam +# BEGIN grt.ker2asc ptam +grt ker2asc GRN_grtstats/milrow_0_0/PTAM_0002_1.00000e+01/PTAM_0050_5.00000e+00 > ptam_stats +# END grt.ker2asc ptam # ------------------------------------------------------------------- head -n 10 ptam_stats > ptam_stats_head @@ -48,8 +48,8 @@ echo "..." >> ptam_stats_head # -S 表示输出核函数文件 grt static greenfn -Mmilrow -D0.1/0 -X2/2/1 -Y2/2/1 -S > grn -# grt.k2a 也可以读取静态解输出的核函数文件，格式一致 -grt k2a stgrtstats/milrow_0.1_0/K > static_stats +# grt.ker2asc 也可以读取静态解输出的核函数文件，格式一致 +grt ker2asc stgrtstats/milrow_0.1_0/K > static_stats # 绘制图像部分见Python # END SGRN diff --git a/docs/source/Tutorial/dynamic/gfunc.rst b/docs/source/Tutorial/dynamic/gfunc.rst index 050e55ec..4a390372 100644 --- a/docs/source/Tutorial/dynamic/gfunc.rst +++ b/docs/source/Tutorial/dynamic/gfunc.rst @@ -53,12 +53,12 @@ Python中计算动态格林函数的主函数为 :func:`compute_grn() travt # ----------------------------------------------------------------------------------- -# BEGIN grt.b2a -grt b2a GRN/milrow_2_0_10/HFZ.sac > HFZ -# END grt.b2a +# BEGIN grt.sac2asc +grt sac2asc GRN/milrow_2_0_10/HFZ.sac > HFZ +# END grt.sac2asc # ----------------------------------------------------------------------------------- head -n 10 HFZ > HFZ_head echo "..." >> HFZ_head diff --git a/pygrt/C_extension/include/grt.h b/pygrt/C_extension/include/grt.h index 8335e50b..5b19d00b 100644 --- a/pygrt/C_extension/include/grt.h +++ b/pygrt/C_extension/include/grt.h @@ -41,8 +41,8 @@ X(static_strain) \ X(static_stress) \ /* other */ \ - X(k2a) \ - X(b2a) \ + X(ker2asc) \ + X(sac2asc) \ X(travt) \ // ------------------------------------------------------ diff --git a/pygrt/C_extension/src/common/grt_ker2asc.c b/pygrt/C_extension/src/common/grt_ker2asc.c index 1ab6663a..f047dbce 100644 --- a/pygrt/C_extension/src/common/grt_ker2asc.c +++ b/pygrt/C_extension/src/common/grt_ker2asc.c @@ -1,5 +1,5 @@ /** - * @file grt_k2a.c + * @file grt_ker2asc.c * @author Zhu Dengda (zhudengda@mail.iggcas.ac.cn) * @date 2025-03-27 * @@ -32,13 +32,13 @@ static void free_Ctrl(GRT_MODULE_CTRL *Ctrl){ /** 打印使用说明 */ static void print_help(){ printf("\n" -"[grt k2a] %s\n\n", GRT_VERSION);printf( +"[grt ker2asc] %s\n\n", GRT_VERSION);printf( " Convert a binary stats file generated during wavenumber integration\n" " into an ASCII file, write to standard output.\n" "\n\n" "Usage:\n" "----------------------------------------------------------------\n" -" grt k2a \n" +" grt ker2asc \n" "\n\n\n" ); } @@ -98,7 +98,7 @@ static void print_PTAM(FILE *fp){ /** 子模块主函数 */ -int k2a_main(int argc, char **argv){ +int ker2asc_main(int argc, char **argv){ GRT_MODULE_CTRL *Ctrl = calloc(1, sizeof(*Ctrl)); Ctrl->name = strdup(argv[0]); diff --git a/pygrt/C_extension/src/common/grt_sac2asc.c b/pygrt/C_extension/src/common/grt_sac2asc.c index 49339b1f..01a5598c 100644 --- a/pygrt/C_extension/src/common/grt_sac2asc.c +++ b/pygrt/C_extension/src/common/grt_sac2asc.c @@ -1,5 +1,5 @@ /** - * @file grt_b2a.c + * @file grt_sac2asc.c * @author Zhu Dengda (zhudengda@mail.iggcas.ac.cn) * @date 2025-03-27 * @@ -31,13 +31,13 @@ static void free_Ctrl(GRT_MODULE_CTRL *Ctrl){ /** 打印使用说明 */ static void print_help(){ printf("\n" -"[grt b2a] %s\n\n", GRT_VERSION);printf( +"[grt sac2asc] %s\n\n", GRT_VERSION);printf( " Convert a binary SAC file into an ASCII file, \n" " write to standard output (ignore header vars).\n" "\n\n" "Usage:\n" "----------------------------------------------------------------\n" -" grt b2a \n" +" grt sac2asc \n" "\n\n\n" ); } @@ -60,7 +60,7 @@ static void getopt_from_command(GRT_MODULE_CTRL *Ctrl, int argc, char **argv){ /** 子模块主函数 */ -int b2a_main(int argc, char **argv){ +int sac2asc_main(int argc, char **argv){ GRT_MODULE_CTRL *Ctrl = calloc(1, sizeof(*Ctrl)); Ctrl->name = strdup(argv[0]); From c029c0e69e6f207a16951ab02e31be52ad988f89 Mon Sep 17 00:00:00 2001 From: Dengda98 Date: Tue, 16 Sep 2025 14:15:42 +0800 Subject: [PATCH 3/3] STYLE: move `ker2asc` and `sac2asc` to `src/tools/` dir --- pygrt/C_extension/src/{common => tools}/grt_ker2asc.c | 0 pygrt/C_extension/src/{common => tools}/grt_sac2asc.c | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename pygrt/C_extension/src/{common => tools}/grt_ker2asc.c (100%) rename pygrt/C_extension/src/{common => tools}/grt_sac2asc.c (100%) diff --git a/pygrt/C_extension/src/common/grt_ker2asc.c b/pygrt/C_extension/src/tools/grt_ker2asc.c similarity index 100% rename from pygrt/C_extension/src/common/grt_ker2asc.c rename to pygrt/C_extension/src/tools/grt_ker2asc.c diff --git a/pygrt/C_extension/src/common/grt_sac2asc.c b/pygrt/C_extension/src/tools/grt_sac2asc.c similarity index 100% rename from pygrt/C_extension/src/common/grt_sac2asc.c rename to pygrt/C_extension/src/tools/grt_sac2asc.c