Skip to content

Commit

Permalink
Merge branch 'master' into meca-T-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulWessel authored Nov 22, 2023
2 parents 22af44b + 0e1efcf commit c9e368a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
5 changes: 3 additions & 2 deletions doc/examples/anim09/anim09.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ cat << 'EOF' > pre.sh
#!/usr/bin/env bash
# Pre-script: Runs once to produce files needed for all frames
gmt begin
gmt grdgradient @earth_relief_30s -A90 -Nt2.5 -Gearth_relief_30s+2.5_int.nc
gmt grdcut -Rd @earth_relief_30s -Gearth_relief_30s.nc
gmt grdgradient earth_relief_30s.nc -A90 -Nt2.5 -Gearth_relief_30s+2.5_int.nc
gmt makecpt -Cgeo -H > MOR_topo.cpt
gmt end
EOF
Expand All @@ -39,7 +40,7 @@ cat << 'EOF' > main.sh
# and the other view parameters from the include file.
gmt begin
gmt grdimage -Rg -JG${MOVIE_COL0}/${MOVIE_COL1}/${MOVIE_WIDTH}+z${ALTITUDE}+a${MOVIE_COL2}+t${TILT}+w${MOVIE_COL3}+v${WIDTH}/${HEIGHT} \
-Y0 -X0 @earth_relief_30s -Iearth_relief_30s+2.5_int.nc -CMOR_topo.cpt
-Y0 -X0 earth_relief_30s.nc -Iearth_relief_30s+2.5_int.nc -CMOR_topo.cpt
gmt events MOR_names.txt -L100 -Et+r6+f6 -T${MOVIE_FRAME} -F+f12p,Helvetica-Bold,yellow
gmt end
EOF
Expand Down
2 changes: 1 addition & 1 deletion doc/rst/source/animations/anim09.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ grid and overlay a few labels for named features.
- Path: MOR_PAC_twist_path.txt
- Labels: MOR_names.txt

We create a global intensity grid using shading from East and a CPT file; these are
We create a global intensity grid using shading from East, a global relief grid and a CPT file; these are
created by the preflight script.
We add a 1 second fade in and a 1 second fade out for the animation
The resulting movie was presented at the Fall 2019 AGU meeting in an eLighting talk:
Expand Down
4 changes: 2 additions & 2 deletions doc/rst/source/grdfft.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Optional Arguments
to multiplying by :math:`k_r` in the frequency domain (:math:`k_r` is radial wave
number). Append a scale to multiply by :math:`k_r \cdot`\ *scale*) instead.
Alternatively, append **g** to indicate that your data are geoid
heights in meters and output should be gravity anomalies in mGal.
heights in meters and output should be gravity anomalies in mGal. Repeatable.
[Default is no scale].

.. _-E:
Expand Down Expand Up @@ -155,7 +155,7 @@ Optional Arguments
radial wave number). Append a scale to divide by :math:`k_r \cdot`\ *scale*
instead. Alternatively, append **g** to indicate that your data set
is gravity anomalies in mGal and output should be geoid heights in
meters. [Default is no scale].
meters. Repeatable. [Default is no scale].

.. _-N:

Expand Down
12 changes: 6 additions & 6 deletions src/grdfft.c
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
GMT_Usage (API, 1, "\n-C<zlevel>");
GMT_Usage (API, -2, "Continue field upward (+) or downward (-) to <zlevel> (meters). ");
GMT_Usage (API, 1, "\n-D[<scale>|g]");
GMT_Usage (API, -2, "Differentiate, i.e., multiply by kr [ and optionally by <scale>]. Use -Dg to get mGal from m].");
GMT_Usage (API, -2, "Differentiate, i.e., multiply by kr [ and optionally by <scale>]. Use -Dg to get mGal from m] (repeatable).");
GMT_Usage (API, 1, "\n-E[r|x|y][+w[k]][+n]");
GMT_Usage (API, -2, "Estimate spEctrum in the radial r [Default], x, or y-direction. "
"Given one grid X, write f, Xpower[f] to output file (see -G) or standard output. "
Expand All @@ -608,7 +608,7 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
GMT_Usage (API, -2, "Filename for output grid file OR 1-D data table (see -E). "
"Note: Optional for -E (spectrum written to standard output); required otherwise.");
GMT_Usage (API, 1, "\n-I[<scale>|g]");
GMT_Usage (API, -2, "Integrate, i.e., divide by kr [ and optionally by scale]. Use -Ig to get m from mGal].");
GMT_Usage (API, -2, "Integrate, i.e., divide by kr [ and optionally by scale]. Use -Ig to get m from mGal] (repeatable).");
GMT_FFT_Option (API, 'N', GMT_FFT_DIM, "Choose or inquire about suitable grid dimensions for FFT, and set modifiers.");
GMT_Usage (API, 1, "\n-Q Perform no operations, just do forward FFF and write output if selected in -N.");
GMT_Usage (API, 1, "\n-S<scale>|d");
Expand Down Expand Up @@ -695,8 +695,8 @@ static int parse (struct GMT_CTRL *GMT, struct GRDFFT_CTRL *Ctrl, struct F_INFO
"Option -C: Cannot read zlevel\n");
grdfft_add_operation (GMT, Ctrl, GRDFFT_UP_DOWN_CONTINUE, 1, par);
break;
case 'D': /* d/dz */
n_errors += gmt_M_repeated_module_option (API, Ctrl->D.active);
case 'D': /* d/dz [repeatable] */
Ctrl->D.active = true;
par[0] = (opt->arg[0]) ? ((opt->arg[0] == 'g' || opt->arg[0] == 'G') ? MGAL_AT_45 : atof (opt->arg)) : 1.0;
n_errors += gmt_M_check_condition (GMT, par[0] == 0.0, "Option -D: scale must be nonzero\n");
grdfft_add_operation (GMT, Ctrl, GRDFFT_DIFFERENTIATE, 1, par);
Expand Down Expand Up @@ -748,8 +748,8 @@ static int parse (struct GMT_CTRL *GMT, struct GRDFFT_CTRL *Ctrl, struct F_INFO
n_errors += gmt_M_repeated_module_option (API, Ctrl->G.active);
n_errors += gmt_get_required_file (GMT, opt->arg, opt->option, 0, GMT_IS_GRID, GMT_OUT, GMT_FILE_LOCAL, &(Ctrl->G.file));
break;
case 'I': /* Integrate */
n_errors += gmt_M_repeated_module_option (API, Ctrl->I.active);
case 'I': /* Integrate [repeatable]*/
Ctrl->I.active = true;
par[0] = (opt->arg[0] == 'g' || opt->arg[0] == 'G') ? MGAL_AT_45 : atof (opt->arg);
n_errors += gmt_M_check_condition (GMT, par[0] == 0.0, "Option -I: scale must be nonzero\n");
grdfft_add_operation (GMT, Ctrl, GRDFFT_INTEGRATE, 1, par);
Expand Down

0 comments on commit c9e368a

Please sign in to comment.