Latest updates from develop (26)

ecmwf · dtip · Dec 10, 2019 · Dec 12, 2019 · Dec 12, 2019 · Dec 13, 2019
commit bb6e8e624419906ca458e4cd0e42118acc27bdcc
diff --git a/definitions/grib1/grid_rotation.def b/definitions/grib1/grid_rotation.def
@@ -9,4 +9,4 @@ meta  geography.longitudeOfSouthernPoleInDegrees   scale(longitudeOfSouthernPole
 ibmfloat geography.angleOfRotationInDegrees : dump;
 
 alias angleOfRotation =angleOfRotationInDegrees;
-alias is_rotated_grid = one;
+alias isRotatedGrid = one;
diff --git a/definitions/grib1/local.98.192.def b/definitions/grib1/local.98.192.def
@@ -5,9 +5,9 @@
 
 constant GRIBEXSection1Problem = 0 ;
 
-codetable[1]   thisMarsClass   "mars/class.table" = "od" : dump,lowercase;
+codetable[1]   thisMarsClass  "mars/class.table" = "od" : dump,string_type,lowercase;
 codetable[1]   thisMarsType   "mars/type.table" = "an" : dump,string_type,lowercase;
-codetable[2]   thisMarsStream "mars/stream.table" = "oper" : dump,lowercase ;
+codetable[2]   thisMarsStream "mars/stream.table" = "oper" : dump,string_type,lowercase ;
 ksec1expver[4] thisExperimentVersionNumber = "0001" : dump;
 
 alias ls.dataType = thisMarsType;
@@ -24,16 +24,16 @@ unsigned[1] numberOfLocalDefinitions = 2  : dump;
 if (numberOfLocalDefinitions == 2 ) {
 	unsigned[2] subLocalDefinitionLength1  = 7 : dump;
 	unsigned[1] subLocalDefinitionNumber1 = 1  : dump;
-	codetable[1]   marsClass1   "mars/class.table" = "od" : dump,lowercase;
+	codetable[1]   marsClass1   "mars/class.table" = "od" : dump,string_type,lowercase;
 	codetable[1]   marsType1   "mars/type.table" = "an" : dump,string_type,lowercase;
-	codetable[2]   marsStream1 "mars/stream.table" = "oper" : dump,lowercase ;
+	codetable[2]   marsStream1 "mars/stream.table" = "oper" : dump,string_type,lowercase;
 	ksec1expver[4] experimentVersionNumber1 = "0001" : dump;
 	template  subDefinitions1  "grib1/local_no_mars.98.[subLocalDefinitionNumber1].def";
 	unsigned[2] subLocalDefinitionLength2  = 9 : dump;
 	unsigned[1] subLocalDefinitionNumber2 = 24  : dump;
-	codetable[1]   marsClass2   "mars/class.table" = "od" : dump,lowercase;
+	codetable[1]   marsClass2   "mars/class.table" = "od" : dump,string_type,lowercase;
 	codetable[1]   marsType2   "mars/type.table" = "an" : dump,string_type,lowercase;
-	codetable[2]   marsStream2 "mars/stream.table" = "oper" : dump,lowercase ;
+	codetable[2]   marsStream2 "mars/stream.table" = "oper" : dump,string_type,lowercase;
 	ksec1expver[4] experimentVersionNumber2 = "0001" : dump;
 	template  subDefinitions2  "grib1/local_no_mars.98.[subLocalDefinitionNumber2].def";
 }
diff --git a/definitions/grib1/local.98.40.def b/definitions/grib1/local.98.40.def
@@ -4,20 +4,20 @@ constant GRIBEXSection1Problem = 56 - section1Length ;
 
 template mars_labeling "grib1/mars_labeling.def";
 
-unsigned[1] perturbationNumber           : dump;
+unsigned[1] perturbationNumber : dump;
 alias number = perturbationNumber;
 
-unsigned[1] numberOfForecastsInEnsemble  : dump;
+unsigned[1] numberOfForecastsInEnsemble : dump;
 alias totalNumber=numberOfForecastsInEnsemble;
 
 #1->2
 alias grib2LocalSectionPresent=present;
 constant grib2LocalSectionNumber=1;
 
-codetable[2] marsModel "mars/model.[centre:l].table" = "cosmo" : dump,lowercase ;
-alias mars.model = marsModel; 
+codetable[2] marsModel "mars/model.[centre:l].table" = "cosmo": dump;
+alias mars.model = marsModel;
 
-codetable[2] marsDomain "mars/domain.[centre:l].table" = "s" : dump,lowercase ;
+codetable[2] marsDomain "mars/domain.[centre:l].table" = "s": dump;
 alias mars.domain = marsDomain;
 
 pad padding_local40_1(1);
diff --git a/definitions/grib1/section.2.def b/definitions/grib1/section.2.def
@@ -31,7 +31,7 @@ meta gridDefinitionDescription codetable_title(dataRepresentationType);
 
 #  Grid definition
 # (according to data representation type - octet 6 above)
-alias is_rotated_grid=zero;
+alias isRotatedGrid=zero;
 
 if (dataRepresentationType < 192)
 {

diff --git a/definitions/grib2/section.3.def b/definitions/grib2/section.3.def
@@ -36,7 +36,7 @@ if(numberOfOctectsForNumberOfPoints  == 0){
 codetable[2] gridDefinitionTemplateNumber ('3.1.table',masterDir,localDir) =0 : dump,edition_specific;
 meta gridDefinitionDescription codetable_title(gridDefinitionTemplateNumber);
 
-alias is_rotated_grid=zero;
+alias isRotatedGrid=zero;
 
 template gridDefinitionSection "grib2/template.3.[gridDefinitionTemplateNumber:l].def";
 

diff --git a/definitions/grib2/template.3.rotation.def b/definitions/grib2/template.3.rotation.def
@@ -18,4 +18,4 @@ alias geography.angleOfRotationInDegrees=angleOfRotation;
 
 alias angleOfRotationOfProjection=angleOfRotation;
 
-alias is_rotated_grid=one;
+alias isRotatedGrid=one;
diff --git a/definitions/grib3/template.component.4.2.def b/definitions/grib3/template.component.4.2.def
@@ -18,4 +18,4 @@ alias geography.angleOfRotationInDegrees=angleOfRotation;
 
 alias angleOfRotationOfProjection=angleOfRotation;
 
-alias is_rotated_grid=one;
+alias isRotatedGrid=one;
diff --git a/src/action_class_gen.c b/src/action_class_gen.c
@@ -97,6 +97,19 @@ grib_action* grib_action_create_gen(grib_context* context, const char* name, con
     act->cclass  = c;
     act->context = context;
     act->flags   = flags;
+#if CHECK_LOWERCASE_AND_STRING_TYPE
+    {
+        int flag_lowercase=0, flag_stringtype=0;
+        if (flags & GRIB_ACCESSOR_FLAG_LOWERCASE)
+            flag_lowercase = 1;
+        if (flags & GRIB_ACCESSOR_FLAG_STRING_TYPE)
+            flag_stringtype = 1;
+        if (flag_lowercase && !flag_stringtype) {
+            printf("grib_action_create_gen name=%s. Has lowercase but not string_type\n", name);
+            Assert(0);
+        }
+    }
+#endif
     a            = (grib_action_gen*)act;
 
     a->len = len;

diff --git 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_bits_any_endian.c b/src/grib_bits_any_endian.c
@@ -280,12 +280,7 @@ int grib_encode_unsigned_long(unsigned char* p, unsigned long val, long* bitp, l
         else {
             tmp = ((val >> len) | ((*p) & dmasks[n]));
         }
-        *p = tmp;
-        (*p)++;
-
-        /*Beware of code like this! compiler warning: operation may be undefined
-      Read GCC manual on -Wsequence-point*/
-        /* *p  = ((val << -len) | ((*p)++ & dmasks[n])); */
+        *p++ = tmp;
     }
 
     /*  write the middle words */

diff --git a/src/grib_bits_ibmpow.c b/src/grib_bits_ibmpow.c
@@ -107,8 +107,7 @@ int grib_encode_unsigned_long(unsigned char* p, unsigned long val, long* bitp, l
         else {
             tmp = ((val >> len) | ((*p) & dmasks[n]));
         }
-        *p = tmp;
-        (*p)++;
+        *p++ = tmp;
     }
 
     /*  write the middle words */

diff --git a/src/grib_hash_keys.c b/src/grib_hash_keys.c
@@ -34,7 +34,7 @@ error "gperf generated tables don't work with this execution character set. Plea
 struct grib_keys_hash { char* name; int id;};
 #include <string.h>
 
-#define TOTAL_KEYWORDS 2360
+#define TOTAL_KEYWORDS 2361
 #define MIN_WORD_LENGTH 1
 #define MAX_WORD_LENGTH 74
 #define MIN_HASH_VALUE 5
@@ -49,7 +49,9 @@ struct grib_keys_hash { char* name; int id;};
 #endif
 #endif
 static unsigned int
-hash_keys (const char* str, unsigned int len)
+hash_keys (str, len)
+     register const char *str;
+     register unsigned int len;
 {
   static const unsigned short asso_values[] =
     {
@@ -258,7 +260,7 @@ static const unsigned char lengthtable[] =
      0,  0,  0,  0,  0,  9,  0,  0, 11,  0,  0,  0, 12,  0,
      0,  0,  0,  0, 13,  0,  0,  0,  0,  0,  0, 11, 13,  0,
      0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,
-     2, 35,  0,  0,  0, 26,  0,  0,  0,  3,  0,  0,  4,  0,
+     2, 35,  0,  0,  0, 26,  0,  0,  0,  3,  5,  0,  4,  0,
      3,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0, 16, 31,
      0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 19,
      0,  0, 10,  0,  0,  0,  0,  0,  0,  0, 18, 16, 13, 11,
@@ -581,7 +583,7 @@ static const unsigned char lengthtable[] =
     13, 12,  0,  0, 33,  0,  0,  0,  0,  0,  0,  0, 35,  0,
      0, 28,  0,  0, 18, 22,  0,  0,  0, 17,  0,  0,  0,  0,
     24,  0,  0, 21,  0, 16, 16,  0, 24,  8,  0,  0,  0,  9,
-     0,  0,  0,  0,  0, 11,  0,  0,  0,  0, 20, 15,  0,  0,
+     0,  0,  0,  0,  0, 11,  0,  0,  0,  0, 20,  0,  0,  0,
      0,  0,  0,  0,  0,  0,  0, 16,  0, 15,  0, 11,  0,  0,
      0,  0,  0,  0,  0,  0,  0,  0, 14,  0, 15,  0,  0,  0,
     32,  0, 19,  0,  0, 13,  0, 25,  0,  0,  0, 11,  0,  0,
@@ -613,7 +615,7 @@ static const unsigned char lengthtable[] =
     22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
      0,  0,  0,  0,  0,  0, 28,  0,  0,  0,  0,  0,  0,  0,
-     0,  0, 35,  0,  0,  0,  0,  0,  0, 24, 13,  0,  0,  0,
+     0,  0, 35,  0,  0,  0,  0,  0, 13, 24, 13,  0,  0,  0,
      0,  0, 25,  0,  0,  0,  0, 15, 21,  0, 37,  0,  0,  0,
      0, 14, 33,  0, 17, 14,  0,  0,  0,  0,  0,  0,  0,  0,
      0,  0,  0,  0,  0, 15,  0,  0, 16, 34,  0,  0,  0,  0,
@@ -2571,7 +2573,7 @@ static const struct grib_keys_hash wordlist[] =
     {"timerepres",2150},
     {"radius",1714},
     {""},
-    {"isSens",999},
+    {"isSens",1000},
     {"year",2353},
     {""},
     {"dataTime",630},
@@ -2737,7 +2739,7 @@ static const struct grib_keys_hash wordlist[] =
     {""},
     {"efiOrder",715},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {"isSatellite",997},
+    {"isSatellite",998},
     {""},
     {"typicalDate",2211},
     {""}, {""}, {""}, {""}, {""}, {""},
@@ -3182,7 +3184,8 @@ static const struct grib_keys_hash wordlist[] =
     {"typeOfDistributionFunction",2186},
     {""}, {""}, {""},
     {"max",1231},
-    {""}, {""},
+    {"zeros",2361},
+    {""},
     {"zero",2360},
     {""},
     {"qfe",1701},
@@ -3309,7 +3312,7 @@ static const struct grib_keys_hash wordlist[] =
     {""}, {""},
     {"tiggeSection",2131},
     {""}, {""},
-    {"isSatelliteType",998},
+    {"isSatelliteType",999},
     {""},
     {"extractSubset",815},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -4102,7 +4105,7 @@ static const struct grib_keys_hash wordlist[] =
     {""},
     {"longitudeOfIcosahedronPole",1156},
     {""}, {""}, {""}, {""},
-    {"is_aerosol",1000},
+    {"is_aerosol",1001},
     {""}, {""}, {""}, {""},
     {"projectLocalTemplate",1695},
     {""}, {""},
@@ -4136,12 +4139,12 @@ static const struct grib_keys_hash wordlist[] =
     {"verticalVisibility",2291},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {"is_efas",1004},
+    {"is_efas",1005},
     {""}, {""}, {""},
     {"latLonValues",1041},
     {"listOfEnsembleForecastNumbers",1109},
     {""}, {""}, {""},
-    {"is_chemical",1002},
+    {"is_chemical",1003},
     {""},
     {"expandedOriginalReferences",772},
     {""},
@@ -4463,7 +4466,7 @@ static const struct grib_keys_hash wordlist[] =
     {""},
     {"numberOfDataValues",1365},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {"is_aerosol_optical",1001},
+    {"is_aerosol_optical",1002},
     {""}, {""}, {""},
     {"diffInHours",675},
     {""},
@@ -4532,7 +4535,7 @@ static const struct grib_keys_hash wordlist[] =
     {"n2",1304},
     {""}, {""}, {""}, {""}, {""}, {""},
     {"LoVInDegrees",128},
-    {"is_chemical_distfn",1003},
+    {"is_chemical_distfn",1004},
     {""}, {""}, {""}, {""},
     {"jDirectionIncrement",1018},
     {""}, {""},
@@ -4822,7 +4825,7 @@ static const struct grib_keys_hash wordlist[] =
     {""}, {""}, {""}, {""}, {""},
     {"recentWeather",1737},
     {""}, {""}, {""},
-    {"is_ocean3d_param",1006},
+    {"is_ocean3d_param",1007},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {"changeIndicatorTrend1",409},
     {""},
@@ -5178,7 +5181,7 @@ static const struct grib_keys_hash wordlist[] =
     {""}, {""},
     {"jPointsAreConsecutive",1023},
     {""},
-    {"is_ocean2d_param",1005},
+    {"is_ocean2d_param",1006},
     {"firstOrderValues",846},
     {""},
     {"typeOfWavelengthInterval",2209},
@@ -5189,8 +5192,8 @@ static const struct grib_keys_hash wordlist[] =
     {"marsStream2",1214},
     {""}, {""}, {""}, {""},
     {"MinuteOfModelVersion",157},
-    {"is_rotated_grid",1007},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""},
     {"dayOfTheYearDate",650},
     {""},
     {"beginHourTrend3",337},
@@ -5380,7 +5383,8 @@ static const struct grib_keys_hash wordlist[] =
     {"numberOfPointsAlongAMeridian",1410},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {"biFourierResolutionSubSetParameterM",356},
-    {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""},
+    {"isRotatedGrid",997},
     {"sizeOfPostAuxiliaryArray",2018},
     {"endHourTrend3",728},
     {""}, {""}, {""}, {""}, {""},
@@ -9298,7 +9302,9 @@ static const struct grib_keys_hash wordlist[] =
 #endif
 #endif
 const struct grib_keys_hash *
-grib_keys_hash_get (const char* str, unsigned int len)
+grib_keys_hash_get (str, len)
+     register const char *str;
+     register unsigned int len;
 {
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {