Commit 5a9e834c authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

NetCDF attribute standard_name: leave unchanged.

parent fcdf7f55
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
2018-11-07 Uwe Schulzweida 2018-11-07 Uwe Schulzweida
* NetCDF attribute axis: leave unchanged * NetCDF attribute axis: leave unchanged
* NetCDF attribute standard_name: leave unchanged
2018-10-31 Uwe Schulzweida 2018-10-31 Uwe Schulzweida
......
...@@ -1210,10 +1210,6 @@ void cdfScanVarAttr(int nvars, ncvar_t *ncvars, int ndims, ncdim_t *ncdims, int ...@@ -1210,10 +1210,6 @@ void cdfScanVarAttr(int nvars, ncvar_t *ncvars, int ndims, ncdim_t *ncdims, int
{ {
memcpy(ncvars[ncvarid].longname, attstring, attstringsize); memcpy(ncvars[ncvarid].longname, attstring, attstringsize);
} }
else if ( isText && strcmp(attname, "standard_name") == 0 )
{
memcpy(ncvars[ncvarid].stdname, attstring, attstringsize);
}
else if ( isText && strcmp(attname, "units") == 0 ) else if ( isText && strcmp(attname, "units") == 0 )
{ {
memcpy(ncvars[ncvarid].units, attstring, attstringsize); memcpy(ncvars[ncvarid].units, attstring, attstringsize);
...@@ -1633,13 +1629,16 @@ void cdfVerifyVarAttr(int nvars, ncvar_t *ncvars, int ndims, ncdim_t *ncdims) ...@@ -1633,13 +1629,16 @@ void cdfVerifyVarAttr(int nvars, ncvar_t *ncvars, int ndims, ncdim_t *ncdims)
cdfGetAttText(ncid, ncvarid, attname, sizeof(attstring), attstring); cdfGetAttText(ncid, ncvarid, attname, sizeof(attstring), attstring);
attstringsize = strlen(attstring) + 1; attstringsize = strlen(attstring) + 1;
if (attstringsize > CDI_MAX_NAME) attstringsize = CDI_MAX_NAME; if (attstringsize > CDI_MAX_NAME) attstringsize = CDI_MAX_NAME;
}
if (isText && strcmp(attname, "axis") == 0) if (strcmp(attname, "axis") == 0)
{ {
strToLower(attstring); cdfScanAttrAxis(ncvars, ncdims, ncvarid, strToLower(attstring), nvdims, dimidsp);
cdfScanAttrAxis(ncvars, ncdims, ncvarid, attstring, nvdims, dimidsp); }
} else if (strcmp(attname, "standard_name") == 0)
{
memcpy(ncvars[ncvarid].stdname, attstring, attstringsize);
}
}
} }
} }
} }
......
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