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

Renamed cdiConvention to CDI_convention.

parent 3af2de5a
......@@ -30,7 +30,7 @@ bool cdiIgnoreAttCoordinates = false;
bool cdiCoordinatesLonLat = false;
bool cdiIgnoreValidRange = false;
int cdiSkipRecords = 0;
int cdiConvention = CDI_CONVENTION_ECHAM;
int CDI_convention = CDI_CONVENTION_ECHAM;
int CDI_inventory_mode = 1;
int CDO_version_info = 1;
int CDI_read_cell_corners = 1;
......@@ -396,7 +396,7 @@ void cdiInitialize(void)
{
if ( strcmp(envstr, "CF") == 0 || strcmp(envstr, "cf") == 0 )
{
cdiConvention = CDI_CONVENTION_CF;
CDI_convention = CDI_CONVENTION_CF;
if ( CDI_Debug )
Message("CDI convention was set to CF!");
}
......
......@@ -344,7 +344,7 @@ extern bool cdiIgnoreAttCoordinates;
extern bool cdiCoordinatesLonLat;
extern bool cdiIgnoreValidRange;
extern int cdiSkipRecords;
extern int cdiConvention;
extern int CDI_convention;
extern int CDI_inventory_mode;
extern int CDO_version_info;
extern int CDI_read_cell_corners;
......
This diff is collapsed.
......@@ -833,7 +833,7 @@ bool isHybridSigmaPressureCoordinate(int ncid, int ncvarid, ncvar_t *ncvars, con
if ( strcmp(ncvar->stdname, "atmosphere_hybrid_sigma_pressure_coordinate") == 0 )
{
cdiConvention = CDI_CONVENTION_CF;
CDI_convention = CDI_CONVENTION_CF;
status = true;
ncvar->zaxistype = ZAXIS_HYBRID;
......
......@@ -1382,7 +1382,7 @@ static
void cdf_def_zaxis_hybrid(stream_t *streamptr, int type, int *ncvarid, int zaxisID, int zaxisindex, int xtype, size_t dimlen, int *dimID, char *axisname)
{
void (*def_zaxis_hybrid_delegate)(stream_t *streamptr, int type, int *ncvarid, int zaxisID, int zaxisindex, int xtype, size_t dimlen, int *dimID, char *axisname)
= ( (!CDI_cmor_mode && cdiConvention == CDI_CONVENTION_ECHAM)
= ( (!CDI_cmor_mode && CDI_convention == CDI_CONVENTION_ECHAM)
|| type == ZAXIS_HYBRID_HALF )
? cdf_def_zaxis_hybrid_echam : cdf_def_zaxis_hybrid_cf;
def_zaxis_hybrid_delegate(streamptr, type, ncvarid, zaxisID, zaxisindex, xtype, dimlen, dimID, axisname);
......
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