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

The -i for memory datasets via matrix used the wrong parameter #5289

Merged
merged 4 commits into from
Jun 2, 2021
Merged

The -i for memory datasets via matrix used the wrong parameter #5289

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b760f5
The -i for memory datasets via matrix used the wrong parameter
PaulWessel Jun 1, 2021
9b21c88
Deal with duplicate column choices
PaulWessel Jun 1, 2021
2475afb
Update src/gmt_api.c
PaulWessel Jun 1, 2021
ae4098b
Use correct vector column type function
PaulWessel Jun 2, 2021
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
39 changes: 29 additions & 10 deletions src/gmt_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,7 @@ GMT_LOCAL unsigned int gmtapi_pick_in_col_number (struct GMT_CTRL *GMT, unsigned
/* Return the next column to be selected on input */
unsigned int col_pos;
if (GMT->common.i.select) /* -i has selected some columns */
col_pos = GMT->current.io.col[GMT_IN][col].col; /* Which data column to pick */
col_pos = GMT->current.io.col[GMT_IN][col].order; /* Which data column to pick */
#if 0
else if (GMT->current.setting.io_lonlat_toggle[GMT_IN] && col < GMT_Z) /* Worry about -: for lon,lat */
col_pos = 1 - col; /* Read lat/lon instead of lon/lat */
Expand Down Expand Up @@ -9567,11 +9567,20 @@ struct GMT_RECORD *api_get_record_matrix (struct GMTAPI_CTRL *API, unsigned int
S->status = GMT_IS_USING; /* Mark as being read */
n_use = gmtapi_n_cols_needed_for_gaps (GMT, S->n_columns);
gmtapi_update_prev_rec (GMT, n_use);
for (col = 0; col < API->current_get_n_columns; col++) { /* We know the number of columns from registration */
col_pos = gmtapi_pick_in_col_number (GMT, (unsigned int)col);
ij = API->current_get_M_index (S->rec, col_pos, M->dim);
API->current_get_M_val (&(M->data), ij, &(GMT->current.io.curr_rec[col]));
}

col = 0;
while (col < API->current_get_n_columns) {
col_pos = gmtapi_pick_in_col_number (GMT, (unsigned int)col);
ij = API->current_get_M_index (S->rec, col_pos, M->dim);
API->current_get_M_val (&(M->data), ij, &(GMT->current.io.curr_rec[col]));
col++;
while (GMT->common.i.select && col < GMT->common.i.n_cols && GMT->current.io.col[GMT_IN][col].col == GMT->current.io.col[GMT_IN][col-1].col) {
/* This input column is requested more than once */
col_pos = GMT->current.io.col[GMT_IN][col].order; /* The data column that will receive this value */
API->current_get_M_val (&(M->data), ij, &(GMT->current.io.curr_rec[col]));
maxrjones marked this conversation as resolved.
Show resolved Hide resolved
col++;
}
}
S->rec++;
if ((status = gmtapi_bin_input_memory (GMT, S->n_columns, n_use)) < 0) { /* Process the data record */
if (status == GMTAPI_GOT_SEGGAP) /* Since we inserted a segment header we must revisit this record as first in next segment */
Expand Down Expand Up @@ -9623,10 +9632,20 @@ struct GMT_RECORD *api_get_record_vector (struct GMTAPI_CTRL *API, unsigned int
S->status = GMT_IS_USING; /* Mark as being read */
n_use = gmtapi_n_cols_needed_for_gaps (GMT, S->n_columns);
gmtapi_update_prev_rec (GMT, n_use);
for (col = 0; col < API->current_get_n_columns; col++) { /* We know the number of columns from registration */
col_pos = gmtapi_pick_in_col_number (GMT, (unsigned int)col);
API->current_get_V_val[col] (&(V->data[col_pos]), S->rec, &(GMT->current.io.curr_rec[col]));
}

col = 0;
while (col < API->current_get_n_columns) {
col_pos = gmtapi_pick_in_col_number (GMT, (unsigned int)col);
API->current_get_V_val[col_pos] (&(V->data[col_pos]), S->rec, &(GMT->current.io.curr_rec[col]));
col++;
while (GMT->common.i.select && col < GMT->common.i.n_cols && GMT->current.io.col[GMT_IN][col].col == GMT->current.io.col[GMT_IN][col-1].col) {
/* This input column is requested more than once */
col_pos = GMT->current.io.col[GMT_IN][col].order; /* The data column that will receive this value */
API->current_get_V_val[col_pos] (&(V->data[col_pos]), S->rec, &(GMT->current.io.curr_rec[col]));
col++;
}
}

S->rec++;
if ((status = gmtapi_bin_input_memory (GMT, S->n_columns, n_use)) < 0) { /* Process the data record */
if (status == GMTAPI_GOT_SEGGAP) /* Since we inserted a segment header we must revisit this record as first in next segment */
Expand Down