diff --git a/src/grib_accessor_class_data_2order_packing.c b/src/grib_accessor_class_data_2order_packing.c index 79fcff4e9..ae3434df0 100644 --- a/src/grib_accessor_class_data_2order_packing.c +++ b/src/grib_accessor_class_data_2order_packing.c @@ -41,7 +41,7 @@ MEMBERS=const char* width_lengths MEMBERS=const char* octet_start_group MEMBERS=const char* width_spd_sp_desc - MEMBERS=const char* nap + MEMBERS=const char* Ni MEMBERS=const char* bitmap END_CLASS_DEF @@ -96,7 +96,7 @@ typedef struct grib_accessor_data_2order_packing const char* width_lengths; const char* octet_start_group; const char* width_spd_sp_desc; - const char* nap; + const char* Ni; const char* bitmap; } grib_accessor_data_2order_packing; @@ -218,7 +218,7 @@ static void init(grib_accessor* a, const long v, grib_arguments* args) self->width_lengths = grib_arguments_get_name(gh, args, self->carg++); self->octet_start_group = grib_arguments_get_name(gh, args, self->carg++); self->width_spd_sp_desc = grib_arguments_get_name(gh, args, self->carg++); - self->nap = grib_arguments_get_name(gh, args, self->carg++); + self->Ni = grib_arguments_get_name(gh, args, self->carg++); self->bitmap = grib_arguments_get_name(gh, args, self->carg++); a->flags |= GRIB_ACCESSOR_FLAG_DATA; } @@ -466,7 +466,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len) long pointer_of_group_size = 0; long pointer_of_group_width = 0; long refsp = 0; - long nap = 0; + long Ni = 0; long nn = 0; unsigned char* bitmap = NULL; grib_accessor* abitmap = NULL; @@ -523,7 +523,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len) if ((err = grib_get_long_internal(gh, self->width_spd_sp_desc, &width_spd_sp_desc)) != GRIB_SUCCESS) width_spd_sp_desc = -1; - if ((err = grib_get_long_internal(gh, self->nap, &nap)) != GRIB_SUCCESS) + if ((err = grib_get_long_internal(gh, self->Ni, &Ni)) != GRIB_SUCCESS) return err; self->dirty = 0; @@ -642,7 +642,7 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len) de_spatial_difference(a->context, sec_val, n_vals, n_sp_diff, bias); if (boustrophedonic) - reverse_rows(sec_val, n_vals, nap, bitmap, bitmap_len); + reverse_rows(sec_val, n_vals, Ni, bitmap, bitmap_len); s = grib_power(binary_scale_factor, 2); d = grib_power(-decimal_scale_factor, 10); @@ -731,7 +731,7 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len) long pointer_of_group_size = 0; long pointer_of_group_width = 0; long refsp = 0; - long nap = 0; + long Ni = 0; long offsetdata = 0; double max; @@ -763,7 +763,7 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len) return err; if ((err = grib_get_long_internal(gh, self->width_spd_sp_desc, &width_spd_sp_desc)) != GRIB_SUCCESS) return err; - if ((err = grib_get_long_internal(gh, self->nap, &nap)) != GRIB_SUCCESS) + if ((err = grib_get_long_internal(gh, self->Ni, &Ni)) != GRIB_SUCCESS) return err; if ((abitmap = grib_find_accessor(gh, self->bitmap)) != NULL) { @@ -816,7 +816,7 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len) /* reverse the rows*/ if (boustrophedonic) - reverse_rows(sec_val, n_vals, nap, bitmap, bitmap_len); + reverse_rows(sec_val, n_vals, Ni, bitmap, bitmap_len); if (snd_ordr_wdiff) diff --git a/src/grib_iterator_class_gaussian.c b/src/grib_iterator_class_gaussian.c index 536d38b11..06fb66f8f 100644 --- a/src/grib_iterator_class_gaussian.c +++ b/src/grib_iterator_class_gaussian.c @@ -51,8 +51,8 @@ typedef struct grib_iterator_gaussian /* Members defined in regular */ double* las; double* los; - long nap; - long nam; + long Ni; + long Nj; long iScansNegatively; long isRotated; double angleOfRotation; @@ -146,13 +146,13 @@ static int init(grib_iterator* i, grib_handle* h, grib_arguments* args) Assert(istart < size); if (jScansPositively) { - for (lai = 0; lai < self->nam; lai++) { + for (lai = 0; lai < self->Nj; lai++) { self->las[lai] = lats[istart--]; /*if (istart<0) istart=size-1; this condition is always FALSE -- 'istart' is unsigned long */ } } else { - for (lai = 0; lai < self->nam; lai++) { + for (lai = 0; lai < self->Nj; lai++) { self->las[lai] = lats[istart++]; if (istart > size - 1) istart = 0; diff --git a/src/grib_iterator_class_gaussian_reduced.c b/src/grib_iterator_class_gaussian_reduced.c index 627a0b316..832b392d7 100644 --- a/src/grib_iterator_class_gaussian_reduced.c +++ b/src/grib_iterator_class_gaussian_reduced.c @@ -26,7 +26,7 @@ IMPLEMENTS = init;next MEMBERS = double *las MEMBERS = double *los - MEMBERS = long nam + MEMBERS = long Nj END_CLASS_DEF */ @@ -58,7 +58,7 @@ typedef struct grib_iterator_gaussian_reduced /* Members defined in gaussian_reduced */ double* las; double* los; - long nam; + long Nj; } grib_iterator_gaussian_reduced; extern grib_iterator_class* grib_iterator_class_gen; diff --git a/src/grib_iterator_class_lambert_azimuthal_equal_area.c b/src/grib_iterator_class_lambert_azimuthal_equal_area.c index 5d23253b2..2a5fb80cc 100644 --- a/src/grib_iterator_class_lambert_azimuthal_equal_area.c +++ b/src/grib_iterator_class_lambert_azimuthal_equal_area.c @@ -26,7 +26,7 @@ IMPLEMENTS = init;next MEMBERS = double *lats MEMBERS = double *lons - MEMBERS = long nam + MEMBERS = long Nj END_CLASS_DEF */ @@ -57,7 +57,7 @@ typedef struct grib_iterator_lambert_azimuthal_equal_area /* Members defined in lambert_azimuthal_equal_area */ double* lats; double* lons; - long nam; + long Nj; } grib_iterator_lambert_azimuthal_equal_area; extern grib_iterator_class* grib_iterator_class_gen; diff --git a/src/grib_iterator_class_lambert_conformal.c b/src/grib_iterator_class_lambert_conformal.c index e0f75d8fe..4ca01506e 100644 --- a/src/grib_iterator_class_lambert_conformal.c +++ b/src/grib_iterator_class_lambert_conformal.c @@ -21,7 +21,7 @@ IMPLEMENTS = init;next MEMBERS = double *lats MEMBERS = double *lons - MEMBERS = long nam + MEMBERS = long Nj END_CLASS_DEF */ @@ -52,7 +52,7 @@ typedef struct grib_iterator_lambert_conformal /* Members defined in lambert_conformal */ double* lats; double* lons; - long nam; + long Nj; } grib_iterator_lambert_conformal; extern grib_iterator_class* grib_iterator_class_gen; diff --git a/src/grib_iterator_class_latlon.c b/src/grib_iterator_class_latlon.c index 2ae5230f1..b28e13e22 100644 --- a/src/grib_iterator_class_latlon.c +++ b/src/grib_iterator_class_latlon.c @@ -47,8 +47,8 @@ typedef struct grib_iterator_latlon /* Members defined in regular */ double* las; double* los; - long nap; - long nam; + long Ni; + long Nj; long iScansNegatively; long isRotated; double angleOfRotation; @@ -102,14 +102,14 @@ static int next(grib_iterator* iter, double* lat, double* lon, double* val) */ if (!self->jPointsAreConsecutive) { /* Adjacent points in i (x) direction are consecutive */ - ret_lat = self->las[(long)floor(iter->e / self->nap)]; - ret_lon = self->los[(long)iter->e % self->nap]; + ret_lat = self->las[(long)floor(iter->e / self->Ni)]; + ret_lon = self->los[(long)iter->e % self->Ni]; ret_val = iter->data[iter->e]; } else { /* Adjacent points in j (y) direction is consecutive */ - ret_lon = self->los[(long)iter->e / self->nam]; - ret_lat = self->las[(long)floor(iter->e % self->nam)]; + ret_lon = self->los[(long)iter->e / self->Nj]; + ret_lat = self->las[(long)floor(iter->e % self->Nj)]; ret_val = iter->data[iter->e]; } @@ -175,7 +175,7 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args) if (grib_is_missing(h, s_jdir, &err) && err == GRIB_SUCCESS) { double lat2; if ((err = grib_get_double_internal(h, "latitudeLastInDegrees", &lat2)) == GRIB_SUCCESS) { - const long Nj = self->nam; + const long Nj = self->Nj; Assert(Nj > 1); if (lat1 > lat2) { jdir = (lat1 - lat2) / (Nj - 1); @@ -190,7 +190,7 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args) if (jScansPositively) jdir = -jdir; - for (lai = 0; lai < self->nam; lai++) { + for (lai = 0; lai < self->Nj; lai++) { self->las[lai] = lat1; lat1 -= jdir; } diff --git a/src/grib_iterator_class_polar_stereographic.c b/src/grib_iterator_class_polar_stereographic.c index 4bf22502a..93b2cd660 100644 --- a/src/grib_iterator_class_polar_stereographic.c +++ b/src/grib_iterator_class_polar_stereographic.c @@ -21,7 +21,7 @@ IMPLEMENTS = init;next MEMBERS = double *lats MEMBERS = double *lons - MEMBERS = long nam + MEMBERS = long Nj END_CLASS_DEF */ @@ -52,7 +52,7 @@ typedef struct grib_iterator_polar_stereographic /* Members defined in polar_stereographic */ double* lats; double* lons; - long nam; + long Nj; } grib_iterator_polar_stereographic; extern grib_iterator_class* grib_iterator_class_gen; diff --git a/src/grib_iterator_class_regular.c b/src/grib_iterator_class_regular.c index 64f04c3bf..6697b1eb2 100644 --- a/src/grib_iterator_class_regular.c +++ b/src/grib_iterator_class_regular.c @@ -21,8 +21,8 @@ IMPLEMENTS = init;destroy MEMBERS = double *las MEMBERS = double *los - MEMBERS = long nap - MEMBERS = long nam + MEMBERS = long Ni + MEMBERS = long Nj MEMBERS = long iScansNegatively MEMBERS = long isRotated MEMBERS = double angleOfRotation @@ -62,8 +62,8 @@ typedef struct grib_iterator_regular /* Members defined in regular */ double* las; double* los; - long nap; - long nam; + long Ni; + long Nj; long iScansNegatively; long isRotated; double angleOfRotation; @@ -109,8 +109,8 @@ static int next(grib_iterator* i, double* lat, double* lon, double* val) i->e++; - *lat = self->las[(long)floor(i->e / self->nap)]; - *lon = self->los[(long)i->e % self->nap]; + *lat = self->las[(long)floor(i->e / self->Ni)]; + *lon = self->los[(long)i->e % self->Ni]; *val = i->data[i->e]; return 1; @@ -122,8 +122,8 @@ static int previous(grib_iterator* i, double* lat, double* lon, double* val) if (i->e < 0) return 0; - *lat = self->las[(long)floor(i->e / self->nap)]; - *lon = self->los[i->e % self->nap]; + *lat = self->las[(long)floor(i->e / self->Ni)]; + *lon = self->los[i->e % self->Ni]; *val = i->data[i->e]; i->e--; @@ -168,7 +168,7 @@ static int init(grib_iterator* i, grib_handle* h, grib_arguments* args) if ((ret = grib_get_long_internal(h, s_iScansNeg, &self->iScansNegatively))) return ret; - /* GRIB-801: Careful of case with a single point! nap==1 */ + /* GRIB-801: Careful of case with a single point! Ni==1 */ if (Ni > 1) { /* Note: If first and last longitudes are equal I assume you wanna go round the globe */ if (self->iScansNegatively) { @@ -200,8 +200,8 @@ static int init(grib_iterator* i, grib_handle* h, grib_arguments* args) }*/ } - self->nap = Ni; - self->nam = Nj; + self->Ni = Ni; + self->Nj = Nj; self->las = (double*)grib_context_malloc(h->context, Nj * sizeof(double)); self->los = (double*)grib_context_malloc(h->context, Ni * sizeof(double)); diff --git a/src/grib_iterator_class_space_view.c b/src/grib_iterator_class_space_view.c index 2c26dcc93..99c441a2d 100644 --- a/src/grib_iterator_class_space_view.c +++ b/src/grib_iterator_class_space_view.c @@ -21,7 +21,7 @@ IMPLEMENTS = init;next MEMBERS = double *lats MEMBERS = double *lons - MEMBERS = long nam + MEMBERS = long Nj END_CLASS_DEF */ @@ -52,7 +52,7 @@ typedef struct grib_iterator_space_view /* Members defined in space_view */ double* lats; double* lons; - long nam; + long Nj; } grib_iterator_space_view; extern grib_iterator_class* grib_iterator_class_gen;