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
7a1570cd
Commit
7a1570cd
authored
Jun 30, 2017
by
Uwe Schulzweida
Browse files
Renamed struct PAR to param_type.
parent
2156f847
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/table.c
View file @
7a1570cd
...
...
@@ -22,12 +22,12 @@
typedef
struct
{
int
used
;
bool
used
;
int
npars
;
PAR
*
pars
;
int
modelID
;
int
number
;
char
*
name
;
param_type
*
pars
;
}
PARTAB
;
...
...
@@ -72,7 +72,7 @@ void tableDefEntry(int tableID, int id, const char *name,
}
}
static
void
tableLink
(
int
tableID
,
const
PAR
*
pars
,
int
npars
)
static
void
tableLink
(
int
tableID
,
const
param_type
*
pars
,
int
npars
)
{
for
(
int
item
=
0
;
item
<
npars
;
item
++
)
{
...
...
@@ -88,7 +88,7 @@ static void tableLink(int tableID, const PAR *pars, int npars)
static
void
parTableInitEntry
(
int
tableID
)
{
parTable
[
tableID
].
used
=
0
;
parTable
[
tableID
].
used
=
false
;
parTable
[
tableID
].
pars
=
NULL
;
parTable
[
tableID
].
npars
=
0
;
parTable
[
tableID
].
modelID
=
CDI_UNDEFID
;
...
...
@@ -160,7 +160,7 @@ static int tableNewEntry()
if
(
tableID
==
parTableSize
)
Error
(
"no more entries!"
);
parTable
[
tableID
].
used
=
1
;
parTable
[
tableID
].
used
=
true
;
parTableNum
++
;
return
tableID
;
...
...
@@ -317,9 +317,9 @@ int tableRead(const char *tablefile)
{
char
line
[
1024
],
*
pline
;
int
lnr
=
0
;
int
id
;
char
name
[
256
],
longname
[
256
],
units
[
256
];
int
err
;
int
tableID
=
CDI_UNDEFID
;
FILE
*
tablefp
=
fopen
(
tablefile
,
"r"
);
if
(
tablefp
==
NULL
)
return
tableID
;
...
...
@@ -328,14 +328,15 @@ int tableRead(const char *tablefile)
if
(
tablename
==
0
)
tablename
=
(
char
*
)
tablefile
;
else
tablename
++
;
int
tableID
=
tableDef
(
-
1
,
0
,
tablename
);
tableID
=
tableDef
(
-
1
,
0
,
tablename
);
while
(
fgets
(
line
,
1023
,
tablefp
)
)
{
size_t
len
=
strlen
(
line
);
if
(
line
[
len
-
1
]
==
'\n'
)
line
[
len
-
1
]
=
'\0'
;
lnr
++
;
id
=
CDI_UNDEFID
;
int
id
=
CDI_UNDEFID
;
int
ltype
=
CDI_UNDEFID
;
name
[
0
]
=
0
;
longname
[
0
]
=
0
;
units
[
0
]
=
0
;
...
...
@@ -353,6 +354,21 @@ int tableRead(const char *tablefile)
while
(
isdigit
((
int
)
*
pline
)
)
pline
++
;
if
(
*
pline
==
';'
)
{
pline
++
;
ltype
=
atoi
(
pline
);
while
(
isdigit
((
int
)
*
pline
)
)
pline
++
;
if
(
*
pline
==
';'
)
{
pline
++
;
while
(
isdigit
((
int
)
*
pline
)
)
pline
++
;
}
}
while
(
isdigit
((
int
)
*
pline
)
)
pline
++
;
if
(
strchr
(
pline
,
'|'
)
)
err
=
decodeForm2
(
pline
,
name
,
longname
,
units
);
else
...
...
@@ -517,7 +533,7 @@ int tableDef(int modelID, int tablenum, const char *tablename)
if
(
tablename
)
parTable
[
tableID
].
name
=
strdupx
(
tablename
);
parTable
[
tableID
].
pars
=
(
PAR
*
)
Malloc
(
MAX_PARS
*
sizeof
(
PAR
));
parTable
[
tableID
].
pars
=
(
param_type
*
)
Malloc
(
MAX_PARS
*
sizeof
(
param_type
));
}
return
tableID
;
...
...
@@ -744,7 +760,7 @@ void tableFWriteC(FILE *ptfp, int tableID)
for
(
size_t
i
=
0
;
i
<
len
;
i
++
)
if
(
tablename
[
i
]
==
'.'
)
tablename
[
i
]
=
'_'
;
}
fprintf
(
ptfp
,
"static const
PAR
%s[] = {
\n
"
,
tablename
);
fprintf
(
ptfp
,
"static const
param_type
%s[] = {
\n
"
,
tablename
);
for
(
int
item
=
0
;
item
<
npars
;
item
++
)
{
...
...
src/table.h
View file @
7a1570cd
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/tablepar.h
View file @
7a1570cd
#ifndef
_
TABLEPAR_H
#define
_
TABLEPAR_H
#ifndef TABLEPAR_H
#define TABLEPAR_H
enum
{
TABLE_DUP_NAME
=
1
<<
0
,
...
...
@@ -9,16 +9,17 @@ enum {
typedef
struct
{
int
id
;
/* Parameter number (GRIB) */
int
dupflags
;
/* keep track of which attributes got strdup'ed */
const
char
*
name
;
/* Parameter name */
const
char
*
longname
;
/* Parameter long name */
const
char
*
units
;
/* Parameter units */
int
id
;
// Parameter number (GRIB)
int
ltype
;
// Level type (GRIB)
int
dupflags
;
// keep track of which attributes got strdup'ed
const
char
*
name
;
// Parameter name
const
char
*
longname
;
// Parameter long name
const
char
*
units
;
// Parameter units
}
PAR
;
param_type
;
static
void
tableLink
(
int
tableID
,
const
PAR
*
pars
,
int
npars
);
static
void
tableLink
(
int
tableID
,
const
param_type
*
pars
,
int
npars
);
int
tableDef
(
int
modelID
,
int
tablegribID
,
const
char
*
tablename
);
#endif
...
...
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