Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion doc/examples/anim14/anim14.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# DEM: @earth_relief_03s
# Data: @GCMT_1976-2017_meca.gmt
#
# The original data file jan76_dec17.ndk can be downloaded and rearranged to a gmt format with the followings commands:
# The original data file jan76_dec17.ndk can be downloaded and rearranged to a gmt format with the following commands:
# URL="https://www.ldeo.columbia.edu/~gcmt/projects/CMT/catalog/jan76_dec17.ndk"
# gmt which $URL -G
# gawk '/^PDE/ {Date=$2; Time=$3; Lat=$4; Long=$5; Depth=$6; getline; Name=$1; getline; getline; Exp=$1; getline; mant=$11; strike1=$12; dip1=$13; rake1=$14; strike2=$15; dip2=$16; rake2=$17; print Long, Lat, Depth, strike1, dip1, rake1, strike2, dip2, rake2, mant, Exp, Date "T" Time, Name}' jan76_dec17.ndk | sed 's/\//-/g' > meca.gmt
Expand Down
6 changes: 3 additions & 3 deletions doc/examples/ex18/ex18.bat
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ gmt begin ex18
gmt grdmath @AK_gulf_grav.nc mask.nc MUL = tmp.nc

gmt grdvolume tmp.nc -C50 -Sk -o1 > area.txt
gmt grdvolume tmp.nc -C50 -Sk -o2 > volumn.txt
gmt grdvolume tmp.nc -C50 -Sk -o2 > volume.txt
set /p area=<area.txt
set /p volumn=<volumn.txt
set /p volume=<volume.txt

echo ^> -149 52.5 14p 6.6c j > tmp.txt
echo Volumes: %volumn% mGal\267km@+2@+ >> tmp.txt
echo Volumes: %volume% mGal\267km@+2@+ >> tmp.txt
echo Areas: %area% km@+2@+ >> tmp.txt
gmt text tmp.txt -M -Gwhite -Wthin -Dj0.7c -F+f14p,Helvetica-Bold+jLB -C8p
gmt subplot end
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/ex31/fonts/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ We publish our fonts at http://linuxlibertine.sf.net.

7. THE UNDERLINED VARIANT
Please note: The underlined variant is recently not being maintained because its concept doesn't seem to be sofware-technically reliable and because of lack of interest.
The advantage of this font was that g, commas, cedillas... were not overprinted by the line anymore. For technical reasons the space was not underlined but you could use the _ instead. In this font it had the width of the space and the line was at the heighth of the underline. The underlined variant used an older font outline.
The advantage of this font was that g, commas, cedillas... were not overprinted by the line anymore. For technical reasons the space was not underlined but you could use the _ instead. In this font it had the width of the space and the line was at the height of the underline. The underlined variant used an older font outline.

Philipp Poll -- philthelion at users.sourceforge.net
2 changes: 1 addition & 1 deletion doc/examples/ex33/ex33.bat
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gmt begin ex33
REM Plot ridge segment and end points
gmt plot -Rspac_33.nc -W2p,blue ridge.txt
gmt plot -Sc0.25c -Gblue ridge.txt
REM Generate cross-profiles 400 km long, spaced 10 km, samped every 2km
REM Generate cross-profiles 400 km long, spaced 10 km, sampled every 2km
REM and stack these using the median, write stacked profile
gmt grdtrack ridge.txt -Gspac_33.nc -C400k/2k/10k+v -Sm+sstack.txt > table.txt
gmt plot -W0.5p table.txt
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/ex33/ex33.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gmt begin ex33
# Plot ridge segment and end points
gmt plot -Rspac_33.nc -W2p,blue ridge.txt
gmt plot -Sc0.25c -Gblue ridge.txt
# Generate cross-profiles 400 km long, spaced 10 km, samped every 2km
# Generate cross-profiles 400 km long, spaced 10 km, sampled every 2km
# and stack these using the median, write stacked profile
gmt grdtrack ridge.txt -Gspac_33.nc -C400k/2k/10k+v -Sm+sstack.txt > table.txt
gmt plot -W0.5p table.txt
Expand Down
2 changes: 1 addition & 1 deletion doc/rst/source/RPN_MoreOn.rst_
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
More on Reverse Polish Notation

Reverse Polish Notation (RPN) or postfix notation is widely used in computer science because of the simplicity of implementing a
stack-based computation system. The PostScipt language we used to make GMT graphics is postfix, for instance.
stack-based computation system. The PostScript language we used to make GMT graphics is postfix, for instance.
To learn more about RPN or postfix, watch this YouTube video explanation:

.. youtube:: 7ha78yWRDlE
Expand Down
6 changes: 3 additions & 3 deletions doc/rst/source/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -455,15 +455,15 @@ there are numerous changes:
organization: https://www.generic-mapping-tools.org/.
#. A new discussion forum at https://forum.generic-mapping-tools.org/.
#. A data server in Hawaii (oceania.generic-mapping-tools.org) with plans
for new mirror servers around the world. This is where the remote files
for new mirror servers around the world. This is where the remote files
that start with @ come from.
#. A new way to use GMT (*modern* mode) that eliminates many of the
aspects of classic GMT that perplexes users. In modern mode, PostSCript
aspects of classic GMT that perplexes users. In modern mode, PostScript
is no longer the default graphics output format and most modules that
had names starting with **ps** have had that prefix removed. In addition,
a few modules have entirely different names in modern mode (*psxy* is *plot*,
*psxyz* is *plot3d*, and *psscale* is *colorbar*).
#. The default mode remains *classic*, the only mode previously available. All
#. The default mode remains *classic*, the only mode previously available. All
existing classic mode GMT 4 and 5 scripts will run as before.

Modern mode modules in GMT 6.0
Expand Down
2 changes: 1 addition & 1 deletion doc/rst/source/reference/features.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ create a continuous color table (d) with arbitrary nodes by giving **-T**\ 0,2,6
the latter option forces a continuous CPT pinned to a given list of node values. Now, the colors
continuously change from red (at *z = 0*) via yellow (at *z = 2*) to purple (at *z = 6*).
Modules that obtain the *z*-range indirectly (e.g., :doc:`/grdimage`) may use the exact data range
to set the quivalent of a **-T**\ *min/max* option. You may append **+i**\ *dz* to the
to set the equivalent of a **-T**\ *min/max* option. You may append **+i**\ *dz* to the
color list to have the *min* and *max* values rounded down and up to nearest multiple of *dz*, respectively.

.. figure:: /_images/GMT_colorlist.*
Expand Down
2 changes: 1 addition & 1 deletion doc/rst/source/reference/options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ The next example shows two different ways to annotate an axis portraying 2 days
.. literalinclude:: /_verbatim/GMT_-B_time2.txt

The lower example (Figure :ref:`cartesian_axis2`) chooses to annotate the weekdays (by
specifying **a**\ 1\ **K**) while the upper example choses dates (by
specifying **a**\ 1\ **K**) while the upper example chooses dates (by
specifying **a**\ 1\ **D**). Note how the clock format only selects
hours and minutes (no seconds) and the date format selects a month name,
followed by one space and a two-digit day-of-month number.
Expand Down
8 changes: 4 additions & 4 deletions doc/rst/source/supplements/gsfml/fzanalyzer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@ Optional Arguments
Input Files
-----------

The two input files are themselves generated by running :doc:`grdtrack </grdtrack>` first. This step
The two input files are themselves generated by running :doc:`grdtrack </grdtrack>` first. This step
requires a set of digitized FZ tracks (*lon*, *lat*) and three data grids: (a) a
VGG vertical gravity gradient file, (b) a 2 minute crustal age grid, and (c)
a grid with distance to the nearest FZ in km, listed in that order. The critical file is the
VGG grid. If you don't have or care about ages and distances you can make dummy grids that
are all NaNs. You design your cross-profile layout and resampled FZ trackes using :doc:`grdtrack </grdtrack>`
a grid with distance to the nearest FZ in km, listed in that order. The critical file is the
VGG grid. If you don't have or care about ages and distances you can make dummy grids that
are all NaNs. You design your cross-profile layout and resampled FZ tracks using :doc:`grdtrack </grdtrack>`
options **-C** and **-D**..

Nearest Fracture Zone Distances
Expand Down
4 changes: 2 additions & 2 deletions doc/rst/source/supplements/mgd77/mgd77magref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ Optional Arguments
listing_drao_noontime-flux-absolute_monthly.txt

Another update in January 2025. The NASA site above no longer updated its data and now we use *F10.7* data
downloaded from https://celestrak.org/spacedata/SW-All.csv (Matlab refences this site as well). But it
contains only daily data. Hence we computed the montly averages. However, comparing previous and computed
downloaded from https://celestrak.org/spacedata/SW-All.csv (Matlab references this site as well). But it
contains only daily data. Hence we computed the monthly averages. However, comparing previous and computed
averages from this site show some differences. For example the first 4 months of 2018 (replaced to in this
update) compare like this: [609 632 608 634] (nasa) _vs_ [699 725 683 700] (celestrak).

Expand Down
2 changes: 1 addition & 1 deletion doc/rst/source/supplements/module_supplements_purpose.rst_
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

.. |pssac_purpose| replace:: Plot seismograms in SAC format

.. |gmtisf_purpose| replace:: Read seismicity data in the ISF formated file
.. |gmtisf_purpose| replace:: Read seismicity data in the ISF formatted file

.. |backtracker_purpose| replace:: Generate forward and backward flowlines and hotspot tracks

Expand Down
2 changes: 1 addition & 1 deletion doc/rst/source/supplements/seis/gmtisf.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Synopsis
Description
-----------

Reads seismicity data from an ISC (https://www.isc.ac.uk/iscbulletin) formated *file.isc* and output [lon lat depth mag ...]
Reads seismicity data from an ISC (https://www.isc.ac.uk/iscbulletin) formatted *file.isc* and output [lon lat depth mag ...]
to standard output.

Optional Arguments
Expand Down
2 changes: 1 addition & 1 deletion doc/rst/source/triangulate.rst
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Optional Arguments
Give name of file with previously computed Delaunay information. Each record must contain
triplets of node numbers for a triangle in the input *table* [Default computes these
using Delaunay triangulation]. If the *indexfile* is binary and can be read the same way
as the binary input *table* then you can append **+b** to spead up the reading
as the binary input *table* then you can append **+b** to speed up the reading
[Default reads nodes as ASCII].

.. _-M:
Expand Down
14 changes: 7 additions & 7 deletions doc/rst/source/tutorial/julia/session-4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ Color images are made with `grdimage <https://www.generic-mapping-tools.org/GMTj
which takes the usual common command options (by default the **region** is taken from the data set) and a CPT;
the main other options are:

==================== ======================================================================
Option Purpose
==================== ======================================================================
**dpi**\ =val Sets the desired resolution of the image [Default is data resolution]
**shade**\ =grid Use artificial illumination using intensities from a grid or *intensfile*
**monochrom**\ =true Force gray shade using the (television) YIQ conversion
==================== ======================================================================
===================== =========================================================================
Option Purpose
===================== =========================================================================
**dpi**\ =val Sets the desired resolution of the image [Default is data resolution]
**shade**\ =grid Use artificial illumination using intensities from a grid or *intensfile*
**monochrome**\ =true Force gray shade using the (television) YIQ conversion
===================== =========================================================================

We want to make a plain color map with a color bar superimposed above the plot. We try

Expand Down
6 changes: 3 additions & 3 deletions doc/rst/source/users-contrib-symbols/biology/Cetacea.rst
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ In this case, please read also the points 1.2-1.3 of the file FAQ.txt
4: Run the bash script, print/open the output postscript file myfile.ps, or convert to PDF or rasters with gmt psconvert.


FAQ and Troubleshoting
----------------------
FAQ and Troubleshooting
-----------------------

The symbols are not drawn
~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -216,7 +216,7 @@ The symbols are to much big!, What size should I use?
are a little bigger than others, so play with the size in the script until you
obtain the right for you. Remember that you can easily modify the size of the
symbol directly in your GMT script (-Skoorca/0.8 -Skoorca/0.2) or in your file xy.
I recommend to use different sizes for males, females and calfs.
I recommend to use different sizes for males, females and calves.

I don't want color symbols!
^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion test/blockmean/xy2ij.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# We use -R0/5/0/5 -I1 for pixel and gridline registrations
# Points are prepared that will land in various tiles, some will
# fall exactly on tile boundaries. One point will fall outside -R
# but should be considered for the gridline registrated case.
# but should be considered for the gridline registered case.

ps=xy2ij.ps

Expand Down
2 changes: 1 addition & 1 deletion test/grdvolume/sphere_volume.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Make a sphere of radius 10 using two half grids and compute volumnes
# Make a sphere of radius 10 using two half grids and compute volumes
# Addressing issue #895
ps=sphere_volume.ps
gmt grdmath -R-10.1/10.1/-10.1/10.1 -I0.1 X Y HYPOT 10 DIV ACOS SIN 10 MUL NEG = bot_half.grd
Expand Down
2 changes: 1 addition & 1 deletion test/psscale/transp_scale.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Test CPTs with various levels of transparency
ps=transp_scale.ps
# 1. Discrete CPT with no transparenty
# 1. Discrete CPT with no transparency
gmt makecpt -Cturbo -T-4000/-1000/500 -D > t.cpt
gmt psscale -Ct.cpt -R0/10/0/10 -JX15c -Y26c -Baf -Bx+l"Discrete CPT No Slices Transparent" -P -K > $ps
# 2. Discrete CPT with all transparent colors
Expand Down
10 changes: 5 additions & 5 deletions test/psxy/vector2d_mods.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ gmt begin vector2d_mods
# dx, dy in specified user units with scale
echo 0 5 ${dx} ${dy} | gmt plot -Sv20p+e+z1q -W2p -Gred
echo "-0.1 5.9 Input: ${dx} ${dy} Vector: -Sv20p+e+z1q" | gmt text $textopt
# dx, dy in specified plot units with scale, and color based on magintude
# dx, dy in specified plot units with scale, and color based on magnitude
echo 0 6 ${dx} ${dy} | gmt plot -Sv20p+e+z${scl}q+c -W2p -C --PROJ_LENGTH_UNIT=inch
echo "-0.1 6.9 Input: ${dx} ${dy} Vector: -Sv20p+e+z${scl}q+c --PROJ_LENGTH_UNIT=inch" | gmt text $textopt
# dx, dy in specified data units with scale, and color based on magintude
# dx, dy in specified data units with scale, and color based on magnitude
echo 0 7 ${dx1} ${dy1} | gmt plot -Sv20p+e+z${scl1}q+c -W2p -C --PROJ_LENGTH_UNIT=inch
echo "-0.1 7.9 Input: ${dx1} ${dy1} Vector: -Sv20p+e+z${scl1}q+c --PROJ_LENGTH_UNIT=inch" | gmt text $textopt
# magnitude in specified data units with scale, and color based on magintude
# magnitude in specified data units with scale, and color based on magnitude
echo 0 8 30 25.4 | gmt plot -Sv20p+e+v${scl1}q+c -W2p+c -C --PROJ_LENGTH_UNIT=inch
echo "-0.1 8.9 Input: 30 25.4 Vector: -Sv20p+e+v${scl1}q+c --PROJ_LENGTH_UNIT=inch" | gmt text $textopt
### GEOVECTOR
Expand All @@ -69,10 +69,10 @@ gmt begin vector2d_mods
# dx, dy in specific data units with scale
echo 0 6 ${dx2} ${dy2} | gmt plot -S=20p+e+z10q -W2p -Gred
echo "-0.1 6.9 Input: ${dx2} ${dy2} Vector: -S=20p+e+z10q" | gmt text $textopt
# dx, dy in specific data units with scale, and color based on magintude
# dx, dy in specific data units with scale, and color based on magnitude
echo 0 7 ${dx2} ${dy2} | gmt plot -S=20p+e+z10q+c -W2p -C
echo "-0.1 7.9 Input: ${dx2} ${dy2} Vector: -S=20p+e+z10q+c" | gmt text $textopt
# magnitude in specific data units with scale, and color based on magintude
# magnitude in specific data units with scale, and color based on magnitude
echo 0 8 60 10 | gmt plot -S=20p+e+v10q+c -W2p+c -C
echo "-0.1 8.9 Input: 60 10 Vector: -S=20p+e+v10q+c" | gmt text $textopt
gmt end show
10 changes: 5 additions & 5 deletions test/psxyz/vector3d_mods.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ gmt begin vector3d_mods
# dx, dy in specified user units with scale
echo 0 5 0 ${dx} ${dy} | gmt plot3d -Sv20p+e+z1q -W2p -Gred
echo "-0.1 5.9 Input: ${dx} ${dy} Vector: -Sv20p+e+z1q" | gmt text $textopt
# dx, dy in specified plot units with scale, and color based on magintude
# dx, dy in specified plot units with scale, and color based on magnitude
echo 0 6 0 ${dx} ${dy} | gmt plot3d -Sv20p+e+z${scl}q+c -W2p -C --PROJ_LENGTH_UNIT=inch
echo "-0.1 6.9 Input: ${dx} ${dy} Vector: -Sv20p+e+z${scl}q+c --PROJ_LENGTH_UNIT=inch" | gmt text $textopt
# dx, dy in specified data units with scale, and color based on magintude
# dx, dy in specified data units with scale, and color based on magnitude
echo 0 7 0 ${dx1} ${dy1} | gmt plot3d -Sv20p+e+z${scl1}q+c -W2p -C --PROJ_LENGTH_UNIT=inch
echo "-0.1 7.9 Input: ${dx1} ${dy1} Vector: -Sv20p+e+z${scl1}q+c --PROJ_LENGTH_UNIT=inch" | gmt text $textopt
# magnitude in specified data units with scale, and color based on magintude
# magnitude in specified data units with scale, and color based on magnitude
echo 0 8 0 30 25.4 | gmt plot3d -Sv20p+e+v${scl1}q+c -W2p+c -C --PROJ_LENGTH_UNIT=inch
echo "-0.1 8.9 Input: 30 25.4 Vector: -Sv20p+e+v${scl1}q+c --PROJ_LENGTH_UNIT=inch" | gmt text $textopt
### GEOVECTOR
Expand All @@ -69,10 +69,10 @@ gmt begin vector3d_mods
# dx, dy in specific data units with scale
echo 0 6 0 ${dx2} ${dy2} | gmt plot3d -S=20p+e+z10q -W2p -Gred
echo "-0.1 6.9 Input: ${dx2} ${dy2} Vector: -S=20p+e+z10q" | gmt text $textopt
# dx, dy in specific data units with scale, and color based on magintude
# dx, dy in specific data units with scale, and color based on magnitude
echo 0 7 0 ${dx2} ${dy2} | gmt plot3d -S=20p+e+z10q+c -W2p -C
echo "-0.1 7.9 Input: ${dx2} ${dy2} Vector: -S=20p+e+z10q+c" | gmt text $textopt
# magnitude in specific data units with scale, and color based on magintude
# magnitude in specific data units with scale, and color based on magnitude
echo 0 8 0 60 10 | gmt plot3d -S=20p+e+v10q+c -W2p+c -C
echo "-0.1 8.9 Input: 60 10 Vector: -S=20p+e+v10q+c" | gmt text $textopt
gmt end show
Loading