Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP : First attempt to fix #7255. Result looks reasonable but it's not correct #7348

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP : First attempt to fix #7255. Result looks reasonable but it's not correct #7348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/gmt_fft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,7 +1659,7 @@ int GMT_FFT_2D (void *V_API, gmt_grdfloat *data, unsigned int n_columns, unsigne
int status, use;
struct GMTAPI_CTRL *API = gmtfft_get_api_ptr (V_API);
struct GMT_CTRL *GMT = API->GMT;
assert (mode & GMT_FFT_COMPLEX); /* GMT_FFT_REAL not implemented yet */
assert ((mode & GMT_FFT_COMPLEX) || (mode & GMT_FFT_NO_DEMUX)); /* GMT_FFT_REAL not implemented yet */
use = gmtfft_2d_selection (GMT, n_columns, n_rows);

GMT_Report (GMT->parent, GMT_MSG_INFORMATION, "2-D FFT using %s\n", GMT_fft_algo[use]);
Expand Down
3 changes: 2 additions & 1 deletion src/potential/gravfft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,8 @@ EXTERN_MSC int GMT_gravfft (void *V_API, int mode, void *args) {
gravfft_do_isostasy (GMT, Grid[0], Ctrl, K);

GMT_Report (API, GMT_MSG_INFORMATION, "Inverse FFT...\n");
if (GMT_FFT (API, Grid[0], GMT_FFT_INV, GMT_FFT_COMPLEX, K))
//if (GMT_FFT (API, Grid[0], GMT_FFT_INV, GMT_FFT_COMPLEX, K))
if (GMT_FFT (API, Grid[0], GMT_FFT_INV, Ctrl->T.moho ? GMT_FFT_NO_DEMUX : GMT_FFT_COMPLEX, K))
Return (GMT_RUNTIME_ERROR);

if (!doubleAlmostEqual (scale_out, 1.0))
Expand Down