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

Reduce lack of -x to just an information messag #8319

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Reduce lack of -x to just an information messag #8319

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c663b7
Reduce lack of -x to just an information messag
PaulWessel Jan 20, 2024
2f9467c
Update src/gmt_init.c
PaulWessel Jan 20, 2024
06b7dc9
Update src/gmt_init.c
seisman Jan 26, 2024
9c83ec6
Merge branch 'master' into relax-x-check
seisman Jan 26, 2024
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
10 changes: 7 additions & 3 deletions src/gmt_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9164,9 +9164,12 @@ int gmt_default_error (struct GMT_CTRL *GMT, char option) {
case 's': error += GMT->common.s.active == false; break;
case 't': error += GMT->common.t.active == false; break;
case 'w': error += GMT->common.w.active == false; break;
#ifdef GMT_MP_ENABLED
case 'x': error += GMT->common.x.active == false; break;
case 'x': error += GMT->common.x.active == false;
error--;
#if !defined(GMT_MP_ENABLED)
GMT_Report (GMT->parent, GMT_MSG_INFORMATION, "Option -x: GMT is not compiled with parallel support. Only one core is used\n");
#endif
break;
case ':': error += GMT->common.colon.active == false; break;

default:
Expand Down Expand Up @@ -18770,10 +18773,11 @@ int gmt_parse_common_options (struct GMT_CTRL *GMT, char *list, char option, cha
error += gmt_M_more_than_once (GMT, GMT->common.w.active) || gmtinit_parse_w_option (GMT, item);
break;

#ifdef GMT_MP_ENABLED
case 'x':
error += (gmt_M_more_than_once (GMT, GMT->common.x.active) || gmtinit_parse_x_option (GMT, item));
GMT->common.x.active = true;
#if !define(GMT_MP_ENABLED)
seisman marked this conversation as resolved.
Show resolved Hide resolved
GMT_Report (GMT->parent, GMT_MSG_WARNING, "Option -x: GMT is not compiled with parallel support. Only one core is used\n");
break;
#endif

Expand Down
Loading