Merge branch 'hotfix/2.31.2'

ecmwf · Sep 1, 2023 · cc1d8e5 · cc1d8e5
2 parents a372a99 + c9706b0
commit cc1d8e5
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.31.1
+2.31.2
diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
@@ -3936,6 +3936,18 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 15 ;
 	}
+#Cloudy reflectance
+'cdrfl' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 31 ;
+	}
+#Clear reflectance
+'crrfl' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 32 ;
+	}
 #Scaled radiance
 'p260530' = {
 	 discipline = 3 ;

diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
@@ -3936,6 +3936,18 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 15 ;
 	}
+#Cloudy reflectance
+'Cloudy reflectance' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 31 ;
+	}
+#Clear reflectance
+'Clear reflectance' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 32 ;
+	}
 #Scaled radiance
 'Scaled radiance' = {
 	 discipline = 3 ;

diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
@@ -3936,6 +3936,18 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 15 ;
 	}
+#Cloudy reflectance
+'260512' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 31 ;
+	}
+#Clear reflectance
+'260513' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 32 ;
+	}
 #Scaled radiance
 '260530' = {
 	 discipline = 3 ;

diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
@@ -3936,6 +3936,18 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 15 ;
 	}
+#Cloudy reflectance
+'cdrfl' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 31 ;
+	}
+#Clear reflectance
+'crrfl' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 32 ;
+	}
 #Scaled radiance
 '~' = {
 	 discipline = 3 ;

diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def
@@ -3936,6 +3936,18 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 15 ;
 	}
+#Cloudy reflectance
+'%' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 31 ;
+	}
+#Clear reflectance
+'%' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 32 ;
+	}
 #Scaled radiance
 'Numeric' = {
 	 discipline = 3 ;

diff --git a/definitions/mars/class.table b/definitions/mars/class.table
@@ -45,6 +45,7 @@
 44 gg Greenhouse Gases
 45 ml Machine learning
 46 d1 Destination Earth
+47 o6 ECMWF Ocean ReAnalysis version 6 (EORA6)
 99 te Test
 100 at Austria
 101 be Belgium

diff --git a/definitions/mars/grib.ocda.tpa.def b/definitions/mars/grib.ocda.tpa.def
@@ -6,3 +6,6 @@ alias mars.time = dataTime;
 
 unalias mars.step;
 alias mars.step = stepRange;
+if (defined(perturbationNumber)) {
+ alias mars.number = perturbationNumber;
+}
diff --git a/src/grib_dumper_class_grib_encode_C.cc b/src/grib_dumper_class_grib_encode_C.cc
@@ -342,7 +342,7 @@ static void dump_values(grib_dumper* d, grib_accessor* a)
     fprintf(self->dumper.out, "    size = %zu;\n", size);
     fprintf(self->dumper.out, "    v%s    = (%s*)calloc(size,sizeof(%s));\n", stype, stype, stype);
     fprintf(self->dumper.out, "    if(!v%s) {\n", stype);
-    fprintf(self->dumper.out, "        fprintf(stderr,\"failed to allocate %%d bytes\\n\",size*sizeof(%s));\n", stype);
+    fprintf(self->dumper.out, "        fprintf(stderr,\"failed to allocate %%zu bytes\\n\",size*sizeof(%s));\n", stype);
     fprintf(self->dumper.out, "        exit(1);\n");
     fprintf(self->dumper.out, "    }\n");