From 135230fc2dcfb69e467fada131549210b994edfb Mon Sep 17 00:00:00 2001 From: anbj <29237824+anbj@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:51:09 +0100 Subject: [PATCH 1/4] fzblender.rst and gmtswitch: fix minor typos (#8636) --- doc/rst/source/supplements/gsfml/fzblender.rst | 2 +- src/gmtswitch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/rst/source/supplements/gsfml/fzblender.rst b/doc/rst/source/supplements/gsfml/fzblender.rst index b3c6d3e4371..b8841c330a3 100644 --- a/doc/rst/source/supplements/gsfml/fzblender.rst +++ b/doc/rst/source/supplements/gsfml/fzblender.rst @@ -177,7 +177,7 @@ coordinates for the left/right bounds along the FZ. Filtering --------- -Filtering always runs of of data near the FZ end points. We utilize :doc:`filter1d ` with its +Filtering always runs of data near the FZ end points. We utilize :doc:`filter1d ` with its **-E** option to extend the result to the end. Because we are filtering data columns that may contain a strong trend (e.g., longitude versus along-track distance) we first remove such linear trends before filtering, then restore the trends before blending. However, you should diff --git a/src/gmtswitch b/src/gmtswitch index 48619cb5d75..5862e8f139a 100755 --- a/src/gmtswitch +++ b/src/gmtswitch @@ -113,13 +113,13 @@ Before we can allow for switching you must prepare your environment. In your .cshrc or .tcshrc file: Change your path statement. Make sure it includes $home/this_gmt/bin -If $home contains spaces places the the above within double quotes. +If $home contains spaces places the above within double quotes. 2. BASH USERS (re)Place these lines in your .profile file: Change your PATH statement. Make sure it includes $home/this_gmt/bin -If $home contains spaces places the the above within double quotes. +If $home contains spaces places the above within double quotes. 3. GitHub USERS: You will have to manually add the path to the GMT directory since From b91455680d7e49c427a937d43ebb13fdaecdaa1b Mon Sep 17 00:00:00 2001 From: Federico Esteban Date: Wed, 27 Nov 2024 19:04:25 -0300 Subject: [PATCH 2/4] install.rst Remove references to win32 Update install.rst --- doc/rst/source/install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/rst/source/install.rst b/doc/rst/source/install.rst index 269add4f514..7322a2e43a4 100644 --- a/doc/rst/source/install.rst +++ b/doc/rst/source/install.rst @@ -22,7 +22,7 @@ for compiling GMT source package (either stable release or development version). Windows ------- -We provide 32 and 64 bit standalone installers (e.g., +We provide 64 bit standalone installer (e.g., gmt-6.x.x-win64.exe) in the `GitHub repository `__. The installers come with GDAL, FFmpeg, and Ghostscript pre-installed. From ee61c0e4d3149de9b89ff8ce5ae43fb1adca0f27 Mon Sep 17 00:00:00 2001 From: Federico Esteban Date: Wed, 27 Nov 2024 19:05:18 -0300 Subject: [PATCH 3/4] Update install.rst Remove s from previous commit. --- doc/rst/source/install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/rst/source/install.rst b/doc/rst/source/install.rst index 7322a2e43a4..5587853dad0 100644 --- a/doc/rst/source/install.rst +++ b/doc/rst/source/install.rst @@ -25,7 +25,7 @@ Windows We provide 64 bit standalone installer (e.g., gmt-6.x.x-win64.exe) in the `GitHub repository `__. The -installers come with GDAL, FFmpeg, and Ghostscript pre-installed. +installer come with GDAL, FFmpeg, and Ghostscript pre-installed. In addition to the GMT installer, you also need to download and install `GraphicsMagick `__ if you want to From 39cff6e579e7e5e1b17692122ce15e98e6da109b Mon Sep 17 00:00:00 2001 From: Joaquim Date: Thu, 28 Nov 2024 00:42:35 +0000 Subject: [PATCH 4/4] Apply fix from Marcelo Banik in #8637 (#8638) Fixes #8637 --- src/mgd77/mgd77.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mgd77/mgd77.c b/src/mgd77/mgd77.c index 1235d42db5b..97fed6cc2bd 100644 --- a/src/mgd77/mgd77.c +++ b/src/mgd77/mgd77.c @@ -5574,7 +5574,7 @@ int MGD77_igrf10syn (struct GMT_CTRL *GMT, int isv, double date, int itype, doub t = 1.; tc = 0.; } - ll = 3255; /* nth position corresponding to first coeff of 2020 (must always point to pen-ultimate set) */ + ll = 3450; /* nth position corresponding to first coeff of 2025 (must always point to pen-ultimate set) */ nmx = 13; nc = nmx * (nmx + 2); kmx = (nmx + 1) * (nmx + 2) / 2;