Skip to content

Commit 905eeeb

Browse files
PaulWesselPaulWessel
committed
Merge branch 'master' into gdal-update
2 parents 234ca99 + d638d73 commit 905eeeb

36 files changed

+315
-164
lines changed

‎admin/build-macos-external-list.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ EXELINKS=/opt/local/bin/gs
3737
EXEONLY=
3838
# 1d. Shared directories to be added
3939
# Use full path if you need something not in your path
40-
EXESHARED="gdal /opt/local/share/ghostscript /opt/local/lib/proj7/share/proj"
40+
EXESHARED="gdal /opt/local/share/ghostscript /opt/local/lib/proj8/share/proj"
4141
#-----------------------------------------
4242
# 2a. Add the executables to the list given their paths
4343
rm -f ${TMPDIR}/raw.lis

‎doc/examples/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ endif (SPHINX_FOUND)
6161
file (GLOB _examples RELATIVE ${CMAKE_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/ex*/*.sh")
6262
# Remove a few known failed examples from tests
6363
list (REMOVE_ITEM _examples "doc/examples/ex51/ex51.sh")
64+
list (REMOVE_ITEM _examples "doc/examples/ex49/ex49.sh")
6465
if (DO_EXAMPLES AND BASH)
6566
foreach (_job ${_examples} ${_anims})
6667
add_test (NAME ${_job}

‎doc/examples/ex49/ex49.bat‎

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,57 @@ REM GMT EXAMPLE 49
22
REM
33
REM Purpose: Illustrate data analysis using the seafloor depth/age relationship
44
REM GMT modules: blockmode, gmtmath, grdcontour, grdimage, grdsample, makecpt,
5-
REM basemap, legend, colorbar, plot, xyz2grd
5+
REM subplot, basemap, legend, colorbar, plot, xyz2grd
66
REM
77

88
gmt begin ex49
99
REM Pull depth and age subsets from the global remote files
1010
gmt grdcut @earth_relief_02m -R30W/5E/30S/5S -Gdepth_pixel.nc
1111
gmt grdcut @earth_age_02m -R30W/5E/30S/5S -Gage_pixel.nc
12-
REM Image depths with color-coded age contours
13-
gmt makecpt -Cabyss -T-7000/0 -H > z.cpt
14-
gmt makecpt -Chot -T0/100/10 -H > t.cpt
15-
gmt grdimage depth_pixel.nc -JM15c -Cz.cpt -B -BWSne --FORMAT_GEO_MAP=dddF
16-
gmt plot -W1p @ridge_49.txt
17-
gmt grdcontour age_pixel.nc -A+f14p -Ct.cpt -Wa0.1p+c -GL30W/22S/5E/13S
18-
gmt colorbar -Cz.cpt -DjTR+w5c/0.4c+h+o0.75c/0.4c -Baf+u" km" -W0.001 -F+p1p+gbeige
12+
REM Flip to positive depths in km
13+
gmt grdmath depth_pixel.nc NEG 1000 DIV = depth_pixel.nc
1914
REM Obtain depth, age pairs by dumping grids and pasting results
20-
gmt grd2xyz age_pixel.nc -bof > age.bin
15+
gmt grd2xyz age_pixel.nc -bof > age.bin
2116
gmt grd2xyz depth_pixel.nc -bof > depth.bin
2217
gmt convert -A age.bin depth.bin -bi3f -o2,5,5 -bo3f > depth-age.bin
23-
REM Create and map density grid of (age,depth) distribution
24-
gmt xyz2grd -R0/100/-6500/0 -I0.25/25 -r depth-age.bin -bi3f -An -Gdensity.nc
25-
REM WHy do we need the -R below? otherwise it fails to work
26-
gmt grdimage density.nc -R0/100/-6500/0 -JX15c/10c -Q -Y12c -Ct.cpt
2718
REM Obtain modal depths every ~5 Myr
28-
gmt blockmode -R0/100/-10000/0 -I5/10000 -r -E depth-age.bin -bi3f -o0,2,3 > modal.txt
29-
REM Compute Parsons & Sclater [1977] depth-age curve
30-
REM depth(t) = 350 * sqrt(t) + 2500, t < 70 Myr
31-
REM = 6400 - 3200 exp (-t/62.8), t > 70 Myr
32-
gmt math -T0/100/0.1 T SQRT 350 MUL 2500 ADD T 70 LE MUL 6400 T 62.8 DIV NEG EXP 3200 MUL SUB T 70 GT MUL ADD NEG = ps.txt
33-
gmt plot ps.txt -W4p,green
34-
gmt plot ps.txt -W1p
35-
REM Compute Stein & Stein [1992] depth-age curve
36-
REM depth(t) = 365 * sqrt(t) + 2600, t < 20 Myr
37-
REM = 5651 - 2473 * exp (-0.0278*t), t > 20 Myr
38-
gmt math -T0/100/0.1 T SQRT 365 MUL 2600 ADD T 20 LE MUL 5651 T -0.0278 MUL EXP 2473 MUL SUB T 20 GT MUL ADD NEG = ss.txt
39-
REM Plot curves and place the legend
40-
gmt plot ss.txt -W4p,white
41-
gmt plot ss.txt -W1p
42-
gmt plot -Ss0.4c -Gblue modal.txt -Ey+p1p,blue
43-
gmt plot -Ss0.1c -Gwhite modal.txt
44-
gmt basemap -R0/100/0/6.5 -JX6i/-4i -Bxaf+u" Myr" -Byaf+u" km" -BWsNe
45-
echo S 0.5c - 0.9c - 4p,green 1c Parsons ^& Sclater (1977) > tmp.txt
46-
echo S 0.5c - 0.9c - 4p,white 1c Stein ^& Stein (1992) >> tmp.txt
47-
echo S 0.5c s 0.4c blue - 1c Modal depth estimates >> tmp.txt
48-
gmt legend tmp.txt -DjRT+w6.5c+o0.25c -F+p1p+gbeige+s
49-
echo S 0.5c - 0.9c - 1p 0.75c > tmp.txt
50-
echo S 0.5c - 0.9c - 1p 0.75c >> tmp.txt
51-
echo S 0.5c s 0.1c white - 0.75c >> tmp.txt
52-
gmt legend tmp.txt -DjRT+w6.5c+o0.25c
19+
gmt blockmode -R0/100/0/10 -I5/10 -r -E -Q depth-age.bin -bi3f -o0,2,3 > modal.txt
20+
REM Create density grid of (age,depth) distribution
21+
gmt xyz2grd -R0/100/0/6.5 -I0.25/0.025 -r depth-age.bin -bi3f -An -Gdensity.nc
22+
REM Make CPTs for ages and depths
23+
gmt makecpt -Chot -T0/100/10 -H > t.cpt
24+
gmt makecpt -Cabyss -T0/7 -H -I > z.cpt
25+
gmt subplot begin 2x1 -Fs15c/11.3c -Sc
26+
REM Image depth distribution, modal depths, and competing predictions
27+
gmt grdimage density.nc -Q -Ct.cpt -JX15c/-11.3c -Bxaf+u" Myr" -Byaf+u" km" -c
28+
REM Compute Parsons & Sclater [1977] depth-age curve (in km)
29+
REM depth(t) = 0.35 * sqrt(t) + 2.500, t < 70 Myr
30+
REM = 6.4 - 3.2 exp (-t/62.8), t > 70 Myr
31+
gmt math -T0/100/0.1 T SQRT 0.35 MUL 2.5 ADD T 70 LE MUL 6.4 T 62.8 DIV NEG EXP 3.2 MUL SUB T 70 GT MUL ADD = ps.txt
32+
gmt plot ps.txt -W4p,green
33+
gmt plot ps.txt -W1p
34+
REM Compute Stein & Stein [1992] depth-age curve (in km)
35+
REM depth(t) = 0.365 * sqrt(t) + 2.6, t < 20 Myr
36+
REM = 5.651 - 2.473 * exp (-0.0278*t), t > 20 Myr
37+
gmt math -T0/100/0.1 T SQRT 0.365 MUL 2.6 ADD T 20 LE MUL 5.651 T -0.0278 MUL EXP 2.473 MUL SUB T 20 GT MUL ADD = ss.txt
38+
REM Plot curves and place the legend
39+
gmt plot ss.txt -W4p,white
40+
gmt plot ss.txt -W1p
41+
gmt plot -Ss0.4c -Gblue modal.txt -Ey+p1p,blue
42+
gmt plot -Ss0.1c -Gwhite modal.txt
43+
echo S 0.5c - 0.9c - 4p,green 1.2c Parsons & Sclater (1977) > tmp.txt
44+
echo S 0.5c - 0.9c - 4p,white 1.2c Stein & Stein (1992) >> tmp.txt
45+
echo S 0.5c s 0.4c blue - 1.2c Modal depth estimates >> tmp.txt
46+
gmt legend -DjRT+w5.5c+o0.25c -F+p1p+gbeige+s tmp.txt
47+
echo S 0.5c - 0.9c - 1p 0.75c > tmp.txt
48+
echo S 0.5c - 0.9c - 1p 0.75c >> tmp.txt
49+
echo S 0.5c s 0.1c white - 0.75c >> tmp.txt
50+
gmt legend -DjRT+w5.5c+o0.25c tmp.txt
51+
REM Image depths with color-coded age contours
52+
gmt grdimage depth_pixel.nc -R30W/5E/30S/5S -JM? -Cz.cpt -c
53+
gmt plot -W1p @ridge_49.txt
54+
gmt grdcontour age_pixel.nc -A+f14p -Ct.cpt -Wa0.1p+c -GL30W/22S/5E/13S
55+
gmt colorbar -Cz.cpt -DjTR+w4.7c/0.4c+h+r+o0.85c/0.35c -Baf+u" km" -F+p1p+gbeige+s+c0p/10p/4p/4p
56+
gmt subplot end
5357
del age_pixel.nc depth_pixel.nc age.bin depth.bin depth-age.bin density.nc modal.txt ps.txt ss.txt z.cpt t.cpt tmp.txt
5458
gmt end show

‎doc/examples/ex49/ex49.ps‎

2.49 KB
Binary file not shown.

‎doc/examples/ex49/ex49.sh‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,55 +3,59 @@
33
#
44
# Purpose: Illustrate data analysis using the seafloor depth/age relationship
55
# GMT modules: blockmode, gmtmath, grdcontour, grdimage, grdsample, makecpt,
6-
# basemap, legend, colorbar, plot, xyz2grd
6+
# subplot, basemap, legend, colorbar, plot, xyz2grd
77
#
88

99
gmt begin ex49
1010
# Pull depth and age subsets from the global remote files
1111
gmt grdcut @earth_relief_02m -R30W/5E/30S/5S -Gdepth_pixel.nc
1212
gmt grdcut @earth_age_02m -R30W/5E/30S/5S -Gage_pixel.nc
13-
# Image depths with color-coded age contours
14-
gmt makecpt -Cabyss -T-7000/0 -H > z.cpt
15-
gmt makecpt -Chot -T0/100/10 -H > t.cpt
16-
gmt grdimage depth_pixel.nc -JM15c -Cz.cpt -B -BWSne --FORMAT_GEO_MAP=dddF --FONT_ANNOT_PRIMARY=12p
17-
gmt plot -W1p @ridge_49.txt
18-
gmt grdcontour age_pixel.nc -A+f14p -Ct.cpt -Wa0.1p+c -GL30W/22S/5E/13S
19-
gmt colorbar -Cz.cpt -DjTR+w5c/0.4c+h+o0.75c/0.4c -Baf+u" km" -W0.001 -F+p1p+gbeige
13+
# Flip to positive depths in km
14+
gmt grdmath depth_pixel.nc NEG 1000 DIV = depth_pixel.nc
2015
# Obtain depth, age pairs by dumping grids and pasting results
2116
gmt grd2xyz age_pixel.nc -bof > age.bin
2217
gmt grd2xyz depth_pixel.nc -bof > depth.bin
2318
gmt convert -A age.bin depth.bin -bi3f -o2,5,5 -bo3f > depth-age.bin
24-
# Create and map density grid of (age,depth) distribution
25-
gmt xyz2grd -R0/100/-6500/0 -I0.25/25 -r depth-age.bin -bi3f -An -Gdensity.nc
26-
# WHy do we need the -R below? otherwise it fails to work
27-
gmt grdimage density.nc -R0/100/-6500/0 -JX15c/10c -Q -Y12c -Ct.cpt
2819
# Obtain modal depths every ~5 Myr
29-
gmt blockmode -R0/100/-10000/0 -I5/10000 -r -E depth-age.bin -bi3f -o0,2,3 > modal.txt
30-
# Compute Parsons & Sclater [1977] depth-age curve
31-
# depth(t) = 350 * sqrt(t) + 2500, t < 70 Myr
32-
# = 6400 - 3200 exp (-t/62.8), t > 70 Myr
33-
gmt math -T0/100/0.1 T SQRT 350 MUL 2500 ADD T 70 LE MUL 6400 T 62.8 DIV NEG EXP 3200 MUL SUB T 70 GT MUL ADD NEG = ps.txt
34-
gmt plot ps.txt -W4p,green
35-
gmt plot ps.txt -W1p
36-
# Compute Stein & Stein [1992] depth-age curve
37-
# depth(t) = 365 * sqrt(t) + 2600, t < 20 Myr
38-
# = 5651 - 2473 * exp (-0.0278*t), t > 20 Myr
39-
gmt math -T0/100/0.1 T SQRT 365 MUL 2600 ADD T 20 LE MUL 5651 T -0.0278 MUL EXP 2473 MUL SUB T 20 GT MUL ADD NEG = ss.txt
40-
# Plot curves and place the legend
41-
gmt plot ss.txt -W4p,white
42-
gmt plot ss.txt -W1p
43-
gmt plot -Ss0.4c -Gblue modal.txt -Ey+p1p,blue
44-
gmt plot -Ss0.1c -Gwhite modal.txt
45-
gmt basemap -R0/100/0/6.5 -JX15c/-10c -Bxaf+u" Myr" -Byaf+u" km" -BWsNe --FONT_ANNOT_PRIMARY=12p
46-
gmt legend -DjRT+w6.5c+o0.25c -F+p1p+gbeige+s <<- EOF
47-
S 0.5c - 0.9c - 4p,green 1c Parsons & Sclater (1977)
48-
S 0.5c - 0.9c - 4p,white 1c Stein & Stein (1992)
49-
S 0.5c s 0.4c blue - 1c Modal depth estimates
50-
EOF
51-
gmt legend -DjRT+w6.5c+o0.25c <<- EOF
52-
S 0.5c - 0.9c - 1p 0.75c
53-
S 0.5c - 0.9c - 1p 0.75c
54-
S 0.5c s 0.1c white - 0.75c
55-
EOF
20+
gmt blockmode -R0/100/0/10 -I5/10 -r -E -Q depth-age.bin -bi3f -o0,2,3 > modal.txt
21+
# Create density grid of (age,depth) distribution
22+
gmt xyz2grd -R0/100/0/6.5 -I0.25/0.025 -r depth-age.bin -bi3f -An -Gdensity.nc
23+
# Make CPTs for ages and depths
24+
gmt makecpt -Chot -T0/100/10 -H > t.cpt
25+
gmt makecpt -Cabyss -T0/7 -H -I > z.cpt
26+
gmt subplot begin 2x1 -Fs15c/11.3c -Sc
27+
# Image depth distribution, modal depths, and competing predictions
28+
gmt grdimage density.nc -Q -Ct.cpt -JX15c/-11.3c -Bxaf+u" Myr" -Byaf+u" km" -c
29+
# Compute Parsons & Sclater [1977] depth-age curve (in km)
30+
# depth(t) = 0.35 * sqrt(t) + 2.500, t < 70 Myr
31+
# = 6.4 - 3.2 exp (-t/62.8), t > 70 Myr
32+
gmt math -T0/100/0.1 T SQRT 0.35 MUL 2.5 ADD T 70 LE MUL 6.4 T 62.8 DIV NEG EXP 3.2 MUL SUB T 70 GT MUL ADD = ps.txt
33+
gmt plot ps.txt -W4p,green
34+
gmt plot ps.txt -W1p
35+
# Compute Stein & Stein [1992] depth-age curve (in km)
36+
# depth(t) = 0.365 * sqrt(t) + 2.6, t < 20 Myr
37+
# = 5.651 - 2.473 * exp (-0.0278*t), t > 20 Myr
38+
gmt math -T0/100/0.1 T SQRT 0.365 MUL 2.6 ADD T 20 LE MUL 5.651 T -0.0278 MUL EXP 2.473 MUL SUB T 20 GT MUL ADD = ss.txt
39+
# Plot curves and place the legend
40+
gmt plot ss.txt -W4p,white
41+
gmt plot ss.txt -W1p
42+
gmt plot -Ss0.4c -Gblue modal.txt -Ey+p1p,blue
43+
gmt plot -Ss0.1c -Gwhite modal.txt
44+
gmt legend -DjRT+w5.5c+o0.25c -F+p1p+gbeige+s <<- EOF
45+
S 0.5c - 0.9c - 4p,green 1.2c Parsons & Sclater (1977)
46+
S 0.5c - 0.9c - 4p,white 1.2c Stein & Stein (1992)
47+
S 0.5c s 0.4c blue - 1.2c Modal depth estimates
48+
EOF
49+
gmt legend -DjRT+w5.5c+o0.25c <<- EOF
50+
S 0.5c - 0.9c - 1p 0.75c
51+
S 0.5c - 0.9c - 1p 0.75c
52+
S 0.5c s 0.1c white - 0.75c
53+
EOF
54+
# Image depths with color-coded age contours
55+
gmt grdimage depth_pixel.nc -R30W/5E/30S/5S -JM? -Cz.cpt -c
56+
gmt plot -W1p @ridge_49.txt
57+
gmt grdcontour age_pixel.nc -A+f14p -Ct.cpt -Wa0.1p+c -GL30W/22S/5E/13S
58+
gmt colorbar -Cz.cpt -DjTR+w4.7c/0.4c+h+r+o0.85c/0.35c -Baf+u" km" -F+p1p+gbeige+s+c0p/10p/4p/4p
59+
gmt subplot end
5660
rm -f age_pixel.nc depth_pixel.nc age.bin depth.bin depth-age.bin density.nc modal.txt ps.txt ss.txt z.cpt t.cpt
5761
gmt end show

‎doc/rst/source/cookbook/features.rst‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,13 @@ do not need to repeat the region and projection information, as shown here::
440440
gmt end show
441441

442442
Thus, the chosen options remain in effect until you provide new option
443-
arguments on the command line.
443+
arguments on the command line. **Note**: We keep track of two types of regions,
444+
One is the domain used for a map and one is the domain used for processing,
445+
which often are the same. When a plot is specified without providing
446+
a region then we look for a previous plot region in the history first, and
447+
if it is not found then we look for the processing domain to use instead. However,
448+
if a data-processing module is not given a region then we only look
449+
for a previous processing domain; we never substitute a plot domain in that case.
444450

445451
Usage messages, syntax- and general error messages
446452
--------------------------------------------------

‎doc/rst/source/explain_symbols.rst_‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@
318318
plotted centered or as a half-symbols on one side. Special options exist for indicating
319319
motion (e.g., faults) along a line.
320320

321-
**-Sf**\ [±]\ *gap*\ [/*size*][**+l**\|\ **+r**][**+b**\|\ **+c**\|\ **+f**\|\ **+s**\ [*angle*]\ \|\ **+t**][**+o**\ *offset*][**+p**\ [*pen*]].
321+
**-Sf**\ [±]\ *gap*\ [/*size*][**+l**\|\ **+r**][**+b**\|\ **c**\|\ **f**\|\ **s**\ [*angle*]\ \|\ **t**\ \|\ **v**][**+o**\ *offset*][**+p**\ [*pen*]].
322322
Draw a **f**\ ront. Supply distance *gap* between symbols and symbol *size*.
323323
If *gap* is negative, it is interpreted to mean the *number* of symbols along the
324324
front instead. If *gap* has a leading + then we use the value exactly as given
@@ -327,7 +327,7 @@
327327
and *size* is thus required. Append **+l** or **+r** to plot symbols on the left or
328328
right side of the front [Default is centered]. Append **+**\ *type* to
329329
specify which symbol to plot: **b**\ ox, **c**\ ircle, **f**\ ault,
330-
**s**\ lip, or **t**\ riangle. [Default is **f**\ ault]. Slip means
330+
**s**\ lip, **t**\ riangle or in\ **v**\ erted triangle. [Default is **f**\ ault]. Slip means
331331
left-lateral or right-lateral strike-slip arrows (centered is not an
332332
option). The **+s** modifier optionally accepts the angle used to draw
333333
the vector [20]. Alternatively, use **+S** which draws arcuate arrow

‎doc/rst/source/gallery/ex49.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
In this example we show an example of data analysis using grids
77
of seafloor depth and age for a region in the south Atlantic.
8-
We use module :doc:`grdsample </grdsample>` to convert the age
9-
grid to the same pixel registration used by the depth grid.
108
Dumping separate x,y,z triplets with :doc:`grd2xyz </grd2xyz>`
119
lets us paste the output back via :doc:`gmtconvert </gmtconvert>`
1210
to make binary tables of age,depth,depth. Here, depth is repeated in

‎doc/rst/source/histogram.rst‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Synopsis
4141
[ |SYN_OPT-h| ]
4242
[ |SYN_OPT-i| ]
4343
[ |SYN_OPT-l| ]
44+
[ |SYN_OPT-o| ]
4445
[ |SYN_OPT-p| ]
4546
[ |SYN_OPT-qi| ]
4647
[ |SYN_OPT-s| ]
@@ -138,7 +139,8 @@ Optional Arguments
138139
Inquire about min/max x and y after binning. The *xmin xmax ymin
139140
ymax* is output; no plotting is done. Append **o** to output an
140141
ASCII table of the resulting x,y data instead. Upper case **O** will
141-
output all x,y bin data even when y == 0.
142+
output all x,y bin data even when y == 0. **Note**: You may use **-o**
143+
to select a subset from this record.
142144

143145
.. _-Jz:
144146

@@ -243,6 +245,8 @@ Optional Arguments
243245
.. |Add_-l| replace:: Symbol is a rectangle with width-to-height ratio of 3:2. Use **+S**\ *width*\ [/*height*] to overwrite with custom width and optionally height.
244246
.. include:: explain_-l.rst_
245247

248+
.. include:: explain_-ocols.rst_
249+
246250
.. |Add_perspective| unicode:: 0x20 .. just an invisible code
247251
.. include:: explain_perspective.rst_
248252

‎doc/rst/source/project.rst‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@ Synopsis
1212

1313
.. include:: common_SYN_OPTs.rst_
1414

15-
**gmt project** [ *table* ] |-C|\ *cx*/*cy* [ |-A|\ *azimuth* ]
16-
[ |-E|\ *bx*/*by* ] [ |-F|\ *flags* ]
17-
[ |-G|\ *dist*\ [/*colat*][**+c**\|\ **h**] ]
15+
**gmt project** [ *table* ]
16+
|-C|\ *cx*/*cy*
17+
[ |-A|\ *azimuth* ]
18+
[ |-E|\ *bx*/*by* ]
19+
[ |-F|\ *flags* ]
20+
[ |-G|\ *dist*\ [*unit*][/*colat*][**+c**][**+h**][**+n**] ]
1821
[ |-L|\ [**w**\|\ *lmin*/*lmax*] ]
19-
[ |-N| ] [ |-Q| ] [ |-S| ]
22+
[ |-N| ]
23+
[ |-Q| ]
24+
[ |-S| ]
2025
[ |-T|\ *px*/*py* ]
2126
[ |SYN_OPT-V| ]
2227
[ |-W|\ *wmin*/*wmax* ]
23-
[ |-Z|\ *major*\ [*unit*][/*minor*/*azimuth*][**+e**\|\ **n**] ]
28+
[ |-Z|\ *major*\ [*unit*][/*minor*/*azimuth*][**+e**] ]
2429
[ |SYN_OPT-b| ]
2530
[ |SYN_OPT-d| ]
2631
[ |SYN_OPT-e| ]
@@ -150,10 +155,10 @@ Optional Arguments
150155

151156
.. _-G:
152157

153-
**-G**\ *dist*\ [/*colat*][**+c**\|\ **h**]
158+
**-G**\ *dist*\ [*unit*][/*colat*][**+c**][**+h**][**+n**]
154159
Create (*r*, *s*, *p*) output points every *dist* units of *p*, assuming all units are the same unless
155-
:math:`x, y, r, s` are set to degrees using |-Q|. No input is read when |-G| is used. The following directives
156-
and modifiers are supported:
160+
:math:`x, y, r, s` are set to degrees using |-Q|. No input is read when |-G| is used. See `Units`_ for
161+
selecting geographic distance units [km]. The following directives and modifiers are supported:
157162

158163
- Optionally, append /*colat* for a small circle instead [Default is a colatitude of 90, i.e., a great circle]. Note,
159164
when using |-C| and |-E| to generate a circle that goes through the center and end point, the center and end point
@@ -162,6 +167,8 @@ Optional Arguments
162167
going through the center *cx*/*cy*.
163168
- Optionally, append **+h** to report the position of the pole as part of the segment header when using |-T|
164169
[Default is no header].
170+
- Optionally, append **+n** to indicate a desired number of points rather than an increment. Requires |-C| and |-E| or |-Z|
171+
so that a length can be computed.
165172

166173
.. _-L:
167174

@@ -206,7 +213,7 @@ Optional Arguments
206213

207214
.. _-Z:
208215

209-
**-Z**\ *major*\ [*unit*][/*minor*/*azimuth*][**+e**\|\ **n**]
216+
**-Z**\ *major*\ [*unit*][/*minor*/*azimuth*][**+e**]
210217
Create the coordinates of an ellipse with *major* and *minor* axes given in km (unless |-N| is given for a
211218
Cartesian ellipse) and the *azimuth* of the major axis in degrees; used in conjunction with |-C| (sets its center)
212219
and |-G| (sets the distance increment). **Note**: For the Cartesian ellipse (which requires |-N|), we expect
@@ -217,7 +224,6 @@ Optional Arguments
217224

218225
- Append **+e** to adjust the increment set via |-G| so that the ellipse has equal distance increments [Default
219226
uses the given increment and closes the ellipse].
220-
- Append **+n** to set a specific number of unique equidistant points via |-G|.
221227

222228
.. |Add_-bi| replace:: [Default is 2 input columns].
223229
.. include:: explain_-bi.rst_

0 commit comments

Comments
 (0)