Merge branch 'develop' into feature/modernisation_merge_accessor_classes

definitions/grib1/data.grid_simple_matrix.def

@@ -114,7 +114,6 @@ if(matrixOfValues == 0)
 
 # From GRIBEX:
 #  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#  !                                                !
 #  ! This is the WMO definition, but it is entirely !
 #  ! inadequate when secondary bit maps are present !
 #  ! eg 3x3 global grid with a matrix of values     !
@@ -129,7 +128,6 @@ if(matrixOfValues == 0)
 #  !      missing').                                !
 #  !     This definition will accommodate a 1x1     !
 #  !     degree global grid.                        !
-#  !                                                !
 #  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #
 	  constant datumSize             = NC*NR;

definitions/grib1/gds_not_present_bitmap.def

@@ -10,7 +10,8 @@ transient numberOfUnusedBitsAtEndOfSection3 = 0 : read_only;
 transient tableReference = 0;
 
 #position offsetBeforeBitmap;
-meta bitmap gds_not_present_bitmap( missingValue,numberOfValues,
+meta bitmap gds_not_present_bitmap(
+    missingValue,numberOfValues,
     numberOfPoints,
     latitudeOfFirstGridPoint,
     Ni,numberOfUnusedBitsAtEndOfSection3) : read_only;

definitions/grib1/grid_definition_192.78.def

@@ -40,6 +40,6 @@ transient numberOfPoints= nd *(Ni + 1) * (Ni + 1);
 alias numberOfDataPoints=numberOfPoints;
 
 meta numberOfValues
-number_of_values(values,bitsPerValue,numberOfDataPoints,
+number_of_values(
+    values,bitsPerValue,numberOfDataPoints,
     bitmapPresent,bitmap,numberOfCodedValues) : dump;
-

definitions/grib1/grid_definition_193.98.def

@@ -79,8 +79,8 @@ if(missing(Ni)){
    nearest latlon_reduced(values,radius,Nj,pl);
 } else {
    transient iteratorDisableUnrotate = 0 : hidden; # ECC-808
-   iterator latlon(numberOfPoints,missingValue,values,longitudeFirstInDegrees,iInc ,
-                   Ni,Nj,iScansNegatively ,
+   iterator latlon(numberOfPoints,missingValue,values,longitudeFirstInDegrees,iInc,
+         Ni,Nj,iScansNegatively,
          latitudeFirstInDegrees,DjInDegrees,jScansPositively,jPointsAreConsecutive,
          isRotatedGrid, angleOfRotation,
          latitudeOfSouthernPoleInDegrees,longitudeOfSouthernPoleInDegrees);

definitions/grib1/predefined_grid.def

@@ -26,7 +26,7 @@ constant dataRepresentationType  = 0;
 # grib 1 -> 2
 constant gridDefinitionTemplateNumber = 0;
 
-# START 1/grid_definition.latitude_longitude_grid ----------------------------------------------------------------------
+# START 1/grid_definition.latitude_longitude_grid
 # GRID DEFINITION latitude/longitude grid (or equidistant cylindrical)
 
 alias numberOfPointsAlongAParallel=Ni;

definitions/grib2/marsLevtypeConcept.def

@@ -8,6 +8,7 @@
 'sfc' = {typeOfFirstFixedSurface=8; typeOfSecondFixedSurface=255;}
 'sfc' = {typeOfFirstFixedSurface=17; typeOfSecondFixedSurface=255;}
 'sfc' = {typeOfFirstFixedSurface=18; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=19; typeOfSecondFixedSurface=255;}
 'o2d' = {discipline=10; typeOfFirstFixedSurface=20; typeOfSecondFixedSurface=255;}
 'sfc' = {typeOfFirstFixedSurface=20; typeOfSecondFixedSurface=255;}
 'pl'  = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=255;}

definitions/grib2/mars_labeling.def

@@ -2,10 +2,11 @@
 
 codetable[2] marsClass  "mars/class.table" = "od" : dump,string_type,lowercase;
 codetable[2] marsType   "mars/type.table" = "an"  : dump,string_type,no_fail,lowercase;
-codetable[2] marsStream "mars/stream.table" = "oper" : dump,string_type,lowercase ;
+codetable[2] marsStream "mars/stream.table" = "oper" : dump,string_type,lowercase;
 ksec1expver[4] experimentVersionNumber = "0001" : dump;
 
-meta class g2_mars_labeling(0,marsClass,
+meta class g2_mars_labeling(
+    0,marsClass,
     marsType,
     marsStream,
     experimentVersionNumber,
@@ -15,7 +16,8 @@ meta class g2_mars_labeling(0,marsClass,
     derivedForecast,
     typeOfGeneratingProcess);
 
-meta type g2_mars_labeling(1,marsClass,
+meta type g2_mars_labeling(
+    1,marsClass,
     marsType,
     marsStream,
     experimentVersionNumber,
@@ -25,7 +27,8 @@ meta type g2_mars_labeling(1,marsClass,
     derivedForecast,
     typeOfGeneratingProcess);
 
-meta stream g2_mars_labeling(2,marsClass,
+meta stream g2_mars_labeling(
+    2,marsClass,
     marsType,
     marsStream,
     experimentVersionNumber,
@@ -41,5 +44,4 @@ alias mars.class  = class;
 alias mars.type   = type;
 alias mars.stream = stream;
 alias mars.expver = experimentVersionNumber;
-
 alias mars.domain = globalDomain; # For now...

definitions/grib2/typeOfLevelConcept.def

@@ -20,6 +20,7 @@
 'neutralBuoyancy'              = {typeOfFirstFixedSurface=16;  typeOfSecondFixedSurface=255;}
 'mostUnstableParcel'           = {typeOfFirstFixedSurface=17;  typeOfSecondFixedSurface=255;}
 'mixedLayerParcel'             = {typeOfFirstFixedSurface=18;  typeOfSecondFixedSurface=255;}
+'lowestLevelOfCloudCoverExceedance' = {typeOfFirstFixedSurface=19; typeOfSecondFixedSurface=255;}
 'isothermal'                   = {typeOfFirstFixedSurface=20;  typeOfSecondFixedSurface=255;}
 'isobaricInPa'                 = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=255; pressureUnits='Pa';}
 'isobaricInhPa'                = {typeOfFirstFixedSurface=100; pressureUnits='hPa'; typeOfSecondFixedSurface=255;}

examples/F90/codes_dump.f90

@@ -31,8 +31,10 @@ program codes_dump_test
       if (iret == CODES_END_OF_FILE) exit
 
       call codes_set_debug(0)
+      call codes_set_data_quality_checks(1)
       call codes_dump(msgid)
       call codes_set_debug(1)
+      call codes_set_data_quality_checks(0)
 
       call codes_release(msgid)
 

src/grib_context.cc

@@ -244,6 +244,7 @@ void grib_context_set_print_proc(grib_context* c, grib_print_proc p)
 void grib_context_set_data_quality_checks(grib_context* c, int val)
 {
     c = c ? c : grib_context_get_default();
+    // If val == 0, disable data quality checks
     // If val == 1, failure results in an error
     // If val == 2, failure results in a warning
     Assert(val == 0 || val == 1 || val == 2);