Commit cf25c0c9 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed cdfDefVars() to cdfDefCoordinateVars().

parent 8245b614
...@@ -28,7 +28,7 @@ static int activeNamespace = 0; ...@@ -28,7 +28,7 @@ static int activeNamespace = 0;
{ .func = (void (*)()) nc__create }, \ { .func = (void (*)()) nc__create }, \
{ .func = (void (*)()) cdf_def_var_serial }, \ { .func = (void (*)()) cdf_def_var_serial }, \
{ .func = (void (*)()) cdfDefTimestep }, \ { .func = (void (*)()) cdfDefTimestep }, \
{ .func = (void (*)()) cdfDefVars } { .func = (void (*)()) cdfDefCoordinateVars }
#else #else
#define CDI_NETCDF_SWITCHES #define CDI_NETCDF_SWITCHES
......
...@@ -513,7 +513,7 @@ cdiPioServerCdfDefVars(stream_t *streamptr) ...@@ -513,7 +513,7 @@ cdiPioServerCdfDefVars(stream_t *streamptr)
if (commInqIOMode() == PIO_NONE if (commInqIOMode() == PIO_NONE
|| ((rank = commInqRankColl()) || ((rank = commInqRankColl())
== (rankOpen = cdiPioSerialOpenFileMap(streamptr->self)))) == (rankOpen = cdiPioSerialOpenFileMap(streamptr->self))))
cdfDefVars(streamptr); cdfDefCoordinateVars(streamptr);
} }
static void static void
......
...@@ -1690,7 +1690,7 @@ void cdiStreamSetupVlist_(stream_t *streamptr, int vlistID) ...@@ -1690,7 +1690,7 @@ void cdiStreamSetupVlist_(stream_t *streamptr, int vlistID)
case CDI_FILETYPE_NC4C: case CDI_FILETYPE_NC4C:
case CDI_FILETYPE_NC5: case CDI_FILETYPE_NC5:
{ {
/* calls cdfDefVars in serial mode but /* calls cdfDefCoordinateVars in serial mode but
* cdiPioClientStreamNOP (i.e. nothing) on client ranks * cdiPioClientStreamNOP (i.e. nothing) on client ranks
* and cdiPioServerCdfDefVars on server ranks in parallel mode*/ * and cdiPioServerCdfDefVars on server ranks in parallel mode*/
void (*myCdfDefVars)(stream_t *streamptr) void (*myCdfDefVars)(stream_t *streamptr)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "cdi_int.h" #include "cdi_int.h"
void cdfDefVars(stream_t *streamptr); void cdfDefCoordinateVars(stream_t *streamptr);
void cdfDefTimestep(stream_t *streamptr, int tsID); void cdfDefTimestep(stream_t *streamptr, int tsID);
int cdfInqTimestep(stream_t *streamptr, int tsID); int cdfInqTimestep(stream_t *streamptr, int tsID);
int cdfInqContents(stream_t *streamptr); int cdfInqContents(stream_t *streamptr);
......
...@@ -1990,7 +1990,7 @@ void cdfDefHistory(stream_t *streamptr, int size, const char *history) ...@@ -1990,7 +1990,7 @@ void cdfDefHistory(stream_t *streamptr, int size, const char *history)
} }
void cdfDefVars(stream_t *streamptr) void cdfDefCoordinateVars(stream_t *streamptr)
{ {
const int vlistID = streamptr->vlistID; const int vlistID = streamptr->vlistID;
if ( vlistID == CDI_UNDEFID ) Error("Internal problem! vlist undefined for streamptr %p", streamptr); if ( vlistID == CDI_UNDEFID ) Error("Internal problem! vlist undefined for streamptr %p", streamptr);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment