Skip to content
GitLab
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
b4abb379
Commit
b4abb379
authored
Jun 15, 2015
by
Uwe Schulzweida
Browse files
vlistPrintKernel: print nsubtypes and subtypeID
parent
b090b297
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/cdi.h
View file @
b4abb379
...
...
@@ -178,7 +178,7 @@ enum {
#define MAX_KV_PAIRS_MATCH 10
/* Data structure defining a key-value search, possibly with multiple
key-value pairs in combination.
key-value pairs in combination.
Currently, only multiple pairs combined by AND are supported.
*/
...
...
src/varscan.c
View file @
b4abb379
...
...
@@ -84,7 +84,7 @@ typedef struct
int
productDefinitionTemplate
;
/* meta-data for specification of tiles (currently only GRIB-API: */
subtype_t
*
tiles
;
subtype_t
*
tiles
;
int
opt_grib_nentries
;
/* current no. key-value pairs */
int
opt_grib_kvpair_size
;
/* current allocated size */
...
...
@@ -235,7 +235,7 @@ static int tileNewEntry(int varID)
if
(
vartable
[
varID
].
nsubtypes_alloc
==
0
)
{
/* create table for the first time. */
vartable
[
varID
].
nsubtypes_alloc
=
2
;
vartable
[
varID
].
nsubtypes_alloc
=
2
;
vartable
[
varID
].
nsubtypes
=
0
;
vartable
[
varID
].
recordTable
=
(
subtypetable_t
*
)
xmalloc
((
size_t
)
vartable
[
varID
].
nsubtypes_alloc
*
sizeof
(
subtypetable_t
));
...
...
@@ -608,7 +608,7 @@ int cmpparam(const void* s1, const void* s2)
void
cdi_generate_vars
(
stream_t
*
streamptr
)
{
int
gridID
,
zaxisID
,
tilesetID
;
int
gridID
,
zaxisID
;
int
instID
,
modelID
,
tableID
;
int
param
,
zaxistype
,
ltype1
,
ltype2
;
...
...
@@ -792,7 +792,7 @@ void cdi_generate_vars(stream_t *streamptr)
free
(
dlevels
);
/* define new subtype for tile set */
tilesetID
=
vlistDefTileSubtype
(
vlistID
,
vartable
[
varid
].
tiles
);
int
tilesetID
=
vlistDefTileSubtype
(
vlistID
,
vartable
[
varid
].
tiles
);
/* generate new variable */
int
varID
=
stream_new_var
(
streamptr
,
gridID
,
zaxisID
,
tilesetID
);
...
...
src/vlist.c
View file @
b4abb379
...
...
@@ -966,6 +966,14 @@ int vlistNzaxis(int vlistID)
}
int
vlistNsubtypes
(
int
vlistID
)
{
vlist_t
*
vlistptr
=
vlist_to_pointer
(
vlistID
);
return
(
vlistptr
->
nsubtypes
);
}
void
vlistDefNtsteps
(
int
vlistID
,
int
nts
)
{
vlist_t
*
vlistptr
=
vlist_to_pointer
(
vlistID
);
...
...
@@ -994,25 +1002,27 @@ void vlistPrintKernel(vlist_t *vlistptr, FILE *fp)
int
nvars
=
vlistptr
->
nvars
;
fprintf
(
fp
,
"nvars %d
\n
"
"ngrids %d
\n
"
"nzaxis %d
\n
"
"taxisID %d
\n
"
"instID %d
\n
"
"modelID %d
\n
"
"tableID %d
\n
"
,
nvars
,
vlistptr
->
ngrids
,
vlistptr
->
nzaxis
,
vlistptr
->
taxisID
,
fprintf
(
fp
,
"nvars : %d
\n
"
"ngrids : %d
\n
"
"nzaxis : %d
\n
"
"nsubtypes: %d
\n
"
"taxisID : %d
\n
"
"instID : %d
\n
"
"modelID : %d
\n
"
"tableID : %d
\n
"
,
nvars
,
vlistptr
->
ngrids
,
vlistptr
->
nzaxis
,
vlistptr
->
nsubtypes
,
vlistptr
->
taxisID
,
vlistptr
->
instID
,
vlistptr
->
modelID
,
vlistptr
->
tableID
);
if
(
nvars
>
0
)
{
fprintf
(
fp
,
" varID param gridID zaxisID tsteptype flag iorank"
fprintf
(
fp
,
" varID param gridID zaxisID
stypeID
tsteptype flag iorank"
" name longname units
\n
"
);
for
(
int
varID
=
0
;
varID
<
nvars
;
varID
++
)
{
int
param
=
vlistptr
->
vars
[
varID
].
param
;
int
gridID
=
vlistptr
->
vars
[
varID
].
gridID
;
int
zaxisID
=
vlistptr
->
vars
[
varID
].
zaxisID
;
int
subtypeID
=
vlistptr
->
vars
[
varID
].
subtypeID
;
int
tsteptype
=
vlistptr
->
vars
[
varID
].
tsteptype
;
const
char
*
name
=
vlistptr
->
vars
[
varID
].
name
;
const
char
*
longname
=
vlistptr
->
vars
[
varID
].
longname
;
...
...
@@ -1021,8 +1031,8 @@ void vlistPrintKernel(vlist_t *vlistptr, FILE *fp)
int
iorank
=
vlistptr
->
vars
[
varID
].
iorank
;
cdiParamToString
(
param
,
paramstr
,
sizeof
(
paramstr
));
fprintf
(
fp
,
"%6d %-8s %6d %6d %6d %5d %6d %-8s %s [%s]
\n
"
,
varID
,
paramstr
,
gridID
,
zaxisID
,
tsteptype
,
flag
,
iorank
,
fprintf
(
fp
,
"%6d %-8s %6d %6d %6d
%6d
%5d %6d %-8s %s [%s]
\n
"
,
varID
,
paramstr
,
gridID
,
zaxisID
,
subtypeID
,
tsteptype
,
flag
,
iorank
,
name
?
name
:
""
,
longname
?
longname
:
""
,
units
?
units
:
""
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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