Skip to content

Commit 1583e41

Browse files
Dengda98Dengda98
authored
FEAT: remove -P<prefix> (Part 2, static case) (#104)
1 parent 42aade8 commit 1583e41

File tree

9 files changed

+77
-164
lines changed

9 files changed

+77
-164
lines changed

‎docs/source/Tutorial/static/run/run.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import matplotlib.pyplot as plt
2121
from typing import Union
2222

23-
def plot_static(static_syn:dict, srctype:str, out:Union[str,None]=None):
23+
def plot_static(static_syn:dict, out:Union[str,None]=None):
2424
fig, ax = plt.subplots(1, 1, figsize=(10,8))
2525
# 设计对称色标
26-
m = np.max(np.abs(static_syn[f'{srctype}Z'])) * 1.2
27-
pcm = ax.pcolormesh(yarr, xarr, static_syn[f'{srctype}Z'], cmap='bwr', vmin=-m, vmax=m)
28-
ax.quiver(yarr, xarr, static_syn[f'{srctype}E'], static_syn[f'{srctype}N'],
26+
m = np.max(np.abs(static_syn[f'Z'])) * 1.2
27+
pcm = ax.pcolormesh(yarr, xarr, static_syn[f'Z'], cmap='bwr', vmin=-m, vmax=m)
28+
ax.quiver(yarr, xarr, static_syn[f'E'], static_syn[f'N'],
2929
angles='uv', pivot='mid')
3030
ax.set_ylim([xarr[0], xarr[-1]])
3131
ax.set_xlim([yarr[0], yarr[-1]])
@@ -44,8 +44,8 @@ def plot_static(static_syn:dict, srctype:str, out:Union[str,None]=None):
4444
# BEGIN SYN EX
4545
static_syn = pygrt.utils.gen_syn_from_gf_EX(static_grn, M0=1e24, ZNE=True)
4646
print(static_syn.keys())
47-
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'EXZ', 'EXN', 'EXE'])
48-
plot_static(static_syn, "EX", "syn_ex.png")
47+
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'Z', 'N', 'E'])
48+
plot_static(static_syn, "syn_ex.png")
4949
# END SYN EX
5050
# ---------------------------------------------------------------------------------
5151

@@ -54,8 +54,8 @@ def plot_static(static_syn:dict, srctype:str, out:Union[str,None]=None):
5454
# BEGIN SYN SF
5555
static_syn = pygrt.utils.gen_syn_from_gf_SF(static_grn, S=1e16, fN=1, fE=-0.5, fZ=2, ZNE=True)
5656
print(static_syn.keys())
57-
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'SFZ', 'SFN', 'SFE'])
58-
plot_static(static_syn, "SF", "syn_sf.png")
57+
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'Z', 'N', 'E'])
58+
plot_static(static_syn, "syn_sf.png")
5959
# END SYN SF
6060
# ---------------------------------------------------------------------------------
6161

@@ -64,17 +64,17 @@ def plot_static(static_syn:dict, srctype:str, out:Union[str,None]=None):
6464
# BEGIN SYN DC
6565
static_syn = pygrt.utils.gen_syn_from_gf_DC(static_grn, M0=1e24, strike=33, dip=50, rake=120, ZNE=True)
6666
print(static_syn.keys())
67-
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'DCZ', 'DCN', 'DCE'])
68-
plot_static(static_syn, "DC", "syn_dc.png")
67+
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'Z', 'N', 'E'])
68+
plot_static(static_syn, "syn_dc.png")
6969
# END SYN DC
7070
# ---------------------------------------------------------------------------------
7171

7272
# ---------------------------------------------------------------------------------
7373
# BEGIN SYN DC2
7474
static_syn = pygrt.utils.gen_syn_from_gf_DC(static_grn, M0=1e24, strike=33, dip=90, rake=0, ZNE=True)
7575
print(static_syn.keys())
76-
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'DCZ', 'DCN', 'DCE'])
77-
plot_static(static_syn, "DC", "syn_dc2.png")
76+
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'Z', 'N', 'E'])
77+
plot_static(static_syn, "syn_dc2.png")
7878
# END SYN DC2
7979
# ---------------------------------------------------------------------------------
8080

@@ -84,16 +84,16 @@ def plot_static(static_syn:dict, srctype:str, out:Union[str,None]=None):
8484
# BEGIN SYN MT
8585
static_syn = pygrt.utils.gen_syn_from_gf_MT(static_grn, M0=1e24, MT=[0.1,-0.2,1.0,0.3,-0.5,-2.0], ZNE=True)
8686
print(static_syn.keys())
87-
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'MTZ', 'MTN', 'MTE'])
88-
plot_static(static_syn, "MT", "syn_mt.png")
87+
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'Z', 'N', 'E'])
88+
plot_static(static_syn, "syn_mt.png")
8989
# END SYN MT
9090
# ---------------------------------------------------------------------------------
9191

9292
# ---------------------------------------------------------------------------------
9393
# BEGIN SYN MT2
9494
static_syn = pygrt.utils.gen_syn_from_gf_MT(static_grn, M0=1e24, MT=[0,-0.2,0,0,0,0], ZNE=True)
9595
print(static_syn.keys())
96-
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'MTZ', 'MTN', 'MTE'])
97-
plot_static(static_syn, "MT", "syn_mt2.png")
96+
# dict_keys(['_xarr', '_yarr', '_src_va', '_src_vb', '_src_rho', '_rcv_va', '_rcv_vb', '_rcv_rho', 'Z', 'N', 'E'])
97+
plot_static(static_syn, "syn_mt2.png")
9898
# END SYN MT2
9999
# ---------------------------------------------------------------------------------

‎docs/source/Tutorial/static/run/run.sh‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ function _example_gmtplot(){
77
# ---------------------------------------------------------------------------------
88
# BEGIN gmt
99
syn="stsyn_ex.nc"
10-
sname="EX"
1110
gmt begin syn_ex png E300
1211
gmt basemap -Baf -BWSen -JX5c/6c $(gmt grdinfo -Ir $syn)
13-
gmt grdimage ${syn}?${sname}Z
14-
gmt grdvector ${syn}?${sname}E ${syn}?${sname}N -Q0.08c+e+jc+h1+gblack -Si0.03c
12+
gmt grdimage ${syn}?Z
13+
gmt grdvector ${syn}?E ${syn}?N -Q0.08c+e+jc+h1+gblack -Si0.03c
1514
gmt colorbar -Bx+l"Z (cm)"
1615
gmt end
1716
# END gmt
@@ -21,12 +20,11 @@ gmt end
2120

2221
function gmtplot_static(){
2322
local syn=$1
24-
local sname=$2
25-
local S=$3
23+
local S=$2
2624

2725
gmt basemap -Baf -BWSen -JX5c/6c $(gmt grdinfo -Ir $syn)
28-
gmt grdimage ${syn}?${sname}Z
29-
gmt grdvector ${syn}?${sname}E ${syn}?${sname}N -Q0.08c+e+jc+h1+gblack $S
26+
gmt grdimage ${syn}?Z
27+
gmt grdvector ${syn}?E ${syn}?N -Q0.08c+e+jc+h1+gblack $S
3028
}
3129

3230

@@ -58,7 +56,7 @@ grt static syn -S1e24 -N -Gstgrn.nc -Ostsyn_ex.nc
5856
# ---------------------------------------------------------------------------------
5957

6058
gmt begin syn_ex png E300
61-
gmtplot_static stsyn_ex.nc EX -Si0.03c
59+
gmtplot_static stsyn_ex.nc -Si0.03c
6260
gmt colorbar -Bx+l"Z (cm)"
6361
gmt end
6462

@@ -71,7 +69,7 @@ grt static syn -S1e16 -F1/-0.5/2 -N -Gstgrn.nc -Ostsyn_sf.nc
7169
# ---------------------------------------------------------------------------------
7270

7371
gmt begin syn_sf png E300
74-
gmtplot_static stsyn_sf.nc SF -Si6.5c
72+
gmtplot_static stsyn_sf.nc -Si6.5c
7573
gmt colorbar -Bx+l"Z (cm)"
7674
gmt end
7775

@@ -83,7 +81,7 @@ grt static syn -S1e24 -M33/50/120 -N -Gstgrn.nc -Ostsyn_dc.nc
8381
# ---------------------------------------------------------------------------------
8482

8583
gmt begin syn_dc png E300
86-
gmtplot_static stsyn_dc.nc DC -Si0.03c
84+
gmtplot_static stsyn_dc.nc -Si0.03c
8785
gmt meca -Sa0.5c <<EOF
8886
0 0 2 33 50 120 5
8987
EOF
@@ -99,7 +97,7 @@ grt static syn -S1e24 -M33/90/0 -N -Gstgrn.nc -Ostsyn_dc2.nc
9997

10098

10199
gmt begin syn_dc2 png E300
102-
gmtplot_static stsyn_dc2.nc DC -Si0.03c
100+
gmtplot_static stsyn_dc2.nc -Si0.03c
103101
gmt meca -Sa0.5c <<EOF
104102
0 0 2 33 90 0 5
105103
EOF
@@ -114,7 +112,7 @@ grt static syn -S1e24 -T0.1/-0.2/1.0/0.3/-0.5/-2.0 -N -Gstgrn.nc -Ostsyn_mt.nc
114112
# ---------------------------------------------------------------------------------
115113

116114
gmt begin syn_mt png E300
117-
gmtplot_static stsyn_mt.nc MT -Si0.02c
115+
gmtplot_static stsyn_mt.nc -Si0.02c
118116
gmt meca -Sm0.5c <<EOF
119117
0 0 2 -2.0 0.1 0.3 1.0 0.5 0.2 24
120118
EOF
@@ -133,7 +131,7 @@ grt static syn -S1e24 -T0/-0.2/0/0/0/0 -N -Gstgrn.nc -Ostsyn_mt2.nc
133131
# X Y depth mrr mtt mff mrt mrf mtf exp
134132
# mzz mxx myy mxz -myz -mxy
135133
gmt begin syn_mt2 png E300
136-
gmtplot_static stsyn_mt2.nc MT -Si0.13c
134+
gmtplot_static stsyn_mt2.nc -Si0.13c
137135
gmt meca -Sm0.5c <<EOF
138136
0 0 2 0.0 0.0 0.0 0.0 0.0 0.2 24
139137
EOF

‎example/convolve_signals/run_pygrt.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
st = pygrt.utils.gen_syn_from_gf_EX(st_grn, S, az)
2424
sigs = pygrt.sigs.gen_triangle_wave(0.4, dt)
2525
pygrt.utils.stream_convolve(st, sigs)
26-
pygrt.utils.stream_write_sac(st, "p_syn_ex/")
26+
pygrt.utils.stream_write_sac(st, "p_syn_ex")
2727

2828
st = pygrt.utils.gen_syn_from_gf_SF(st_grn, S, 2, -1, 4, az)
2929
sigs = pygrt.sigs.gen_trap_wave(0.1, 0.3, 0.6, dt)
3030
pygrt.utils.stream_convolve(st, sigs)
31-
pygrt.utils.stream_write_sac(st, "p_syn_sf/")
31+
pygrt.utils.stream_write_sac(st, "p_syn_sf")
3232

3333
st = pygrt.utils.gen_syn_from_gf_DC(st_grn, S, 77, 88, 99, az)
3434
sigs = pygrt.sigs.gen_parabola_wave(0.6, dt)
3535
pygrt.utils.stream_convolve(st, sigs)
36-
pygrt.utils.stream_write_sac(st, "p_syn_dc/")
36+
pygrt.utils.stream_write_sac(st, "p_syn_dc")
3737

3838
st = pygrt.utils.gen_syn_from_gf_MT(st_grn, S, [1,-2,-5,0.5,3,1.2], az)
3939
sigs = pygrt.sigs.gen_ricker_wave(3, dt)
4040
pygrt.utils.stream_convolve(st, sigs)
41-
pygrt.utils.stream_write_sac(st, "p_syn_mt/")
41+
pygrt.utils.stream_write_sac(st, "p_syn_mt")

‎pygrt/C_extension/src/dynamic/grt_syn.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ static void save_to_sac(GRT_MODULE_CTRL *Ctrl, const char *pfx, const char ch, f
539539
hd.az = Ctrl->A.azimuth;
540540
hd.baz = Ctrl->A.backazimuth;
541541
char *buffer = NULL;
542-
snprintf(hd.kcmpnm, sizeof(hd.kcmpnm), "%s%s%c", pfx, Ctrl->s_computeType, ch);
542+
snprintf(hd.kcmpnm, sizeof(hd.kcmpnm), "%s%c", pfx, ch);
543543
GRT_SAFE_ASPRINTF(&buffer, "%s/%s%c.sac", Ctrl->O.s_output_dir, pfx, ch);
544544
write_sac(buffer, hd, arr);
545545
GRT_SAFE_FREE_PTR(buffer);

‎pygrt/C_extension/src/static/grt_static_rotation.c‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,6 @@ int static_rotation_main(int argc, char **argv){
100100
GRTRaiseError("[%s] Input grid didn't have displacement derivatives.", command);
101101
}
102102

103-
// 读入震源类型
104-
char *s_computeType = NULL;
105-
{
106-
size_t len = 0;
107-
GRT_NC_CHECK(nc_inq_attlen(in_ncid, NC_GLOBAL, "computeType", &len));
108-
s_computeType = (char *)calloc(len+1, sizeof(char));
109-
GRT_NC_CHECK(nc_get_att_text(in_ncid, NC_GLOBAL, "computeType", s_computeType));
110-
s_computeType[len] = '\0';
111-
}
112-
113-
114103
// 读入坐标变量 dimid, varid
115104
size_t nx, ny;
116105
GRT_NC_CHECK(nc_inq_dimid(in_ncid, "north", &in_x_dimid));
@@ -131,11 +120,11 @@ int static_rotation_main(int argc, char **argv){
131120
// 读入合成位移偏导 varid
132121
for(int c=0; c<GRT_CHANNEL_NUM; ++c){
133122
char *s_title = NULL;
134-
GRT_SAFE_ASPRINTF(&s_title, "%s%c", s_computeType, toupper(chs[c]));
123+
GRT_SAFE_ASPRINTF(&s_title, "%c", toupper(chs[c]));
135124
GRT_NC_CHECK(nc_inq_varid(in_ncid, s_title, &in_syn_varids[c]));
136125

137126
for(int c2=0; c2<GRT_CHANNEL_NUM; ++c2){
138-
GRT_SAFE_ASPRINTF(&s_title, "%c%s%c", tolower(chs[c2]), s_computeType, toupper(chs[c]));
127+
GRT_SAFE_ASPRINTF(&s_title, "%c%c", tolower(chs[c2]), toupper(chs[c]));
139128
GRT_NC_CHECK(nc_inq_varid(in_ncid, s_title, &in_syn_upar_varids[c2][c]));
140129
}
141130
GRT_SAFE_FREE_PTR(s_title);

‎pygrt/C_extension/src/static/grt_static_strain.c‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,6 @@ int static_strain_main(int argc, char **argv){
9797
GRTRaiseError("[%s] Input grid didn't have displacement derivatives.", command);
9898
}
9999

100-
// 读入震源类型
101-
char *s_computeType = NULL;
102-
{
103-
size_t len = 0;
104-
GRT_NC_CHECK(nc_inq_attlen(in_ncid, NC_GLOBAL, "computeType", &len));
105-
s_computeType = (char *)calloc(len+1, sizeof(char));
106-
GRT_NC_CHECK(nc_get_att_text(in_ncid, NC_GLOBAL, "computeType", s_computeType));
107-
s_computeType[len] = '\0';
108-
}
109-
110-
111100
// 读入坐标变量 dimid, varid
112101
size_t nx, ny;
113102
GRT_NC_CHECK(nc_inq_dimid(in_ncid, "north", &in_x_dimid));
@@ -128,11 +117,11 @@ int static_strain_main(int argc, char **argv){
128117
// 读入合成位移偏导 varid
129118
for(int c=0; c<GRT_CHANNEL_NUM; ++c){
130119
char *s_title = NULL;
131-
GRT_SAFE_ASPRINTF(&s_title, "%s%c", s_computeType, toupper(chs[c]));
120+
GRT_SAFE_ASPRINTF(&s_title, "%c", toupper(chs[c]));
132121
GRT_NC_CHECK(nc_inq_varid(in_ncid, s_title, &in_syn_varids[c]));
133122

134123
for(int c2=0; c2<GRT_CHANNEL_NUM; ++c2){
135-
GRT_SAFE_ASPRINTF(&s_title, "%c%s%c", tolower(chs[c2]), s_computeType, toupper(chs[c]));
124+
GRT_SAFE_ASPRINTF(&s_title, "%c%c", tolower(chs[c2]), toupper(chs[c]));
136125
GRT_NC_CHECK(nc_inq_varid(in_ncid, s_title, &in_syn_upar_varids[c2][c]));
137126
}
138127
GRT_SAFE_FREE_PTR(s_title);

‎pygrt/C_extension/src/static/grt_static_stress.c‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ printf("\n"
3434
"\n\n"
3535
"Usage:\n"
3636
"----------------------------------------------------------------\n"
37-
" grt static stress < <file>\n"
37+
" grt static stress <ingrid>\n"
3838
"\n\n\n"
3939
);
4040
}
@@ -98,16 +98,6 @@ int static_stress_main(int argc, char **argv){
9898
GRTRaiseError("[%s] Input grid didn't have displacement derivatives.", command);
9999
}
100100

101-
// 读入震源类型
102-
char *s_computeType = NULL;
103-
{
104-
size_t len = 0;
105-
GRT_NC_CHECK(nc_inq_attlen(in_ncid, NC_GLOBAL, "computeType", &len));
106-
s_computeType = (char *)calloc(len+1, sizeof(char));
107-
GRT_NC_CHECK(nc_get_att_text(in_ncid, NC_GLOBAL, "computeType", s_computeType));
108-
s_computeType[len] = '\0';
109-
}
110-
111101
// 读入接收点的物性参数，计算 rcv_mu 和 rcv_lambda
112102
MYREAL rcv_mu, rcv_lam;
113103
{
@@ -139,11 +129,11 @@ int static_stress_main(int argc, char **argv){
139129
// 读入合成位移偏导 varid
140130
for(int c=0; c<GRT_CHANNEL_NUM; ++c){
141131
char *s_title = NULL;
142-
GRT_SAFE_ASPRINTF(&s_title, "%s%c", s_computeType, toupper(chs[c]));
132+
GRT_SAFE_ASPRINTF(&s_title, "%c", toupper(chs[c]));
143133
GRT_NC_CHECK(nc_inq_varid(in_ncid, s_title, &in_syn_varids[c]));
144134

145135
for(int c2=0; c2<GRT_CHANNEL_NUM; ++c2){
146-
GRT_SAFE_ASPRINTF(&s_title, "%c%s%c", tolower(chs[c2]), s_computeType, toupper(chs[c]));
136+
GRT_SAFE_ASPRINTF(&s_title, "%c%c", tolower(chs[c2]), toupper(chs[c]));
147137
GRT_NC_CHECK(nc_inq_varid(in_ncid, s_title, &in_syn_upar_varids[c2][c]));
148138
}
149139
GRT_SAFE_FREE_PTR(s_title);

‎pygrt/C_extension/src/static/grt_static_syn.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ printf("\n"
142142
"\n"
143143
" -h Display this help message.\n"
144144
"\n\n"
145-
// 示例待更新
146145
"Examples:\n"
147146
"----------------------------------------------------------------\n"
148147
" Say you have computed Static Green's functions with following command:\n"
@@ -404,12 +403,12 @@ int static_syn_main(int argc, char **argv){
404403
// 定义合成结果 varid
405404
for(int c=0; c<GRT_CHANNEL_NUM; ++c){
406405
char *s_title = NULL;
407-
GRT_SAFE_ASPRINTF(&s_title, "%s%c", Ctrl->s_computeType, toupper(chs[c]));
406+
GRT_SAFE_ASPRINTF(&s_title, "%c", toupper(chs[c]));
408407
GRT_NC_CHECK(nc_def_var(out_ncid, s_title, GRT_NC_MYREAL, ndims, out_dimids, &out_syn_varids[c]));
409408
// 位移偏导
410409
if(Ctrl->e.active){
411410
for(int c2=0; c2<GRT_CHANNEL_NUM; ++c2){
412-
GRT_SAFE_ASPRINTF(&s_title, "%c%s%c", tolower(chs[c2]), Ctrl->s_computeType, toupper(chs[c]));
411+
GRT_SAFE_ASPRINTF(&s_title, "%c%c", tolower(chs[c2]), toupper(chs[c]));
413412
GRT_NC_CHECK(nc_def_var(out_ncid, s_title, GRT_NC_MYREAL, ndims, out_dimids, &out_syn_upar_varids[c2][c]));
414413
}
415414
}

0 commit comments

Comments
 (0)