diff --git a/admin/build-scientific-colors-cpt.sh b/admin/build-scientific-colors-cpt.sh index fed84ddf0ac..f1c5f31b819 100755 --- a/admin/build-scientific-colors-cpt.sh +++ b/admin/build-scientific-colors-cpt.sh @@ -1,18 +1,18 @@ #!/usr/bin/env bash # # This script takes the downloaded zip content from -# Crameri, Fabio. (2023, June 14). Scientific colour maps -# (Version 8.0.0). Zenodo. https://doi.org/10.5281/zenodo.1243862 +# Crameri, Fabio. (2023, Oct 5). Scientific colour maps +# (Version 8.0.1). Zenodo. https://doi.org/10.5281/zenodo.1243862 # and converts the *.cpt files into proper GMT master # CPT files with correct attribution and hinge info # Run from the ScientificColourMapsV directory (V is version) after the # zip has downloaded and been expanded. But first you need to manually -# update the /tmp/cpt.info entries below with one line per CPT subdir in the +# update the $TMP/cpt.info entries below with one line per CPT subdir in the # downloaded directory. It will create a gmt subdirectory with all the CPTs. # You also need to edit gmt_cpt_masters.h after adding the CPTs to share/cpt # -# Last setup and run for ScientificColourMaps8 on June 26, 2023 for GMT 6.5 (master) -# Gave 55 CPTS: The same as release 7 with new entries glasgow, lipari, navia, managua. +# Last setup and run for ScientificColourMaps8 (release 8.0.1) on Jan 2, 2025 for GMT 6.6 (master) +# Gave 56 CPTs: The same as release 8.0.0 from GMT 6.5 with new entry naviaW. # if [ $# -eq 0 ]; then @@ -23,11 +23,11 @@ if [ $# -eq 0 ]; then Give the full path to the expanded zip file top directory, such as ~/Download/ScientificColourMaps8. Before running you must update this script with: - 1. Any new CPT entries since the last release to /tmp/cpt.info + 1. Any new CPT entries since the last release to \$TMP/cpt.info 2. Flag those with a soft hinge as S and a hard hinge as H 3. Manually set the current version number/doi (see the zip PDF docs) Afterwards you must: - 1. Update src/gmt_cpt_masters.h with any new entries (copy lines from /tmp/cpt_strings.txt) + 1. Update src/gmt_cpt_masters.h with any new entries (copy lines from \$DIR/cpt_strings.txt) 2. Adding the CPTs to share/cpt/SCM (overwriting the previous versions) 3. Probably mess with doc/scripts/GMT_App_M*.sh for new layouts EOF @@ -35,8 +35,11 @@ if [ $# -eq 0 ]; then fi DIR=$1 -VERSION=8.0.0 -cat << EOF > /tmp/cpt.info +VERSION=8.0.1 +DOI=10.5281/zenodo.1243862 + +TMP=$(mktemp -d) +cat << EOF > $TMP/cpt.info acton|Perceptually uniform sequential colormap, by Fabio Crameri [C=RGB] actonS|Perceptually uniform sequential categorical colormap, by Fabio Crameri [C=RGB] bam|Perceptually uniform bimodal colormap, light, by Fabio Crameri [C=RGB] @@ -77,6 +80,7 @@ lisbon|Perceptually uniform bimodal colormap, dark, by Fabio Crameri [S,C=RGB] lipari|Perceptually uniform sequential colormap by Fabio Crameri [C=RGB] managua|Perceptually uniform diverging colormap, by Fabio Crameri [S,C=RGB] navia|Perceptually uniform sequential colormap by Fabio Crameri [C=RGB] +naviaW|Perceptually uniform sequential colormap with white ending by Fabio Crameri [C=RGB] nuuk|Perceptually uniform, low-lightness gradient colormap, by Fabio Crameri [C=RGB] nuukS|Perceptually uniform, low-lightness gradient categorical colormap, by Fabio Crameri [C=RGB] oleron|Perceptually uniform topography colormap, by Fabio Crameri [H,C=RGB] @@ -93,17 +97,16 @@ vanimo|Perceptually uniform bimodal colormap, dark, by Fabio Crameri [C=RGB] vik|Perceptually uniform bimodal colormap, light, by Fabio Crameri [S,C=RGB] vikO|Perceptually uniform bimodal cyclic colormap, light, by Fabio Crameri [C=RGB] EOF -here=$(pwd) cd $DIR # Make formatted list of lines suitable for copying into gmt_cpt_masters.h -awk -F'|' '{printf "\"SCM/%-10s : %s\",\n", $1, $2}' /tmp/cpt.info > /tmp/cpt_strings.txt +awk -F'|' '{printf "\"SCM/%-14s : %s\",\n", $1, $2}' $TMP/cpt.info > $TMP/cpt_strings.txt # Make list of CPTs with a hinge of some soft since these need to insert a true z = 0 slice -grep "\[H," /tmp/cpt.info | awk -F'|' '{print $1}' > /tmp/hinge.lis -grep "\[S," /tmp/cpt.info | awk -F'|' '{print $1}' >> /tmp/hinge.lis +grep "\[H," $TMP/cpt.info | awk -F'|' '{print $1}' > $TMP/hinge.lis +grep "\[S," $TMP/cpt.info | awk -F'|' '{print $1}' >> $TMP/hinge.lis rm -rf gmt_cpts mkdir gmt_cpts -cat <<- EOF > /tmp/front +cat <<- EOF > $TMP/front # #---------------------------------------------------------- # COLOR_MODEL = RGB @@ -127,7 +130,7 @@ while read line; do # # License: MIT License # Copyright (c) 2023, Fabio Crameri. - # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 + # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/$DOI # This is Scientific Colour Maps version $VERSION # Note: Original file converted to GMT version >= 5 CPT format. EOF @@ -138,38 +141,39 @@ while read line; do *) hinge="" ;; esac if [ "X${last_char}" = "XS" ]; then - cat /tmp/front >> gmt_cpts/$cpt.cpt + cat $TMP/front >> gmt_cpts/$cpt.cpt echo "#----------------------------------------------------------" >> gmt_cpts/$cpt.cpt - egrep -v '^#|^F|^B|^N' $cptdir/$cpt.cpt | awk '{if (NR == 1) { printf "%d\t%s/%s/%s\n%d\t%s/%s/%s\n", 0, $2, $3, $4, 1, $6, $7, $8} else {printf "%d\t%s/%s/%s\n", NR, $6, $7, $8}}' > /tmp/tmp.cpt + egrep -v '^#|^F|^B|^N' $cptdir/$cpt.cpt | awk '{if (NR == 1) { printf "%d\t%s/%s/%s\n%d\t%s/%s/%s\n", 0, $2, $3, $4, 1, $6, $7, $8} else {printf "%d\t%s/%s/%s\n", NR, $6, $7, $8}}' > $TMP/tmp.cpt elif [ "X$hinge" = "X" ]; then - cat /tmp/front >> gmt_cpts/$cpt.cpt + cat $TMP/front >> gmt_cpts/$cpt.cpt if [ "X${last_char}" = "XO" ]; then echo "# CYCLIC" >> gmt_cpts/$cpt.cpt fi echo "#----------------------------------------------------------" >> gmt_cpts/$cpt.cpt - egrep -v '^#|^F|^B|^N' $cptdir/$cpt.cpt | awk '{printf "%.6f\t%s/%s/%s\t%.6f\t%s/%s/%s\n", $1, $2, $3, $4, $5, $6, $7, $8}' > /tmp/tmp.cpt + egrep -v '^#|^F|^B|^N' $cptdir/$cpt.cpt | awk '{printf "%.6f\t%s/%s/%s\t%.6f\t%s/%s/%s\n", $1, $2, $3, $4, $5, $6, $7, $8}' > $TMP/tmp.cpt else echo "# Note: Range changed from 0-1 to -1/+1 to place hinge at zero." >> gmt_cpts/$cpt.cpt - cat /tmp/front >> gmt_cpts/$cpt.cpt + cat $TMP/front >> gmt_cpts/$cpt.cpt echo "# $hinge" >> gmt_cpts/$cpt.cpt echo "#----------------------------------------------------------" >> gmt_cpts/$cpt.cpt # Convert to -1/1 range - egrep -v '^#|^F|^B|^N' $cptdir/$cpt.cpt | awk '{printf "%.6f\t%s/%s/%s\t%.6f\t%s/%s/%s\n", 2*($1-0.5), $2, $3, $4, 2*($5-0.5), $6, $7, $8}' > /tmp/tmp.cpt + egrep -v '^#|^F|^B|^N' $cptdir/$cpt.cpt | awk '{printf "%.6f\t%s/%s/%s\t%.6f\t%s/%s/%s\n", 2*($1-0.5), $2, $3, $4, 2*($5-0.5), $6, $7, $8}' > $TMP/tmp.cpt fi - cat /tmp/tmp.cpt >> gmt_cpts/$cpt.cpt + cat $TMP/tmp.cpt >> gmt_cpts/$cpt.cpt if [ "X${last_char}" = "XS" ] || [ "X${last_char}" = "XO" ]; then # Categorical or cyclical CPTS have no F or B, only NaN egrep '^N' $cptdir/$cpt.cpt | awk '{printf "%s\t%s/%s/%s\n", $1, $2, $3, $4}' >> gmt_cpts/$cpt.cpt else egrep '^F|^B|^N' $cptdir/$cpt.cpt | awk '{printf "%s\t%s/%s/%s\n", $1, $2, $3, $4}' >> gmt_cpts/$cpt.cpt fi -done < /tmp/cpt.info +done < $TMP/cpt.info # Fix the zero hinges while read cpt; do - grep '^#' gmt_cpts/${cpt}.cpt > /tmp/${cpt}.cpt - egrep -v '^#|B|N|F' gmt_cpts/${cpt}.cpt | awk '{if (NR == 127) {printf "%s\t%s\t0.0\t\t\t%s\n", $1, $2, $4} else if (NR == 129) {printf "0.0\t\t\t%s\t%s\t%s\n", $2, $3, $4} else if (NR != 128) { print $0}}' >> /tmp/${cpt}.cpt - egrep '^B|^N|^F' gmt_cpts/${cpt}.cpt >> /tmp/${cpt}.cpt - mv -f /tmp/${cpt}.cpt gmt_cpts -done < /tmp/hinge.lis -rm -f tmp -cd $here + grep '^#' gmt_cpts/${cpt}.cpt > $TMP/${cpt}.cpt + egrep -v '^#|B|N|F' gmt_cpts/${cpt}.cpt | awk '{if (NR == 127) {printf "%s\t%s\t0.0\t\t\t%s\n", $1, $2, $4} else if (NR == 129) {printf "0.0\t\t\t%s\t%s\t%s\n", $2, $3, $4} else if (NR != 128) { print $0}}' >> $TMP/${cpt}.cpt + egrep '^B|^N|^F' gmt_cpts/${cpt}.cpt >> $TMP/${cpt}.cpt + mv -f $TMP/${cpt}.cpt gmt_cpts +done < $TMP/hinge.lis +mv -f $TMP/cpt_strings.txt . +rm -rf $TMP echo "Folder with new cpts is $DIR/gmt_cpts" +echo "The strings for src/gmt_cpt_masters.h can be found at $DIR/cpt_strings.txt" diff --git a/doc/rst/source/reference/cpts.rst b/doc/rst/source/reference/cpts.rst index 218cacd293c..ee06f7aa235 100644 --- a/doc/rst/source/reference/cpts.rst +++ b/doc/rst/source/reference/cpts.rst @@ -42,7 +42,7 @@ Color maps can be selected in various of the GMT tools using **-C**\ [*section*/ :width: 500 px :align: center - The standard 46 CPTs supported by GMT. + The standard CPTs supported by GMT. .. _CPT_files_b: @@ -50,7 +50,7 @@ Color maps can be selected in various of the GMT tools using **-C**\ [*section*/ :width: 500 px :align: center - The 30 scientific color maps by Fabio Crameri supported by GMT. + The color maps (v8.0.1) by Fabio Crameri supported by GMT. Only the non-cyclic and non-categorical variants are shown here. .. _CPT_files_c: @@ -58,8 +58,8 @@ Color maps can be selected in various of the GMT tools using **-C**\ [*section*/ :width: 500 px :align: center - The 7 cyclic color maps (those ending in "O" are the cyclic - scientific color maps by Fabio Crameri) supported by GMT. + The categorical (top row) and cyclic color maps supported by GMT. Those starting with "SCM" are the cyclic + scientific color maps by Fabio Crameri; those stating with "cmocean" are cyclic color maps by Kristen M. Thyng. **Note**: Any GMT colormap can be made cyclic by running :doc:`/makecpt` with the **-Ww** option (wrapped = cyclic). @@ -69,7 +69,7 @@ Color maps can be selected in various of the GMT tools using **-C**\ [*section*/ :width: 500 px :align: center - The 22 color maps from cmocean by Kristen M. Thyng supported by GMT. + The color maps from cmocean by Kristen M. Thyng supported by GMT. For additional color tables, visit `cpt-city `_ and diff --git a/doc/scripts/GMT_App_M_1a.sh b/doc/scripts/GMT_App_M_1a.sh index 751655c2007..1234f112222 100755 --- a/doc/scripts/GMT_App_M_1a.sh +++ b/doc/scripts/GMT_App_M_1a.sh @@ -5,74 +5,55 @@ # # We have five sets of CPT figures to make: # 1a) Our regular, traditional GMT CPTs [46] -# 1b) The regular Scientific Color Maps* [55] +# 1b) The regular Scientific Color Maps* [56] # 1c) Cyclic CPTs [7] # 1d) Colormaps from cmocean [22] # # *from Fabio [www.fabiocrameri.ch/visualisation] +plot () { + gmt makecpt -H -C$1 -T-1/1 > tt.1.cpt + gmt makecpt -H -C$1 -T-1/1/0.25 > tt.2.cpt + gmt colorbar -Dx${2}i/${y}i+w2.70i/0.125i+h+jTC+e -Ctt.1.cpt -B0 + gmt colorbar -Dx${2}i/${y2}i+w2.70i/0.125i+h+jTC+e -Ctt.2.cpt -Bf0.25 + echo $2 $y $1 | gmt text -D0/0.05i -F+f9p,Helvetica-Bold+jBC + if [ $(grep -c RANGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot default range for left CPT + grep RANGE ${GMT_SHAREDIR}/cpt/$1.cpt | awk '{printf "2.9 %g %s\n", "'$y'", $4}' | gmt text -F+f6p,Helvetica+jRB -D0/0.025i -N + fi + if [ $(grep -c HARD_HINGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot hard hinge symbol for left CPT + echo $2 $y | gmt plot -St0.2c -Gblack -Wfaint -D0/-0.29i + elif [ $(grep -c SOFT_HINGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot soft hinge symbol for left CPT + echo $2 $y | gmt plot -St0.2c -Gwhite -Wfaint -D0/-0.29i + fi +} + GMT_SHAREDIR=$(gmt --show-sharedir) # Here we list all cpt, except cyclic, categorical, cmocean, SCM, srtm -sed -e 's/"//g' "${GMT_SOURCE_DIR}"/src/gmt_cpt_masters.h | egrep -v "cyclic|ategorical|cmocean|SCM|srtm" | awk '{print $1}' | sort -r > tt.lis -cat <<- EOF >> tt.lis -gmt/categorical -gmt/paired -EOF +sed -e 's/"//g' "${GMT_SOURCE_DIR}"/src/gmt_cpt_masters.h | egrep -vi "cyclic|categorical|cmocean|SCM|srtm" | awk '{print $1}' | sort > tt.lis + n=$(cat tt.lis | wc -l) -let n2=n/2 # dy is line spacing and y0 is total box height dy=0.6 -y0=$(gmt math -Q $n2 $dy MUL 0.1 ADD =) +y0=$(gmt math -Q $n $dy MUL 0.5 MUL 0.25 ADD =) gmt begin GMT_App_M_1a gmt set MAP_FRAME_PEN thinner FONT_ANNOT_PRIMARY 8p MAP_TICK_LENGTH_PRIMARY 0.1i MAP_ANNOT_OFFSET_PRIMARY 0.04i gmt basemap -R0/6.1/0/$y0 -Jx1i -B0 -let i=1 +i=1 y=0.375 y2=0.25 while [ $i -le $n ] do - j=$(expr $i + 1) - left=$(sed -n ${j}p tt.lis) - right=$(sed -n ${i}p tt.lis) - echo "Doing ${left} and ${right}" - if [ ${left} = "gmt/paired" ]; then - gmt makecpt -H -C${left} -T1/13/1 > tt.left.cpt - gmt makecpt -H -C${right} -T1/13/1 > tt.right.cpt - gmt colorbar -Dx1.55i/${y}i+w2.70i/0.125i+h+jTC -Ctt.left.cpt -B0 - gmt colorbar -Dx4.50i/${y}i+w2.70i/0.125i+h+jTC -Ctt.right.cpt -B0 + j1=$(expr $n - $i) + j2=$(expr $n - $i + 1) + if [ $i -eq $n ]; then + plot $(sed -n ${j2}p tt.lis) 3.05 else - gmt makecpt -H -C$left -T-1/1 > tt.left.cpt - gmt makecpt -H -C$left -T-1/1/0.25 > tt.left2.cpt - gmt makecpt -H -C$right -T-1/1 > tt.right.cpt - gmt makecpt -H -C$right -T-1/1/0.25 > tt.right2.cpt - gmt colorbar -Dx1.55i/${y}i+w2.70i/0.125i+h+jTC+e -Ctt.left.cpt -B0 - gmt colorbar -Dx4.50i/${y}i+w2.70i/0.125i+h+jTC+e -Ctt.right.cpt -B0 - gmt colorbar -Dx1.55i/${y2}i+w2.70i/0.125i+h+jTC+e -Ctt.left2.cpt -Bf0.25 - gmt colorbar -Dx4.50i/${y2}i+w2.70i/0.125i+h+jTC+e -Ctt.right2.cpt -Bf0.25 - if [ $(grep -c RANGE ${GMT_SHAREDIR}/cpt/${left}.cpt) -eq 1 ]; then # Plot default range for left CPT - grep RANGE ${GMT_SHAREDIR}/cpt/${left}.cpt | awk '{printf "2.9 %g %s\n", "'$y'", $4}' | gmt text -F+f6p,Helvetica+jRB -D0/0.025i -N - fi - if [ $(grep -c HARD_HINGE ${GMT_SHAREDIR}/cpt/${left}.cpt) -eq 1 ]; then # Plot hard hinge symbol for left CPT - echo 1.55 $y | gmt plot -St0.2c -Gblack -Wfaint -D0/-0.29i - elif [ $(grep -c SOFT_HINGE ${GMT_SHAREDIR}/cpt/${left}.cpt) -eq 1 ]; then # Plot soft hinge symbol for left CPT - echo 1.55 $y | gmt plot -St0.2c -Gwhite -Wfaint -D0/-0.29i - fi - if [ $(grep -c RANGE ${GMT_SHAREDIR}/cpt/${right}.cpt) -eq 1 ]; then # Plot default range for left CPT - grep RANGE ${GMT_SHAREDIR}/cpt/${right}.cpt | awk '{printf "5.85 %g %s\n", "'$y'", $4}' | gmt text -F+f6p,Helvetica+jRB -D0/0.025i -N - fi - if [ $(grep -c HARD_HINGE ${GMT_SHAREDIR}/cpt/${right}.cpt) -eq 1 ]; then # Plot hard hinge symbol for right CPT - echo 4.50 $y | gmt plot -St0.2c -Gblack -Wfaint -D0/-0.29i - elif [ $(grep -c SOFT_HINGE ${GMT_SHAREDIR}/cpt/${right}.cpt) -eq 1 ]; then # Plot soft hinge symbol for right CPT - echo 4.50 $y | gmt plot -St0.2c -Gwhite -Wfaint -D0/-0.29i - fi + plot $(sed -n ${j1}p tt.lis) 1.55 + plot $(sed -n ${j2}p tt.lis) 4.50 fi - gmt text -D0/0.05i -F+f9p,Helvetica-Bold+jBC <<- END - 1.55 $y ${left} - 4.50 $y ${right} - END i=$(expr $i + 2) y=$(gmt math -Q $y $dy ADD =) y2=$(gmt math -Q $y2 $dy ADD =) diff --git a/doc/scripts/GMT_App_M_1b.sh b/doc/scripts/GMT_App_M_1b.sh index c002d0caf22..20f2688cb3d 100755 --- a/doc/scripts/GMT_App_M_1b.sh +++ b/doc/scripts/GMT_App_M_1b.sh @@ -5,23 +5,37 @@ # # We have five sets of CPT figures to make: # 1a) Our regular, traditional GMT CPTs [46] -# 1b) The regular Scientific Color Maps* [55] +# 1b) The regular Scientific Color Maps* [56] # 1c) Cyclic CPTs [7] # 1d) Colormaps from cmocean [22] # # *from Fabio [www.fabiocrameri.ch/visualisation] +plot () { + gmt makecpt -H -C$1 -T-1/1 > tt.1.cpt + gmt makecpt -H -C$1 -T-1/1/0.25 > tt.2.cpt + gmt colorbar -Dx${2}i/${y}i+w2.70i/0.125i+h+jTC+e -Ctt.1.cpt -B0 + gmt colorbar -Dx${2}i/${y2}i+w2.70i/0.125i+h+jTC+e -Ctt.2.cpt -Bf0.25 + echo $2 $y $1 | gmt text -D0/0.05i -F+f9p,Helvetica-Bold+jBC + if [ $(grep -c RANGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot default range for left CPT + grep RANGE ${GMT_SHAREDIR}/cpt/$1.cpt | awk '{printf "2.9 %g %s\n", "'$y'", $4}' | gmt text -F+f6p,Helvetica+jRB -D0/0.025i -N + fi + if [ $(grep -c HARD_HINGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot hard hinge symbol for left CPT + echo $2 $y | gmt plot -St0.2c -Gblack -Wfaint -D0/-0.29i + elif [ $(grep -c SOFT_HINGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot soft hinge symbol for left CPT + echo $2 $y | gmt plot -St0.2c -Gwhite -Wfaint -D0/-0.29i + fi +} + GMT_SHAREDIR=$(gmt --show-sharedir) -# Here we list all the non-categorical/cyclic cpts from the SCM: -sed -e 's/"//g' "${GMT_SOURCE_DIR}"/src/gmt_cpt_masters.h | egrep SCM | egrep -v "categorical|cyclic" | awk '{print $1}' | sort -r > tt.lis +# Here we list all the non-categorical/non-cyclic cpts from the SCM: +sed -e 's/"//g' "${GMT_SOURCE_DIR}"/src/gmt_cpt_masters.h | egrep SCM | egrep -v "categorical|cyclic" | awk '{print $1}' | sort > tt.lis n=$(cat tt.lis | wc -l) -let n2=n/2 -let n2=n # dy is line spacing and y0 is total box height dy=0.6 -y0=$(gmt math -Q $n2 $dy MUL 0.5 MUL 0.1 ADD =) +y0=$(gmt math -Q $n $dy MUL 0.5 MUL 0.25 ADD =) gmt begin GMT_App_M_1b gmt set MAP_FRAME_PEN thinner FONT_ANNOT_PRIMARY 8p MAP_TICK_LENGTH_PRIMARY 0.1i MAP_ANNOT_OFFSET_PRIMARY 0.04i @@ -30,33 +44,15 @@ gmt basemap -R0/6.1/0/$y0 -Jx1i -B0 i=1 y=0.375 y2=0.25 -while [ $i -le $n2 ] +while [ $i -le $n ] do - j1=$(expr $n2 - $i) - j2=$(expr $n2 - $i + 1) - left=$(sed -n ${j1}p tt.lis) - right=$(sed -n ${j2}p tt.lis) - gmt makecpt -H -C$left -T-1/1 > tt.left.cpt - gmt makecpt -H -C$left -T-1/1/0.25 > tt.left2.cpt - gmt makecpt -H -C$right -T-1/1 > tt.right.cpt - gmt makecpt -H -C$right -T-1/1/0.25 > tt.right2.cpt - gmt colorbar -Dx1.55i/${y}i+w2.70i/0.125i+h+jTC+e -Ctt.left.cpt -B0 - gmt colorbar -Dx4.50i/${y}i+w2.70i/0.125i+h+jTC+e -Ctt.right.cpt -B0 - gmt colorbar -Dx1.55i/${y2}i+w2.70i/0.125i+h+jTC+e -Ctt.left2.cpt -Bf0.25 - gmt colorbar -Dx4.50i/${y2}i+w2.70i/0.125i+h+jTC+e -Ctt.right2.cpt -Bf0.25 - gmt text -D0/0.05i -F+f9p,Helvetica-Bold+jBC <<- END - 1.55 $y ${left} - 4.50 $y ${right} - END - if [ $(grep -c HARD_HINGE ${GMT_SHAREDIR}/cpt/${left}.cpt) -eq 1 ]; then # Plot hard hinge symbol for left CPT - echo 1.55 $y | gmt plot -St0.2c -Gblack -Wfaint -D0/-0.29i - elif [ $(grep -c SOFT_HINGE ${GMT_SHAREDIR}/cpt/${left}.cpt) -eq 1 ]; then # Plot soft hinge symbol for left CPT - echo 1.55 $y | gmt plot -St0.2c -Gwhite -Wfaint -D0/-0.29i - fi - if [ $(grep -c HARD_HINGE ${GMT_SHAREDIR}/cpt/${right}.cpt) -eq 1 ]; then # Plot hard hinge symbol for right CPT - echo 4.50 $y | gmt plot -St0.2c -Gblack -Wfaint -D0/-0.29i - elif [ $(grep -c SOFT_HINGE ${GMT_SHAREDIR}/cpt/${right}.cpt) -eq 1 ]; then # Plot soft hinge symbol for right CPT - echo 4.50 $y | gmt plot -St0.2c -Gwhite -Wfaint -D0/-0.29i + j1=$(expr $n - $i) + j2=$(expr $n - $i + 1) + if [ $i -eq $n ]; then + plot $(sed -n ${j2}p tt.lis) 3.05 + else + plot $(sed -n ${j1}p tt.lis) 1.55 + plot $(sed -n ${j2}p tt.lis) 4.50 fi i=$(expr $i + 2) y=$(gmt math -Q $y $dy ADD =) diff --git a/doc/scripts/GMT_App_M_1c.sh b/doc/scripts/GMT_App_M_1c.sh index 6e331813e2b..cb3b2cd92ea 100755 --- a/doc/scripts/GMT_App_M_1c.sh +++ b/doc/scripts/GMT_App_M_1c.sh @@ -5,23 +5,37 @@ # # We have five sets of CPT figures to make: # 1a) Our regular, traditional GMT CPTs [46] -# 1b) The regular Scientific Color Maps* [55] +# 1b) The regular Scientific Color Maps* [56] # 1c) Cyclic CPTs [7] # 1d) Colormaps from cmocean [22] # # *from Fabio [www.fabiocrameri.ch/visualisation] +plot () { + gmt makecpt -H -C$1 -T-1/1 > tt.1.cpt + gmt makecpt -H -C$1 -T-1/1/0.25 > tt.2.cpt + gmt colorbar -Dx${2}i/${y}i+w2.70i/0.125i+h+jTC -Ctt.1.cpt -B0 + gmt colorbar -Dx${2}i/${y2}i+w2.70i/0.125i+h+jTC -Ctt.2.cpt -Bf0.25 + echo $2 $y $1 | gmt text -D0/0.05i -F+f9p,Helvetica-Bold+jBC + if [ $(grep -c RANGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot default range for left CPT + grep RANGE ${GMT_SHAREDIR}/cpt/$1.cpt | awk '{printf "2.9 %g %s\n", "'$y'", $4}' | gmt text -F+f6p,Helvetica+jRB -D0/0.025i -N + fi + if [ $(grep -c HARD_HINGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot hard hinge symbol for left CPT + echo $2 $y | gmt plot -St0.2c -Gblack -Wfaint -D0/-0.29i + elif [ $(grep -c SOFT_HINGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot soft hinge symbol for left CPT + echo $2 $y | gmt plot -St0.2c -Gwhite -Wfaint -D0/-0.29i + fi +} + GMT_SHAREDIR=$(gmt --show-sharedir) # Here we list all the cyclic cpts: -sed -e 's/"//g' "${GMT_SOURCE_DIR}"/src/gmt_cpt_masters.h | egrep cyclic | awk '{print $1}' | sort -r > tt.lis +sed -e 's/"//g' "${GMT_SOURCE_DIR}"/src/gmt_cpt_masters.h | egrep cyclic | awk '{print $1}' | sort > tt.lis n=$(cat tt.lis | wc -l) -let n2=n/2 -let n2=n # dy is line spacing and y0 is total box height dy=0.6 -y0=$(gmt math -Q $n2 $dy MUL 0.5 MUL 0.25 ADD =) +y0=$(gmt math -Q $n 2 ADD $dy MUL 0.5 MUL 0.25 ADD =) gmt begin GMT_App_M_1c gmt set MAP_FRAME_PEN thinner FONT_ANNOT_PRIMARY 8p MAP_TICK_LENGTH_PRIMARY 0.1i MAP_ANNOT_OFFSET_PRIMARY 0.04i @@ -30,30 +44,29 @@ gmt basemap -R0/6.1/0/$y0 -Jx1i -B0 i=1 y=0.375 y2=0.25 -while [ $i -le $n2 ] +while [ $i -le $n ] do - j2=$(expr $n2 + 1 - $i) - right=$(sed -n ${j2}p tt.lis) - if [[ ${i} < ${n2} ]]; then - j1=$(expr $n2 - $i) - left=$(sed -n ${j1}p tt.lis) - gmt makecpt -H -C$left -T-1/1 > tt.left.cpt - gmt makecpt -H -C$left -T-1/1/0.25 > tt.left2.cpt - gmt colorbar -Dx1.55i/${y}i+w2.70i/0.125i+h+jTC -Ctt.left.cpt -B0 - gmt colorbar -Dx1.55i/${y2}i+w2.70i/0.125i+h+jTC -Ctt.left2.cpt -Bf0.25 - echo 1.55 $y ${left} | gmt text -D0/0.05i -F+f9p,Helvetica-Bold+jBC - x=4.50 + j1=$(expr $n - $i) + j2=$(expr $n - $i + 1) + if [ $i -eq $n ]; then + plot $(sed -n ${j2}p tt.lis) 3.05 else - x=3.05 + plot $(sed -n ${j1}p tt.lis) 1.55 + plot $(sed -n ${j2}p tt.lis) 4.50 fi - gmt makecpt -H -C$right -T-1/1 > tt.right.cpt - gmt makecpt -H -C$right -T-1/1/0.25 > tt.right2.cpt - gmt colorbar -Dx${x}i/${y}i+w2.70i/0.125i+h+jTC -Ctt.right.cpt -B0 - gmt colorbar -Dx${x}i/${y2}i+w2.70i/0.125i+h+jTC -Ctt.right2.cpt -Bf0.25 - echo ${x} $y ${right} | gmt text -D0/0.05i -F+f9p,Helvetica-Bold+jBC i=$(expr $i + 2) y=$(gmt math -Q $y $dy ADD =) y2=$(gmt math -Q $y2 $dy ADD =) done + +gmt makecpt -H -Cgmt/categorical -T1/13/1 > tt.1.cpt +gmt makecpt -H -Cgmt/paired -T1/13/1 > tt.2.cpt +gmt colorbar -Dx1.55i/${y}i+w2.70i/0.125i+h+jTC -Ctt.1.cpt -B0 +gmt colorbar -Dx4.50i/${y}i+w2.70i/0.125i+h+jTC -Ctt.2.cpt -B0 +gmt text -D0/0.05i -F+f9p,Helvetica-Bold+jBC <<-END +1.55 $y gmt/categorical +4.50 $y gmt/paired +END + rm -f tt.* gmt end show diff --git a/doc/scripts/GMT_App_M_1d.sh b/doc/scripts/GMT_App_M_1d.sh index 05db15f1dde..09835e3c6dc 100755 --- a/doc/scripts/GMT_App_M_1d.sh +++ b/doc/scripts/GMT_App_M_1d.sh @@ -11,56 +11,48 @@ # # *from Fabio [www.fabiocrameri.ch/visualisation] +plot () { + gmt makecpt -H -C$1 -T-1/1 > tt.1.cpt + gmt makecpt -H -C$1 -T-1/1/0.25 > tt.2.cpt + gmt colorbar -Dx${2}i/${y}i+w2.70i/0.125i+h+jTC+e -Ctt.1.cpt -B0 + gmt colorbar -Dx${2}i/${y2}i+w2.70i/0.125i+h+jTC+e -Ctt.2.cpt -Bf0.25 + echo $2 $y $1 | gmt text -D0/0.05i -F+f9p,Helvetica-Bold+jBC + if [ $(grep -c RANGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot default range for left CPT + grep RANGE ${GMT_SHAREDIR}/cpt/$1.cpt | awk '{printf "2.9 %g %s\n", "'$y'", $4}' | gmt text -F+f6p,Helvetica+jRB -D0/0.025i -N + fi + if [ $(grep -c HARD_HINGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot hard hinge symbol for left CPT + echo $2 $y | gmt plot -St0.2c -Gblack -Wfaint -D0/-0.29i + elif [ $(grep -c SOFT_HINGE ${GMT_SHAREDIR}/cpt/$1.cpt) -eq 1 ]; then # Plot soft hinge symbol for left CPT + echo $2 $y | gmt plot -St0.2c -Gwhite -Wfaint -D0/-0.29i + fi +} + GMT_SHAREDIR=$(gmt --show-sharedir) # Here we list all the cmocean cpts: -sed -e 's/"//g' "${GMT_SOURCE_DIR}"/src/gmt_cpt_masters.h | egrep cmocean | awk '{print $1}' | sort -r > tt.lis +sed -e 's/"//g' "${GMT_SOURCE_DIR}"/src/gmt_cpt_masters.h | egrep cmocean | awk '{print $1}' | sort > tt.lis n=$(cat tt.lis | wc -l) -let n2=n/2 # dy is line spacing and y0 is total box height dy=0.6 -y0=$(gmt math -Q $n2 $dy MUL 0.1 ADD =) +y0=$(gmt math -Q $n $dy MUL 0.5 MUL 0.25 ADD =) gmt begin GMT_App_M_1d gmt set MAP_FRAME_PEN thinner FONT_ANNOT_PRIMARY 8p MAP_TICK_LENGTH_PRIMARY 0.1i MAP_ANNOT_OFFSET_PRIMARY 0.04i gmt basemap -R0/6.1/0/$y0 -Jx1i -B0 -let i=1 +i=1 y=0.375 y2=0.25 while [ $i -le $n ] do - j=$(expr $i + 1) - left=$(sed -n ${j}p tt.lis) - right=$(sed -n ${i}p tt.lis) - gmt makecpt -H -C$left -T-1/1 > tt.left.cpt - gmt makecpt -H -C$left -T-1/1/0.25 > tt.left2.cpt - gmt makecpt -H -C$right -T-1/1 > tt.right.cpt - gmt makecpt -H -C$right -T-1/1/0.25 > tt.right2.cpt - gmt colorbar -Dx1.55i/${y}i+w2.70i/0.125i+h+jTC+e -Ctt.left.cpt -B0 - gmt colorbar -Dx4.50i/${y}i+w2.70i/0.125i+h+jTC+e -Ctt.right.cpt -B0 - gmt colorbar -Dx1.55i/${y2}i+w2.70i/0.125i+h+jTC+e -Ctt.left2.cpt -Bf0.25 - gmt colorbar -Dx4.50i/${y2}i+w2.70i/0.125i+h+jTC+e -Ctt.right2.cpt -Bf0.25 - gmt text -D0/0.05i -F+f9p,Helvetica-Bold+jBC <<- END - 1.55 $y ${left} - 4.50 $y ${right} - END - if [ $(grep -c RANGE ${GMT_SHAREDIR}/cpt/${left}.cpt) -eq 1 ]; then # Plot default range for left CPT - grep RANGE ${GMT_SHAREDIR}/cpt/${left}.cpt | awk '{printf "2.9 %g %s\n", "'$y'", $4}' | gmt text -F+f6p,Helvetica+jRB -D0/0.025i -N - fi - if [ $(grep -c HARD_HINGE ${GMT_SHAREDIR}/cpt/${left}.cpt) -eq 1 ]; then # Plot hard hinge symbol for left CPT - echo 1.55 $y | gmt plot -St0.2c -Gblack -Wfaint -D0/-0.29i - elif [ $(grep -c SOFT_HINGE ${GMT_SHAREDIR}/cpt/${left}.cpt) -eq 1 ]; then # Plot soft hinge symbol for left CPT - echo 1.55 $y | gmt plot -St0.2c -Gwhite -Wfaint -D0/-0.29i - fi - if [ $(grep -c RANGE ${GMT_SHAREDIR}/cpt/${right}.cpt) -eq 1 ]; then # Plot default range for left CPT - grep RANGE ${GMT_SHAREDIR}/cpt/${right}.cpt | awk '{printf "5.85 %g %s\n", "'$y'", $4}' | gmt text -F+f6p,Helvetica+jRB -D0/0.025i -N - fi - if [ $(grep -c HARD_HINGE ${GMT_SHAREDIR}/cpt/${right}.cpt) -eq 1 ]; then # Plot hard hinge symbol for right CPT - echo 4.50 $y | gmt plot -St0.2c -Gblack -Wfaint -D0/-0.29i - elif [ $(grep -c SOFT_HINGE ${GMT_SHAREDIR}/cpt/${right}.cpt) -eq 1 ]; then # Plot soft hinge symbol for right CPT - echo 4.50 $y | gmt plot -St0.2c -Gwhite -Wfaint -D0/-0.29i + j1=$(expr $n - $i) + j2=$(expr $n - $i + 1) + if [ $i -eq $n ]; then + plot $(sed -n ${j2}p tt.lis) 3.05 + else + plot $(sed -n ${j1}p tt.lis) 1.55 + plot $(sed -n ${j2}p tt.lis) 4.50 fi i=$(expr $i + 2) y=$(gmt math -Q $y $dy ADD =) diff --git a/doc/scripts/images/GMT_App_M_1a.ps.dvc b/doc/scripts/images/GMT_App_M_1a.ps.dvc index c75faa7bfd2..144e4943746 100644 --- a/doc/scripts/images/GMT_App_M_1a.ps.dvc +++ b/doc/scripts/images/GMT_App_M_1a.ps.dvc @@ -1,5 +1,5 @@ outs: -- md5: af4effd6ebc25325dd51dd1dd2f5d25d - size: 235183 +- md5: c85fbf33fb39d773ad10be6141a30279 + size: 243497 hash: md5 path: GMT_App_M_1a.ps diff --git a/doc/scripts/images/GMT_App_M_1b.ps.dvc b/doc/scripts/images/GMT_App_M_1b.ps.dvc index 8bbcb666abc..98f92419d0f 100644 --- a/doc/scripts/images/GMT_App_M_1b.ps.dvc +++ b/doc/scripts/images/GMT_App_M_1b.ps.dvc @@ -1,5 +1,5 @@ outs: -- md5: e36acccc4c540fd24226ca8c50e4322e - size: 167658 +- md5: 02cfc62bfaeb8bab32be8ec3b58634ea + size: 180661 hash: md5 path: GMT_App_M_1b.ps diff --git a/doc/scripts/images/GMT_App_M_1c.ps.dvc b/doc/scripts/images/GMT_App_M_1c.ps.dvc index aa4e73f735a..1e038730904 100644 --- a/doc/scripts/images/GMT_App_M_1c.ps.dvc +++ b/doc/scripts/images/GMT_App_M_1c.ps.dvc @@ -1,5 +1,5 @@ outs: -- md5: 7d715a4ecc774633cc6c106cb1dfce7c - size: 74033 +- md5: 514f5462f6c22d244998d0ded923465d + size: 76863 hash: md5 path: GMT_App_M_1c.ps diff --git a/doc/scripts/images/GMT_App_M_1d.ps.dvc b/doc/scripts/images/GMT_App_M_1d.ps.dvc index 154e486db51..7b6d828201d 100644 --- a/doc/scripts/images/GMT_App_M_1d.ps.dvc +++ b/doc/scripts/images/GMT_App_M_1d.ps.dvc @@ -1,5 +1,5 @@ outs: -- md5: 2194b187b45eaaa03815b584441a0423 - size: 529404 +- md5: cf82c160d18628d3835d2b2f0288a9cf + size: 534936 hash: md5 path: GMT_App_M_1d.ps diff --git a/share/cpt/SCM/acton.cpt b/share/cpt/SCM/acton.cpt index 63a27dbff64..6b149ec18d8 100644 --- a/share/cpt/SCM/acton.cpt +++ b/share/cpt/SCM/acton.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/actonS.cpt b/share/cpt/SCM/actonS.cpt index 4b6488e7069..704702acb90 100644 --- a/share/cpt/SCM/actonS.cpt +++ b/share/cpt/SCM/actonS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/bam.cpt b/share/cpt/SCM/bam.cpt index 6816ee1ffa8..f45b028143b 100644 --- a/share/cpt/SCM/bam.cpt +++ b/share/cpt/SCM/bam.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/bamO.cpt b/share/cpt/SCM/bamO.cpt index 22d657a9344..f7ec5404a04 100644 --- a/share/cpt/SCM/bamO.cpt +++ b/share/cpt/SCM/bamO.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/bamako.cpt b/share/cpt/SCM/bamako.cpt index 9cbba315952..3ea863d1a14 100644 --- a/share/cpt/SCM/bamako.cpt +++ b/share/cpt/SCM/bamako.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/bamakoS.cpt b/share/cpt/SCM/bamakoS.cpt index 7fb5c2207b0..556229cf27b 100644 --- a/share/cpt/SCM/bamakoS.cpt +++ b/share/cpt/SCM/bamakoS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/batlow.cpt b/share/cpt/SCM/batlow.cpt index e319e42dce0..001ceaa4969 100644 --- a/share/cpt/SCM/batlow.cpt +++ b/share/cpt/SCM/batlow.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/batlowK.cpt b/share/cpt/SCM/batlowK.cpt index dbd9adba51f..62eba9e9659 100644 --- a/share/cpt/SCM/batlowK.cpt +++ b/share/cpt/SCM/batlowK.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/batlowS.cpt b/share/cpt/SCM/batlowS.cpt index 9ada3767cfe..66a1f911741 100644 --- a/share/cpt/SCM/batlowS.cpt +++ b/share/cpt/SCM/batlowS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/batlowW.cpt b/share/cpt/SCM/batlowW.cpt index bc69cacdd12..92e5485a384 100644 --- a/share/cpt/SCM/batlowW.cpt +++ b/share/cpt/SCM/batlowW.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/berlin.cpt b/share/cpt/SCM/berlin.cpt index 9242d7d10c3..7e5d1f945a6 100644 --- a/share/cpt/SCM/berlin.cpt +++ b/share/cpt/SCM/berlin.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/bilbao.cpt b/share/cpt/SCM/bilbao.cpt index c6cbdb34f80..6df463432ef 100644 --- a/share/cpt/SCM/bilbao.cpt +++ b/share/cpt/SCM/bilbao.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/bilbaoS.cpt b/share/cpt/SCM/bilbaoS.cpt index e3dea98c309..ef9a9fc79b5 100644 --- a/share/cpt/SCM/bilbaoS.cpt +++ b/share/cpt/SCM/bilbaoS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/broc.cpt b/share/cpt/SCM/broc.cpt index 47bc921aba0..3d8b2618cc1 100644 --- a/share/cpt/SCM/broc.cpt +++ b/share/cpt/SCM/broc.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/brocO.cpt b/share/cpt/SCM/brocO.cpt index 761bbf8c9be..4d741899ffa 100644 --- a/share/cpt/SCM/brocO.cpt +++ b/share/cpt/SCM/brocO.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/buda.cpt b/share/cpt/SCM/buda.cpt index 5eef183b041..348c03e23ee 100644 --- a/share/cpt/SCM/buda.cpt +++ b/share/cpt/SCM/buda.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/budaS.cpt b/share/cpt/SCM/budaS.cpt index a84418b5d0d..aaa1f885947 100644 --- a/share/cpt/SCM/budaS.cpt +++ b/share/cpt/SCM/budaS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/bukavu.cpt b/share/cpt/SCM/bukavu.cpt index fe2951cab3a..393d0d8587a 100644 --- a/share/cpt/SCM/bukavu.cpt +++ b/share/cpt/SCM/bukavu.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/cork.cpt b/share/cpt/SCM/cork.cpt index ad786879147..3d23782f89e 100644 --- a/share/cpt/SCM/cork.cpt +++ b/share/cpt/SCM/cork.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/corkO.cpt b/share/cpt/SCM/corkO.cpt index e662623526e..dee29474ad7 100644 --- a/share/cpt/SCM/corkO.cpt +++ b/share/cpt/SCM/corkO.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/davos.cpt b/share/cpt/SCM/davos.cpt index 207d274c2bc..9c67287d1c4 100644 --- a/share/cpt/SCM/davos.cpt +++ b/share/cpt/SCM/davos.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/davosS.cpt b/share/cpt/SCM/davosS.cpt index f3abc1d478c..d471a4f7ed8 100644 --- a/share/cpt/SCM/davosS.cpt +++ b/share/cpt/SCM/davosS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/devon.cpt b/share/cpt/SCM/devon.cpt index bc9a475489c..72788442f6b 100644 --- a/share/cpt/SCM/devon.cpt +++ b/share/cpt/SCM/devon.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/devonS.cpt b/share/cpt/SCM/devonS.cpt index d43d3d77ca8..65fcff3964f 100644 --- a/share/cpt/SCM/devonS.cpt +++ b/share/cpt/SCM/devonS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/fes.cpt b/share/cpt/SCM/fes.cpt index 3c24d741bbf..41a815a1288 100644 --- a/share/cpt/SCM/fes.cpt +++ b/share/cpt/SCM/fes.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/glasgow.cpt b/share/cpt/SCM/glasgow.cpt index 07037240320..a3916f2c7e5 100644 --- a/share/cpt/SCM/glasgow.cpt +++ b/share/cpt/SCM/glasgow.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/grayC.cpt b/share/cpt/SCM/grayC.cpt index b30819c5d6f..d781a578603 100644 --- a/share/cpt/SCM/grayC.cpt +++ b/share/cpt/SCM/grayC.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/grayCS.cpt b/share/cpt/SCM/grayCS.cpt index 0deb76776ec..c5ce47294a1 100644 --- a/share/cpt/SCM/grayCS.cpt +++ b/share/cpt/SCM/grayCS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/hawaii.cpt b/share/cpt/SCM/hawaii.cpt index 2739320cc2b..37a6debd409 100644 --- a/share/cpt/SCM/hawaii.cpt +++ b/share/cpt/SCM/hawaii.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/hawaiiS.cpt b/share/cpt/SCM/hawaiiS.cpt index 3e9f9397e1d..9d1926dacef 100644 --- a/share/cpt/SCM/hawaiiS.cpt +++ b/share/cpt/SCM/hawaiiS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/imola.cpt b/share/cpt/SCM/imola.cpt index 292f0bd9a1b..c305ff7e7f9 100644 --- a/share/cpt/SCM/imola.cpt +++ b/share/cpt/SCM/imola.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/imolaS.cpt b/share/cpt/SCM/imolaS.cpt index dd1ae8f4f1f..003bc61d8f1 100644 --- a/share/cpt/SCM/imolaS.cpt +++ b/share/cpt/SCM/imolaS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/lajolla.cpt b/share/cpt/SCM/lajolla.cpt index c481364e35c..28b16fcf4ad 100644 --- a/share/cpt/SCM/lajolla.cpt +++ b/share/cpt/SCM/lajolla.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/lajollaS.cpt b/share/cpt/SCM/lajollaS.cpt index 1cb99fabaac..67ff6130d05 100644 --- a/share/cpt/SCM/lajollaS.cpt +++ b/share/cpt/SCM/lajollaS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/lapaz.cpt b/share/cpt/SCM/lapaz.cpt index bab2072df13..8518728b504 100644 --- a/share/cpt/SCM/lapaz.cpt +++ b/share/cpt/SCM/lapaz.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/lapazS.cpt b/share/cpt/SCM/lapazS.cpt index d3ec520b59a..eaedce04018 100644 --- a/share/cpt/SCM/lapazS.cpt +++ b/share/cpt/SCM/lapazS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/lipari.cpt b/share/cpt/SCM/lipari.cpt index a1124db6749..816e3694aa6 100644 --- a/share/cpt/SCM/lipari.cpt +++ b/share/cpt/SCM/lipari.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/lisbon.cpt b/share/cpt/SCM/lisbon.cpt index 93376595534..870cc6b0ab4 100644 --- a/share/cpt/SCM/lisbon.cpt +++ b/share/cpt/SCM/lisbon.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/managua.cpt b/share/cpt/SCM/managua.cpt index 92da83b8558..2a855a9e48f 100644 --- a/share/cpt/SCM/managua.cpt +++ b/share/cpt/SCM/managua.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/navia.cpt b/share/cpt/SCM/navia.cpt index 4c34c7a4f0e..af2a0d4650b 100644 --- a/share/cpt/SCM/navia.cpt +++ b/share/cpt/SCM/navia.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/naviaW.cpt b/share/cpt/SCM/naviaW.cpt new file mode 100644 index 00000000000..348fd299b80 --- /dev/null +++ b/share/cpt/SCM/naviaW.cpt @@ -0,0 +1,272 @@ +# +# SCM/naviaW : Perceptually uniform sequential colormap with white ending by Fabio Crameri [C=RGB] +# +# www.fabiocrameri.ch/visualisation +# +# License: MIT License +# Copyright (c) 2023, Fabio Crameri. +# Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 +# This is Scientific Colour Maps version 8.0.1 +# Note: Original file converted to GMT version >= 5 CPT format. +# +#---------------------------------------------------------- +# COLOR_MODEL = RGB +#---------------------------------------------------------- +0.000000 4/20/39 0.003922 4/21/41 +0.003922 4/21/41 0.007843 4/22/43 +0.007843 4/22/43 0.011765 4/23/45 +0.011765 4/23/45 0.015686 5/25/47 +0.015686 5/25/47 0.019608 5/26/49 +0.019608 5/26/49 0.023529 5/27/51 +0.023529 5/27/51 0.027451 5/28/53 +0.027451 5/28/53 0.031373 5/29/55 +0.031373 5/29/55 0.035294 5/30/57 +0.035294 5/30/57 0.039216 5/32/59 +0.039216 5/32/59 0.043137 5/33/61 +0.043137 5/33/61 0.047059 6/34/63 +0.047059 6/34/63 0.050980 6/35/65 +0.050980 6/35/65 0.054902 6/36/67 +0.054902 6/36/67 0.058824 6/38/69 +0.058824 6/38/69 0.062745 6/39/71 +0.062745 6/39/71 0.066667 6/40/74 +0.066667 6/40/74 0.070588 6/41/76 +0.070588 6/41/76 0.074510 7/43/78 +0.074510 7/43/78 0.078431 7/44/80 +0.078431 7/44/80 0.082353 7/45/82 +0.082353 7/45/82 0.086275 7/47/84 +0.086275 7/47/84 0.090196 7/48/86 +0.090196 7/48/86 0.094118 8/49/88 +0.094118 8/49/88 0.098039 8/50/90 +0.098039 8/50/90 0.101961 8/52/92 +0.101961 8/52/92 0.105882 8/53/94 +0.105882 8/53/94 0.109804 9/54/96 +0.109804 9/54/96 0.113725 9/56/98 +0.113725 9/56/98 0.117647 9/57/100 +0.117647 9/57/100 0.121569 10/58/102 +0.121569 10/58/102 0.125490 10/60/104 +0.125490 10/60/104 0.129412 10/61/106 +0.129412 10/61/106 0.133333 11/62/107 +0.133333 11/62/107 0.137255 11/64/109 +0.137255 11/64/109 0.141176 12/65/111 +0.141176 12/65/111 0.145098 12/66/113 +0.145098 12/66/113 0.149020 13/68/114 +0.149020 13/68/114 0.152941 14/69/116 +0.152941 14/69/116 0.156863 14/70/118 +0.156863 14/70/118 0.160784 15/72/119 +0.160784 15/72/119 0.164706 15/73/121 +0.164706 15/73/121 0.168627 16/74/122 +0.168627 16/74/122 0.172549 17/76/124 +0.172549 17/76/124 0.176471 17/77/125 +0.176471 17/77/125 0.180392 18/78/127 +0.180392 18/78/127 0.184314 19/80/128 +0.184314 19/80/128 0.188235 20/81/129 +0.188235 20/81/129 0.192157 20/82/130 +0.192157 20/82/130 0.196078 21/84/131 +0.196078 21/84/131 0.200000 22/85/132 +0.200000 22/85/132 0.203922 23/86/134 +0.203922 23/86/134 0.207843 24/88/134 +0.207843 24/88/134 0.211765 24/89/135 +0.211765 24/89/135 0.215686 25/90/136 +0.215686 25/90/136 0.219608 26/91/137 +0.219608 26/91/137 0.223529 27/93/138 +0.223529 27/93/138 0.227451 28/94/139 +0.227451 28/94/139 0.231373 28/95/139 +0.231373 28/95/139 0.235294 29/96/140 +0.235294 29/96/140 0.239216 30/97/140 +0.239216 30/97/140 0.243137 31/98/141 +0.243137 31/98/141 0.247059 32/100/141 +0.247059 32/100/141 0.250980 32/101/142 +0.250980 32/101/142 0.254902 33/102/142 +0.254902 33/102/142 0.258824 34/103/142 +0.258824 34/103/142 0.262745 35/104/142 +0.262745 35/104/142 0.266667 35/105/143 +0.266667 35/105/143 0.270588 36/106/143 +0.270588 36/106/143 0.274510 37/107/143 +0.274510 37/107/143 0.278431 38/108/143 +0.278431 38/108/143 0.282353 38/109/143 +0.282353 38/109/143 0.286275 39/109/143 +0.286275 39/109/143 0.290196 40/110/143 +0.290196 40/110/143 0.294118 40/111/143 +0.294118 40/111/143 0.298039 41/112/143 +0.298039 41/112/143 0.301961 42/113/143 +0.301961 42/113/143 0.305882 42/114/143 +0.305882 42/114/143 0.309804 43/114/143 +0.309804 43/114/143 0.313725 43/115/142 +0.313725 43/115/142 0.317647 44/116/142 +0.317647 44/116/142 0.321569 45/117/142 +0.321569 45/117/142 0.325490 45/117/142 +0.325490 45/117/142 0.329412 46/118/142 +0.329412 46/118/142 0.333333 46/119/141 +0.333333 46/119/141 0.337255 47/119/141 +0.337255 47/119/141 0.341176 48/120/141 +0.341176 48/120/141 0.345098 48/121/141 +0.345098 48/121/141 0.349020 49/121/140 +0.349020 49/121/140 0.352941 49/122/140 +0.352941 49/122/140 0.356863 50/123/140 +0.356863 50/123/140 0.360784 51/123/140 +0.360784 51/123/140 0.364706 51/124/139 +0.364706 51/124/139 0.368627 52/125/139 +0.368627 52/125/139 0.372549 52/125/139 +0.372549 52/125/139 0.376471 53/126/138 +0.376471 53/126/138 0.380392 54/126/138 +0.380392 54/126/138 0.384314 54/127/138 +0.384314 54/127/138 0.388235 55/128/137 +0.388235 55/128/137 0.392157 55/128/137 +0.392157 55/128/137 0.396078 56/129/137 +0.396078 56/129/137 0.400000 56/129/136 +0.400000 56/129/136 0.403922 57/130/136 +0.403922 57/130/136 0.407843 58/131/136 +0.407843 58/131/136 0.411765 58/131/135 +0.411765 58/131/135 0.415686 59/132/135 +0.415686 59/132/135 0.419608 60/132/135 +0.419608 60/132/135 0.423529 60/133/134 +0.423529 60/133/134 0.427451 61/134/134 +0.427451 61/134/134 0.431373 61/134/134 +0.431373 61/134/134 0.435294 62/135/133 +0.435294 62/135/133 0.439216 63/135/133 +0.439216 63/135/133 0.443137 63/136/133 +0.443137 63/136/133 0.447059 64/137/132 +0.447059 64/137/132 0.450980 65/137/132 +0.450980 65/137/132 0.454902 65/138/131 +0.454902 65/138/131 0.458824 66/138/131 +0.458824 66/138/131 0.462745 67/139/131 +0.462745 67/139/131 0.466667 67/140/130 +0.466667 67/140/130 0.470588 68/140/130 +0.470588 68/140/130 0.474510 69/141/130 +0.474510 69/141/130 0.478431 69/142/129 +0.478431 69/142/129 0.482353 70/142/129 +0.482353 70/142/129 0.486275 71/143/128 +0.486275 71/143/128 0.490196 72/144/128 +0.490196 72/144/128 0.494118 72/144/128 +0.494118 72/144/128 0.498039 73/145/127 +0.498039 73/145/127 0.501961 74/146/127 +0.501961 74/146/127 0.505882 75/146/126 +0.505882 75/146/126 0.509804 75/147/126 +0.509804 75/147/126 0.513725 76/148/126 +0.513725 76/148/126 0.517647 77/149/125 +0.517647 77/149/125 0.521569 78/149/125 +0.521569 78/149/125 0.525490 79/150/124 +0.525490 79/150/124 0.529412 80/151/124 +0.529412 80/151/124 0.533333 80/152/124 +0.533333 80/152/124 0.537255 81/153/123 +0.537255 81/153/123 0.541176 82/153/123 +0.541176 82/153/123 0.545098 83/154/122 +0.545098 83/154/122 0.549020 84/155/122 +0.549020 84/155/122 0.552941 85/156/121 +0.552941 85/156/121 0.556863 86/157/121 +0.556863 86/157/121 0.560784 87/157/120 +0.560784 87/157/120 0.564706 88/158/120 +0.564706 88/158/120 0.568627 89/159/120 +0.568627 89/159/120 0.572549 90/160/119 +0.572549 90/160/119 0.576471 91/161/119 +0.576471 91/161/119 0.580392 92/162/118 +0.580392 92/162/118 0.584314 93/163/118 +0.584314 93/163/118 0.588235 94/164/117 +0.588235 94/164/117 0.592157 95/165/117 +0.592157 95/165/117 0.596078 96/166/117 +0.596078 96/166/117 0.600000 98/167/116 +0.600000 98/167/116 0.603922 99/168/116 +0.603922 99/168/116 0.607843 100/169/115 +0.607843 100/169/115 0.611765 101/170/115 +0.611765 101/170/115 0.615686 103/171/115 +0.615686 103/171/115 0.619608 104/172/114 +0.619608 104/172/114 0.623529 105/173/114 +0.623529 105/173/114 0.627451 107/174/114 +0.627451 107/174/114 0.631373 108/175/113 +0.631373 108/175/113 0.635294 110/176/113 +0.635294 110/176/113 0.639216 111/178/113 +0.639216 111/178/113 0.643137 113/179/113 +0.643137 113/179/113 0.647059 114/180/113 +0.647059 114/180/113 0.650980 116/181/113 +0.650980 116/181/113 0.654902 118/182/113 +0.654902 118/182/113 0.658824 119/184/113 +0.658824 119/184/113 0.662745 121/185/113 +0.662745 121/185/113 0.666667 123/186/113 +0.666667 123/186/113 0.670588 125/188/113 +0.670588 125/188/113 0.674510 127/189/113 +0.674510 127/189/113 0.678431 129/190/114 +0.678431 129/190/114 0.682353 131/192/114 +0.682353 131/192/114 0.686275 133/193/114 +0.686275 133/193/114 0.690196 135/194/115 +0.690196 135/194/115 0.694118 137/196/116 +0.694118 137/196/116 0.698039 140/197/116 +0.698039 140/197/116 0.701961 142/198/117 +0.701961 142/198/117 0.705882 144/200/118 +0.705882 144/200/118 0.709804 147/201/119 +0.709804 147/201/119 0.713725 149/203/120 +0.713725 149/203/120 0.717647 152/204/121 +0.717647 152/204/121 0.721569 154/205/123 +0.721569 154/205/123 0.725490 157/207/124 +0.725490 157/207/124 0.729412 159/208/125 +0.729412 159/208/125 0.733333 162/210/127 +0.733333 162/210/127 0.737255 164/211/129 +0.737255 164/211/129 0.741176 167/212/130 +0.741176 167/212/130 0.745098 169/214/132 +0.745098 169/214/132 0.749020 172/215/134 +0.749020 172/215/134 0.752941 175/216/136 +0.752941 175/216/136 0.756863 177/217/138 +0.756863 177/217/138 0.760784 180/219/140 +0.760784 180/219/140 0.764706 182/220/142 +0.764706 182/220/142 0.768627 185/221/144 +0.768627 185/221/144 0.772549 187/222/147 +0.772549 187/222/147 0.776471 190/223/149 +0.776471 190/223/149 0.780392 192/225/151 +0.780392 192/225/151 0.784314 194/226/154 +0.784314 194/226/154 0.788235 197/227/156 +0.788235 197/227/156 0.792157 199/228/158 +0.792157 199/228/158 0.796078 201/229/161 +0.796078 201/229/161 0.800000 203/230/163 +0.800000 203/230/163 0.803922 205/231/166 +0.803922 205/231/166 0.807843 207/232/168 +0.807843 207/232/168 0.811765 209/232/171 +0.811765 209/232/171 0.815686 211/233/173 +0.815686 211/233/173 0.819608 213/234/175 +0.819608 213/234/175 0.823529 215/235/178 +0.823529 215/235/178 0.827451 216/236/180 +0.827451 216/236/180 0.831373 218/236/182 +0.831373 218/236/182 0.835294 219/237/185 +0.835294 219/237/185 0.839216 221/238/187 +0.839216 221/238/187 0.843137 222/238/189 +0.843137 222/238/189 0.847059 224/239/191 +0.847059 224/239/191 0.850980 225/240/194 +0.850980 225/240/194 0.854902 227/240/196 +0.854902 227/240/196 0.858824 228/241/198 +0.858824 228/241/198 0.862745 229/241/200 +0.862745 229/241/200 0.866667 230/242/202 +0.866667 230/242/202 0.870588 231/243/204 +0.870588 231/243/204 0.874510 232/243/206 +0.874510 232/243/206 0.878431 233/244/208 +0.878431 233/244/208 0.882353 234/244/210 +0.882353 234/244/210 0.886275 235/245/212 +0.886275 235/245/212 0.890196 236/245/213 +0.890196 236/245/213 0.894118 237/245/215 +0.894118 237/245/215 0.898039 238/246/217 +0.898039 238/246/217 0.901961 239/246/219 +0.901961 239/246/219 0.905882 240/247/220 +0.905882 240/247/220 0.909804 241/247/222 +0.909804 241/247/222 0.913725 241/248/224 +0.913725 241/248/224 0.917647 242/248/225 +0.917647 242/248/225 0.921569 243/248/227 +0.921569 243/248/227 0.925490 243/249/228 +0.925490 243/249/228 0.929412 244/249/230 +0.929412 244/249/230 0.933333 245/249/231 +0.933333 245/249/231 0.937255 246/250/233 +0.937255 246/250/233 0.941176 246/250/234 +0.941176 246/250/234 0.945098 247/250/236 +0.945098 247/250/236 0.949020 247/251/237 +0.949020 247/251/237 0.952941 248/251/238 +0.952941 248/251/238 0.956863 249/251/240 +0.956863 249/251/240 0.960784 249/252/241 +0.960784 249/252/241 0.964706 250/252/242 +0.964706 250/252/242 0.968627 250/252/243 +0.968627 250/252/243 0.972549 251/253/245 +0.972549 251/253/245 0.976471 251/253/246 +0.976471 251/253/246 0.980392 252/253/247 +0.980392 252/253/247 0.984314 252/253/248 +0.984314 252/253/248 0.988235 253/254/249 +0.988235 253/254/249 0.992157 253/254/251 +0.992157 253/254/251 0.996078 254/254/252 +0.996078 254/254/252 1.000000 254/254/253 +N 255/255/255 +B 4/20/39 +F 254/254/253 diff --git a/share/cpt/SCM/nuuk.cpt b/share/cpt/SCM/nuuk.cpt index 56df6c52ef6..b98c0d56aba 100644 --- a/share/cpt/SCM/nuuk.cpt +++ b/share/cpt/SCM/nuuk.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/nuukS.cpt b/share/cpt/SCM/nuukS.cpt index 8b616cdf15b..88ba88e8f1d 100644 --- a/share/cpt/SCM/nuukS.cpt +++ b/share/cpt/SCM/nuukS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/oleron.cpt b/share/cpt/SCM/oleron.cpt index 27b4f015480..12af0661466 100644 --- a/share/cpt/SCM/oleron.cpt +++ b/share/cpt/SCM/oleron.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/oslo.cpt b/share/cpt/SCM/oslo.cpt index b62cd5acc27..a9c08af0291 100644 --- a/share/cpt/SCM/oslo.cpt +++ b/share/cpt/SCM/oslo.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/osloS.cpt b/share/cpt/SCM/osloS.cpt index 8d663435756..1bab072c0ac 100644 --- a/share/cpt/SCM/osloS.cpt +++ b/share/cpt/SCM/osloS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/roma.cpt b/share/cpt/SCM/roma.cpt index ac7af991904..de3aff2f5d9 100644 --- a/share/cpt/SCM/roma.cpt +++ b/share/cpt/SCM/roma.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/romaO.cpt b/share/cpt/SCM/romaO.cpt index 17ce09370ee..6b49b0a8f2b 100644 --- a/share/cpt/SCM/romaO.cpt +++ b/share/cpt/SCM/romaO.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/tofino.cpt b/share/cpt/SCM/tofino.cpt index ebd8041d661..4a5fee458f5 100644 --- a/share/cpt/SCM/tofino.cpt +++ b/share/cpt/SCM/tofino.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/tokyo.cpt b/share/cpt/SCM/tokyo.cpt index b3982018feb..3c3d5410866 100644 --- a/share/cpt/SCM/tokyo.cpt +++ b/share/cpt/SCM/tokyo.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/tokyoS.cpt b/share/cpt/SCM/tokyoS.cpt index a76c7eb9918..0886496c92c 100644 --- a/share/cpt/SCM/tokyoS.cpt +++ b/share/cpt/SCM/tokyoS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/turku.cpt b/share/cpt/SCM/turku.cpt index 1034e174be2..1f933d91a34 100644 --- a/share/cpt/SCM/turku.cpt +++ b/share/cpt/SCM/turku.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/turkuS.cpt b/share/cpt/SCM/turkuS.cpt index be8e86730ac..76c7f1fd1d1 100644 --- a/share/cpt/SCM/turkuS.cpt +++ b/share/cpt/SCM/turkuS.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/vanimo.cpt b/share/cpt/SCM/vanimo.cpt index 2a41b9abe87..4d18e888313 100644 --- a/share/cpt/SCM/vanimo.cpt +++ b/share/cpt/SCM/vanimo.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/share/cpt/SCM/vik.cpt b/share/cpt/SCM/vik.cpt index b1943b48a34..e6010e3832e 100644 --- a/share/cpt/SCM/vik.cpt +++ b/share/cpt/SCM/vik.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # Note: Range changed from 0-1 to -1/+1 to place hinge at zero. # diff --git a/share/cpt/SCM/vikO.cpt b/share/cpt/SCM/vikO.cpt index ff08194b291..340d492b3b8 100644 --- a/share/cpt/SCM/vikO.cpt +++ b/share/cpt/SCM/vikO.cpt @@ -6,7 +6,7 @@ # License: MIT License # Copyright (c) 2023, Fabio Crameri. # Crameri, F., (2023). Scientific colour maps. Zenodo. https://doi.org/10.5281/zenodo.1243862 -# This is Scientific Colour Maps version 8.0.0 +# This is Scientific Colour Maps version 8.0.1 # Note: Original file converted to GMT version >= 5 CPT format. # #---------------------------------------------------------- diff --git a/src/gmt_cpt_masters.h b/src/gmt_cpt_masters.h index 51a7f1d2d24..8dcc9d632a5 100644 --- a/src/gmt_cpt_masters.h +++ b/src/gmt_cpt_masters.h @@ -71,6 +71,7 @@ "SCM/lisbon : Perceptually uniform bimodal colormap, dark, by Fabio Crameri [S, C=RGB]", "SCM/managua : Perceptually uniform diverging colormap, by Fabio Crameri [S,C=RGB]", "SCM/navia : Perceptually uniform sequential colormap by Fabio Crameri [C=RGB]", +"SCM/naviaW : Perceptually uniform sequential colormap with white ending by Fabio Crameri [C=RGB]", "SCM/nuuk : Perceptually uniform, low-lightness gradient colormap, by Fabio Crameri [C=RGB]", "SCM/nuukS : Perceptually uniform, low-lightness gradient categorical colormap, by Fabio Crameri [C=RGB]", "SCM/oleron : Perceptually uniform topography colormap, by Fabio Crameri [H, C=RGB]",