Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
51c865b4
Commit
51c865b4
authored
Dec 07, 2015
by
Thomas Jahns
🤸
Browse files
Virtualize grid hasArea query.
parent
abbdb96e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/grid.c
View file @
51c865b4
...
...
@@ -3023,14 +3023,16 @@ void gridInqArea(int gridID, double *area)
gridptr
->
vtable
->
inqArea
(
gridptr
,
area
);
}
static
int
gridHasAreaBase
(
grid_t
*
gridptr
)
{
return
gridptr
->
area
!=
NULL
;
}
int
gridHasArea
(
int
gridID
)
{
grid_t
*
gridptr
=
gridID2Ptr
(
gridID
);
int
hasArea
=
(
gridptr
->
vtable
->
inqAreaPtr
(
gridptr
)
!=
NULL
);
return
(
hasArea
);
return
gridptr
->
vtable
->
hasArea
(
gridptr
);
}
...
...
@@ -4800,6 +4802,7 @@ const struct gridVirtTable cdiGridVtable
.
inqYValsPtr
=
gridInqYValsPtrSerial
,
.
inqArea
=
gridInqAreaSerial
,
.
inqAreaPtr
=
gridInqAreaPtrBase
,
.
hasArea
=
gridHasAreaBase
,
.
inqMask
=
gridInqMaskSerial
,
.
inqMaskGME
=
gridInqMaskGMESerial
,
.
inqXBounds
=
gridInqXBoundsSerial
,
...
...
src/grid.h
View file @
51c865b4
...
...
@@ -26,6 +26,7 @@ struct gridVirtTable
const
double
*
(
*
inqYValsPtr
)(
grid_t
*
gridptr
);
void
(
*
inqArea
)(
grid_t
*
gridptr
,
double
*
area
);
const
double
*
(
*
inqAreaPtr
)(
grid_t
*
gridptr
);
int
(
*
hasArea
)(
grid_t
*
gridptr
);
int
(
*
inqMask
)(
grid_t
*
gridptr
,
int
*
mask
);
int
(
*
inqMaskGME
)(
grid_t
*
gridptr
,
int
*
mask_gme
);
int
(
*
inqXBounds
)(
grid_t
*
gridptr
,
double
*
xbounds
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment