Check GRIB2 shortName only if parameter discipline was set.

src/ieglib.c

@@ -46,12 +46,9 @@ void iegLibInit(void)
   char *envString = getenv(envName);
   if ( envString )
     {
-      int pos;
-      int nrun;
-      if ( strlen(envString) == 2 ) nrun = 1;
-      else                          nrun = 2;
+      int nrun = (strlen(envString) == 2) ? 1 : 2;
 
-      pos = 0;
+      int pos = 0;
       while ( nrun-- )
 	{
 	  switch ( tolower((int) envString[pos]) )

src/servicelib.c

@@ -61,9 +61,7 @@ void srvLibInit()
   char *envString = getenv(envName);
   if ( envString )
     {
-      int nrun;
-      if ( strlen(envString) == 2 ) nrun = 1;
-      else                          nrun = 2;
+      int nrun = (strlen(envString) == 2) ? 1 : 2;
 
       int pos = 0;
       while ( nrun-- )

src/stream_gribapi.c

@@ -1619,11 +1619,14 @@ void gribapiDefParam(int editionNumber, grib_handle *gh, int param, const char *
     {
       if ( pnum < 0 ) pnum = -pnum;
 
-      static bool lwarn_pnum = true;
-      if ( pnum > 255 && lwarn_pnum )
+      if ( pnum > 255 )
         {
-          Warning("Parameter number %d out of range (1-255), set to %d!", pnum, pnum%256);
-          lwarn_pnum = false;
+          static bool lwarn_pnum = true;
+          if ( lwarn_pnum )
+            {
+              Warning("Parameter number %d out of range (1-255), set to %d!", pnum, pnum%256);
+              lwarn_pnum = false;
+            }
           pnum = pnum%256;
         }
 
@@ -3139,17 +3142,22 @@ size_t gribapiEncode(int varID, int levelID, int vlistID, int gridID, int zaxisI
   *gribbuffersize = recsize;
   *gribbuffer = Malloc(*gribbuffersize);
 
-  if ( ! gc->init )
-    {
-      char cdi_name[CDI_MAX_NAME]; cdi_name[0] = 0;
-      char grb_name[256];          grb_name[0] = 0;
-      vlistInqVarName(vlistID, varID, cdi_name);
-      gribapiGetString(gh, "shortName", grb_name, sizeof(grb_name));
-      str_tolower(cdi_name);
-      str_tolower(grb_name);
-      if ( (strlen(cdi_name) != strlen(grb_name)) || !str_is_equal(cdi_name, grb_name) )
-        Message("*** GRIB2 shortName does not correspond to chosen variable name: \"%s\" (\"%s\").",
-                grb_name[0]?grb_name:"unknown", cdi_name);
+  if ( ! gc->init && editionNumber == 2 )
+    {
+      long pdis;
+      grib_get_long(gh, "discipline", &pdis);
+      if ( pdis != 255 )
+        {
+          char cdi_name[CDI_MAX_NAME]; cdi_name[0] = 0;
+          char grb_name[256];          grb_name[0] = 0;
+          vlistInqVarName(vlistID, varID, cdi_name);
+          gribapiGetString(gh, "shortName", grb_name, sizeof(grb_name));
+          str_tolower(cdi_name);
+          str_tolower(grb_name);
+          if ( (strlen(cdi_name) != strlen(grb_name)) || !str_is_equal(cdi_name, grb_name) )
+            Message("*** GRIB2 shortName does not correspond to chosen variable name: \"%s\" (\"%s\").",
+                    grb_name[0]?grb_name:"unknown", cdi_name);
+        }
     }
 
   /* get a copy of the coded message */