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
2d8cb156
Commit
2d8cb156
authored
Feb 03, 2017
by
Uwe Schulzweida
Browse files
Renamed cdiCopyVarAtts() to cdiCopyAtts().
parent
c09a5510
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/cdi.h
View file @
2d8cb156
...
...
@@ -707,6 +707,8 @@ int cdiInqNatts(int cdiID, int varID, int *nattsp);
int
cdiInqAtt
(
int
cdiID
,
int
varID
,
int
attrnum
,
char
*
name
,
int
*
typep
,
int
*
lenp
);
int
cdiDelAtt
(
int
cdiID
,
int
varID
,
const
char
*
name
);
int
cdiCopyAtts
(
int
cdiID1
,
int
varID1
,
int
cdiID2
,
int
varID2
);
/* cdiDefAttInt: Define an integer attribute */
int
cdiDefAttInt
(
int
cdiID
,
int
varID
,
const
char
*
name
,
int
type
,
int
len
,
const
int
ip
[]);
/* cdiDefAttFlt: Define a floating point attribute */
...
...
src/cdi_att.c
View file @
2d8cb156
...
...
@@ -289,17 +289,17 @@ int cdi_inq_att(int indtype, int cdiID, int varID, const char *name, size_t mxsz
}
int
cdiCopy
Var
Atts
(
int
cdiID1
,
int
varID
_
1
,
int
cdiID2
,
int
varID
_
2
)
int
cdiCopyAtts
(
int
cdiID1
,
int
varID1
,
int
cdiID2
,
int
varID2
)
{
int
status
=
CDI_NOERR
;
cdi_atts_t
*
attsp1
=
cdi_get_attsp
(
cdiID1
,
varID
_
1
);
cdi_atts_t
*
attsp1
=
cdi_get_attsp
(
cdiID1
,
varID1
);
xassert
(
attsp1
!=
NULL
);
for
(
int
attid
=
0
;
attid
<
(
int
)
attsp1
->
nelems
;
attid
++
)
{
cdi_att_t
*
attp
=
&
(
attsp1
->
value
[
attid
]);
cdi_def_att
(
attp
->
indtype
,
attp
->
exdtype
,
cdiID2
,
varID
_
2
,
attp
->
name
,
attp
->
nelems
,
attp
->
xsz
,
attp
->
xvalue
);
cdi_def_att
(
attp
->
indtype
,
attp
->
exdtype
,
cdiID2
,
varID2
,
attp
->
name
,
attp
->
nelems
,
attp
->
xsz
,
attp
->
xvalue
);
}
return
status
;
...
...
src/vlist.c
View file @
2d8cb156
...
...
@@ -344,7 +344,7 @@ void vlistCopy(int vlistID2, int vlistID1)
var_t
*
vars2
=
vlistptr2
->
vars
;
vlist_copy
(
vlistptr2
,
vlistptr1
);
cdiCopy
Var
Atts
(
vlistID1
,
CDI_GLOBAL
,
vlistID2
,
CDI_GLOBAL
);
cdiCopyAtts
(
vlistID1
,
CDI_GLOBAL
,
vlistID2
,
CDI_GLOBAL
);
if
(
vars1
)
{
...
...
@@ -361,7 +361,7 @@ void vlistCopy(int vlistID2, int vlistID1)
var_copy_entries
(
&
vars2
[
varID
],
&
vars1
[
varID
]);
vlistptr2
->
vars
[
varID
].
atts
.
nelems
=
0
;
cdiCopy
Var
Atts
(
vlistID1
,
varID
,
vlistID2
,
varID
);
cdiCopyAtts
(
vlistID1
,
varID
,
vlistID2
,
varID
);
if
(
vars1
[
varID
].
levinfo
)
{
...
...
@@ -526,7 +526,7 @@ void vlistCopyFlag(int vlistID2, int vlistID1)
vlist_copy
(
vlistptr2
,
vlistptr1
);
cdiCopy
Var
Atts
(
vlistID1
,
CDI_GLOBAL
,
vlistID2
,
CDI_GLOBAL
);
cdiCopyAtts
(
vlistID1
,
CDI_GLOBAL
,
vlistID2
,
CDI_GLOBAL
);
if
(
vlistptr1
->
vars
)
{
...
...
@@ -567,7 +567,7 @@ void vlistCopyFlag(int vlistID2, int vlistID1)
var_copy_entries
(
&
vars2
[
varID2
],
&
vars1
[
varID
]);
vlistptr2
->
vars
[
varID2
].
atts
.
nelems
=
0
;
cdiCopy
Var
Atts
(
vlistID1
,
varID
,
vlistID2
,
varID2
);
cdiCopyAtts
(
vlistID1
,
varID
,
vlistID2
,
varID2
);
int
nlevs
=
zaxisInqSize
(
vars1
[
varID
].
zaxisID
);
int
nlevs2
=
0
;
...
...
@@ -741,7 +741,7 @@ void vlistCat(int vlistID2, int vlistID1)
}
vars2
[
varID2
].
atts
.
nelems
=
0
;
cdiCopy
Var
Atts
(
vlistID1
,
varID
,
vlistID2
,
varID2
);
cdiCopyAtts
(
vlistID1
,
varID
,
vlistID2
,
varID2
);
vlistAdd2GridIDs
(
vlistptr2
,
vars1
[
varID
].
gridID
);
vlistAdd2ZaxisIDs
(
vlistptr2
,
vars1
[
varID
].
zaxisID
);
...
...
src/vlist.h
View file @
2d8cb156
...
...
@@ -133,7 +133,6 @@ int vlistInqVarMissvalUsed(int vlistID, int varID);
int
vlistHasTime
(
int
vlistID
);
int
cdiDelAtts
(
int
vlistID
,
int
varID
);
int
cdiCopyVarAtts
(
int
vlistID1
,
int
varID_1
,
int
vlistID2
,
int
varID_2
);
void
vlistUnpack
(
char
*
buffer
,
int
bufferSize
,
int
*
pos
,
int
originNamespace
,
void
*
context
,
int
force_id
);
...
...
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