Commit 0008919f authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Narrow scope of variable declaration.

parent 979d0704
...@@ -4725,7 +4725,6 @@ void define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva ...@@ -4725,7 +4725,6 @@ void define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva
int ltwarn = TRUE; int ltwarn = TRUE;
size_t attlen; size_t attlen;
char attname[CDI_MAX_NAME]; char attname[CDI_MAX_NAME];
double datt;
struct cdfLazyGrid *restrict lazyGrid = NULL, *restrict lazyProj = NULL; struct cdfLazyGrid *restrict lazyGrid = NULL, *restrict lazyProj = NULL;
#define grid (&lazyGrid->base) #define grid (&lazyGrid->base)
#define proj (&lazyProj->base) #define proj (&lazyProj->base)
...@@ -5218,6 +5217,7 @@ void define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva ...@@ -5218,6 +5217,7 @@ void define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva
} }
else if ( strcmp(attname, "earth_radius") == 0 ) else if ( strcmp(attname, "earth_radius") == 0 )
{ {
double datt;
cdfGetAttDouble(ncvars[ncvarid].ncid, ncvars[ncvarid].gmapid, attname, 1, &datt); cdfGetAttDouble(ncvars[ncvarid].ncid, ncvars[ncvarid].gmapid, attname, 1, &datt);
grid->laea_a = datt; grid->laea_a = datt;
grid->lcc2_a = datt; grid->lcc2_a = datt;
...@@ -5232,6 +5232,7 @@ void define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva ...@@ -5232,6 +5232,7 @@ void define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva
} }
else if ( strcmp(attname, "latitude_of_projection_origin") == 0 ) else if ( strcmp(attname, "latitude_of_projection_origin") == 0 )
{ {
double datt;
cdfGetAttDouble(ncvars[ncvarid].ncid, ncvars[ncvarid].gmapid, attname, 1, &datt); cdfGetAttDouble(ncvars[ncvarid].ncid, ncvars[ncvarid].gmapid, attname, 1, &datt);
grid->laea_lat_0 = datt; grid->laea_lat_0 = datt;
grid->lcc2_lat_0 = datt; grid->lcc2_lat_0 = datt;
...@@ -5240,6 +5241,7 @@ void define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva ...@@ -5240,6 +5241,7 @@ void define_all_grids(stream_t *streamptr, int vlistID, ncdim_t *ncdims, int nva
{ {
if ( attlen == 1 ) if ( attlen == 1 )
{ {
double datt;
cdfGetAttDouble(ncvars[ncvarid].ncid, ncvars[ncvarid].gmapid, attname, 1, &datt); cdfGetAttDouble(ncvars[ncvarid].ncid, ncvars[ncvarid].gmapid, attname, 1, &datt);
grid->lcc2_lat_1 = datt; grid->lcc2_lat_1 = datt;
grid->lcc2_lat_2 = datt; grid->lcc2_lat_2 = datt;
......
Supports Markdown
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