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
7e9681d3
Commit
7e9681d3
authored
Jul 05, 2016
by
Uwe Schulzweida
Browse files
Renamed CDI_GRID_ to CDI_KEY_.
parent
6e650913
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/cdi.h
View file @
7e9681d3
...
...
@@ -757,15 +757,15 @@ void gridDefYvals(int gridID, const double yvals[]);
int
gridInqYvals
(
int
gridID
,
double
yvals
[]);
/* CDI grid string key values */
#define CDI_
GRID
_XNAME 901 // X-axis name
#define CDI_
GRID
_YNAME 902 // Y-axis name
#define CDI_
GRID
_XDIMNAME 903 // X-axis dimension name
#define CDI_
GRID
_YDIMNAME 904 // Y-axis dimension name
#define CDI_
GRID
_VDIMNAME 905 // Vertex dimension name
#define CDI_
GRID
_XLONGNAME 906 // X-axis longname
#define CDI_
GRID
_YLONGNAME 907 // Y-axis longname
#define CDI_
GRID
_XUNITS 908 // X-axis units
#define CDI_
GRID
_YUNITS 909 // Y-axis units
#define CDI_
KEY
_XNAME 901 // X-axis name
#define CDI_
KEY
_YNAME 902 // Y-axis name
#define CDI_
KEY
_XDIMNAME 903 // X-axis dimension name
#define CDI_
KEY
_YDIMNAME 904 // Y-axis dimension name
#define CDI_
KEY
_VDIMNAME 905 // Vertex dimension name
#define CDI_
KEY
_XLONGNAME 906 // X-axis longname
#define CDI_
KEY
_YLONGNAME 907 // Y-axis longname
#define CDI_
KEY
_XUNITS 908 // X-axis units
#define CDI_
KEY
_YUNITS 909 // Y-axis units
// cdiGridDefKeyStr: Define a CDI grid string value from a key
int
cdiGridDefKeyStr
(
int
gridID
,
int
key
,
int
size
,
const
char
*
mesg
);
...
...
src/grid.c
View file @
7e9681d3
...
...
@@ -607,9 +607,9 @@ char *grid_key_to_string(grid_t *gridptr, int key)
switch
(
key
)
{
case
CDI_
GRID
_XDIMNAME
:
gridstring
=
gridptr
->
x
.
dimname
;
break
;
case
CDI_
GRID
_YDIMNAME
:
gridstring
=
gridptr
->
y
.
dimname
;
break
;
case
CDI_
GRID
_VDIMNAME
:
gridstring
=
gridptr
->
vdimname
;
break
;
case
CDI_
KEY
_XDIMNAME
:
gridstring
=
gridptr
->
x
.
dimname
;
break
;
case
CDI_
KEY
_YDIMNAME
:
gridstring
=
gridptr
->
y
.
dimname
;
break
;
case
CDI_
KEY
_VDIMNAME
:
gridstring
=
gridptr
->
vdimname
;
break
;
}
return
gridstring
;
...
...
src/stream_cdf_i.c
View file @
7e9681d3
...
...
@@ -2858,11 +2858,11 @@ void cdf_define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int
gridDefHasDims
(
ncvars
[
ncvarid
].
gridID
,
FALSE
);
if
(
xdimid
!=
-
1
)
cdiGridDefKeyStr
(
ncvars
[
ncvarid
].
gridID
,
CDI_
GRID
_XDIMNAME
,
(
int
)(
strlen
(
ncdims
[
xdimid
].
name
)
+
1
),
ncdims
[
xdimid
].
name
);
cdiGridDefKeyStr
(
ncvars
[
ncvarid
].
gridID
,
CDI_
KEY
_XDIMNAME
,
(
int
)(
strlen
(
ncdims
[
xdimid
].
name
)
+
1
),
ncdims
[
xdimid
].
name
);
if
(
ydimid
!=
-
1
)
cdiGridDefKeyStr
(
ncvars
[
ncvarid
].
gridID
,
CDI_
GRID
_YDIMNAME
,
(
int
)(
strlen
(
ncdims
[
ydimid
].
name
)
+
1
),
ncdims
[
ydimid
].
name
);
cdiGridDefKeyStr
(
ncvars
[
ncvarid
].
gridID
,
CDI_
KEY
_YDIMNAME
,
(
int
)(
strlen
(
ncdims
[
ydimid
].
name
)
+
1
),
ncdims
[
ydimid
].
name
);
if
(
vdimid
!=
-
1
)
cdiGridDefKeyStr
(
ncvars
[
ncvarid
].
gridID
,
CDI_
GRID
_VDIMNAME
,
(
int
)(
strlen
(
ncdims
[
vdimid
].
name
)
+
1
),
ncdims
[
vdimid
].
name
);
cdiGridDefKeyStr
(
ncvars
[
ncvarid
].
gridID
,
CDI_
KEY
_VDIMNAME
,
(
int
)(
strlen
(
ncdims
[
vdimid
].
name
)
+
1
),
ncdims
[
vdimid
].
name
);
if
(
CDI_Debug
)
Message
(
"gridID %d %d %s"
,
ncvars
[
ncvarid
].
gridID
,
ncvarid
,
ncvars
[
ncvarid
].
name
);
...
...
src/stream_cdf_o.c
View file @
7e9681d3
...
...
@@ -845,7 +845,7 @@ static
void
cdfDefXaxis
(
stream_t
*
streamptr
,
int
gridID
,
int
ndims
)
{
cdfDefAxisCommon
(
streamptr
,
gridID
,
ndims
,
&
gridInqsX
,
streamptr
->
xdimID
,
CDI_
GRID
_XDIMNAME
,
'X'
,
finishCyclicXBounds
,
CDI_
KEY
_XDIMNAME
,
'X'
,
finishCyclicXBounds
,
streamptr
->
ncxvarID
);
}
...
...
@@ -860,7 +860,7 @@ static
void
cdfDefYaxis
(
stream_t
*
streamptr
,
int
gridID
,
int
ndims
)
{
cdfDefAxisCommon
(
streamptr
,
gridID
,
ndims
,
&
gridInqsY
,
streamptr
->
ydimID
,
CDI_
GRID
_YDIMNAME
,
'Y'
,
finishCyclicYBounds
,
CDI_
KEY
_YDIMNAME
,
'Y'
,
finishCyclicYBounds
,
streamptr
->
ncyvarID
);
}
...
...
@@ -926,7 +926,7 @@ void cdfDefCurvilinear(stream_t *streamptr, int gridID)
{
char
xdimname
[
CDI_MAX_NAME
+
3
];
xdimname
[
0
]
=
0
;
cdiGridInqKeyStr
(
gridID
,
CDI_
GRID
_XDIMNAME
,
CDI_MAX_NAME
,
xdimname
);
cdiGridInqKeyStr
(
gridID
,
CDI_
KEY
_XDIMNAME
,
CDI_MAX_NAME
,
xdimname
);
if
(
xdimname
[
0
]
==
0
)
{
xdimname
[
0
]
=
'x'
;
xdimname
[
1
]
=
0
;
}
xdimID
=
checkDimName
(
fileID
,
xdimlen
,
xdimname
);
if
(
xdimID
==
UNDEFID
)
cdf_def_dim
(
fileID
,
xdimname
,
xdimlen
,
&
xdimID
);
...
...
@@ -934,7 +934,7 @@ void cdfDefCurvilinear(stream_t *streamptr, int gridID)
{
char
ydimname
[
CDI_MAX_NAME
+
3
];
ydimname
[
0
]
=
0
;
cdiGridInqKeyStr
(
gridID
,
CDI_
GRID
_YDIMNAME
,
CDI_MAX_NAME
,
ydimname
);
cdiGridInqKeyStr
(
gridID
,
CDI_
KEY
_YDIMNAME
,
CDI_MAX_NAME
,
ydimname
);
if
(
ydimname
[
0
]
==
0
)
{
ydimname
[
0
]
=
'y'
;
ydimname
[
1
]
=
0
;
}
ydimID
=
checkDimName
(
fileID
,
ydimlen
,
ydimname
);
if
(
ydimID
==
UNDEFID
)
cdf_def_dim
(
fileID
,
ydimname
,
ydimlen
,
&
ydimID
);
...
...
@@ -946,7 +946,7 @@ void cdfDefCurvilinear(stream_t *streamptr, int gridID)
{
char
vdimname
[
CDI_MAX_NAME
+
3
];
vdimname
[
0
]
=
0
;
cdiGridInqKeyStr
(
gridID
,
CDI_
GRID
_VDIMNAME
,
CDI_MAX_NAME
,
vdimname
);
cdiGridInqKeyStr
(
gridID
,
CDI_
KEY
_VDIMNAME
,
CDI_MAX_NAME
,
vdimname
);
if
(
vdimname
[
0
]
==
0
)
strcpy
(
vdimname
,
"nv4"
);
size_t
nvertex
=
4
;
nvdimID
=
checkDimName
(
fileID
,
nvertex
,
vdimname
);
...
...
@@ -1278,7 +1278,7 @@ void cdfDefUnstructured(stream_t *streamptr, int gridID)
{
char
xdimname
[
CDI_MAX_NAME
+
3
];
xdimname
[
0
]
=
0
;
cdiGridInqKeyStr
(
gridID
,
CDI_
GRID
_XDIMNAME
,
CDI_MAX_NAME
,
xdimname
);
cdiGridInqKeyStr
(
gridID
,
CDI_
KEY
_XDIMNAME
,
CDI_MAX_NAME
,
xdimname
);
if
(
xdimname
[
0
]
==
0
)
strcpy
(
xdimname
,
"ncells"
);
dimID
=
checkDimName
(
fileID
,
dimlen
,
xdimname
);
if
(
dimID
==
UNDEFID
)
cdf_def_dim
(
fileID
,
xdimname
,
dimlen
,
&
dimID
);
...
...
@@ -1289,7 +1289,7 @@ void cdfDefUnstructured(stream_t *streamptr, int gridID)
{
char
vdimname
[
CDI_MAX_NAME
+
3
];
vdimname
[
0
]
=
0
;
cdiGridInqKeyStr
(
gridID
,
CDI_
GRID
_VDIMNAME
,
CDI_MAX_NAME
,
vdimname
);
cdiGridInqKeyStr
(
gridID
,
CDI_
KEY
_VDIMNAME
,
CDI_MAX_NAME
,
vdimname
);
if
(
vdimname
[
0
]
==
0
)
strcpy
(
vdimname
,
"vertices"
);
nvdimID
=
checkDimName
(
fileID
,
nvertex
,
vdimname
);
if
(
nvdimID
==
UNDEFID
)
cdf_def_dim
(
fileID
,
vdimname
,
nvertex
,
&
nvdimID
);
...
...
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