Merge release/2.35.0 to master

AUTHORS

@@ -1,6 +1,7 @@
-Enrico Fucile
 Shahram Najm
 Eugen Betke
+Enrico Fucile
+Pedro Maciel
 Sandor Kertesz
 Sebastien Villaume
 Florian Rathgeber

CMakeLists.txt

@@ -73,17 +73,11 @@ endif()
 ###############################################################################
 # some variables/options of this project
 
-if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
-    ecbuild_add_cxx_flags("-Wno-write-strings")
-    ecbuild_add_cxx_flags("-Wno-deprecated")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
-        ecbuild_add_cxx_flags("-Wno-write-strings")
-        ecbuild_add_cxx_flags("-Wno-deprecated")
-    else()
-        ecbuild_add_cxx_flags("-Wno-writable-strings")
-    endif()
-elseif( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
+# ecbuild_add_cxx_flags("-Wno-write-strings" NO_FAIL)
+# ecbuild_add_cxx_flags("-Wno-writable-strings" NO_FAIL)
+# ecbuild_add_cxx_flags("-Wno-deprecated" NO_FAIL)
+
+if( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
     set(CMAKE_CXX_FLAGS "-hstd=c++11 ${CMAKE_CXX_FLAGS}")
 endif()
 
@@ -201,8 +195,8 @@ ecbuild_add_option( FEATURE INSTALL_ECCODES_SAMPLES
 ecbuild_add_option( FEATURE MEMORY_MANAGEMENT   DESCRIPTION "Enable memory management" DEFAULT OFF ADVANCED )
 ecbuild_add_option( FEATURE ALIGN_MEMORY        DESCRIPTION "Enable memory alignment"  DEFAULT OFF ADVANCED )
 ecbuild_add_option( FEATURE TIMER               DESCRIPTION "Enable timer" DEFAULT OFF ADVANCED )
-ecbuild_add_option( FEATURE ECCODES_THREADS     DESCRIPTION "Enable POSIX threads" DEFAULT OFF ADVANCED )
-ecbuild_add_option( FEATURE ECCODES_OMP_THREADS DESCRIPTION "Enable OpenMP threads" DEFAULT OFF ADVANCED )
+ecbuild_add_option( FEATURE ECCODES_THREADS     DESCRIPTION "Enable thread-safety using POSIX threads" DEFAULT OFF ADVANCED )
+ecbuild_add_option( FEATURE ECCODES_OMP_THREADS DESCRIPTION "Enable thread-safety using OpenMP threads" DEFAULT OFF ADVANCED )
 ecbuild_add_option( FEATURE EXTRA_TESTS         DESCRIPTION "Enable extended regression testing" DEFAULT OFF ADVANCED )
 
 ###############################################################################

INSTALL

@@ -33,8 +33,6 @@ However it requires that cmake be installed on your system.
 
 To add the Python3 bindings, use pip3 install from PyPI as follows:
    > pip3 install eccodes
-   or
-   > pip3 install --install-option="--prefix=/path/to/where/you/install/eccodes" eccodes
 
 You can also pass options to the cmake command above. Some typical examples are:
 

README.md

@@ -60,11 +60,6 @@ To add the Python3 bindings, use pip3 install from PyPI as follows:
    ```
    pip3 install eccodes
    ```
-   or
-   ```
-   pip3 install --install-option="--prefix=/path/to/where/you/install/eccodes" eccodes
-   ```
-
 
 For more details, please see:
 https://confluence.ecmwf.int/display/ECC/ecCodes+installation

VERSION

@@ -1 +1 @@
-2.34.3
+2.35.0

bamboo/flags.cmake

@@ -1,3 +1,5 @@
-SET(ENABLE_EXTRA_TESTS     ON CACHE BOOL "Enable extra tests")
-SET(ENABLE_ECCODES_THREADS ON CACHE BOOL "Enable POSIX threads")
-SET(ENABLE_MEMFS           ON CACHE BOOL "Enable MEMFS")
+SET(ENABLE_EXTRA_TESTS          ON  CACHE BOOL "Enable extra tests")
+SET(ECCODES_INSTALL_EXTRA_TOOLS ON  CACHE BOOL "Install extra tools")
+SET(ENABLE_ECCODES_THREADS      ON  CACHE BOOL "Enable POSIX threads")
+SET(ENABLE_MEMFS                ON  CACHE BOOL "Enable MEMFS")
+# SET(ENABLE_JPG_LIBOPENJPEG OFF CACHE BOOL "Disable OpenJPEG")

data/julian.out.good

@@ -62,4 +62,6 @@ Test2...
 - -47120001 -> 6
 
 Test3...
+Test4...
+Test5...
 All OK

definitions/boot.def

@@ -18,12 +18,12 @@ constant defaultTypeOfLevel="unknown" : hidden;
 
 gribDataQualityChecks = getenv("ECCODES_GRIB_DATA_QUALITY_CHECKS","0") : hidden;
 if (gribDataQualityChecks) {
-    template LIMITS "param_limits.def";
+  template LIMITS "param_limits.def";
 }
 
 # GRIBEX special boustrophedonic mode. See GRIB-472
 # If the environment variable is not defined, the key will be 0
-GRIBEX_boustrophedonic = getenv("ECCODES_GRIBEX_BOUSTROPHEDONIC","0")  :hidden;
+GRIBEX_boustrophedonic = getenv("ECCODES_GRIBEX_BOUSTROPHEDONIC","0") :hidden;
 
 constant zero=0 : hidden;
 constant one=1 : hidden;
@@ -61,65 +61,65 @@ transient produceLargeConstantFields = 0 : hidden;
 
 meta libraryVersion library_version() : hidden;
 
-lookup[4] kindOfProduct       (0,identifier) : hidden;
+lookup[4] kindOfProduct (0,identifier) : hidden;
 # grib templates
 # `ABCD` is a number, each letter being a byte
 
 if(kindOfProduct == `GRIB`){
- lookup[1] GRIBEditionNumber  (7,editionNumber)  : edition_specific  ;
- template      GRIB "grib[GRIBEditionNumber:l]/boot.def" ;
+ lookup[1] GRIBEditionNumber (7,editionNumber) : edition_specific;
+ template  GRIB "grib[GRIBEditionNumber:l]/boot.def" ;
 }
 
 if(kindOfProduct == `BUDG` ){
- template      BUDG "budg/boot.def" ;
+ template BUDG "budg/boot.def" ;
 }
 
 if(kindOfProduct == `DIAG`){
- template      DIAG "diag/boot.def" ;
+ template DIAG "diag/boot.def" ;
 }
 
 if(kindOfProduct == `TIDE`){
- template      TIDE "tide/boot.def" ;
+ template TIDE "tide/boot.def" ;
 }
 
 if(kindOfProduct == `BUFR`){
- template      BUFR "bufr/boot.def" ;
- #constant  BUFRstr="BUFR"; #ECC-742
+ template BUFR "bufr/boot.def" ;
+ #constant BUFRstr="BUFR"; #ECC-742
  #alias identifier=BUFRstr;
 }
 
 if(kindOfProduct == `CDFX`){
- template      CDF "cdf/boot.def" ;
- constant  CDFstr="netCDF";
+ template CDF "cdf/boot.def" ;
+ constant CDFstr="netCDF";
  alias ls.identifier=CDFstr;
 }
 
 if(kindOfProduct == 17632522 ){
- template      GTS "gts/boot.def" ;
+ template GTS "gts/boot.def" ;
  constant GTSstr="GTS";
  alias ls.identifier=GTSstr;
 }
 
 if(kindOfProduct == `META` ){
- template      METAR "metar/boot.def" ;
+ template METAR "metar/boot.def" ;
  constant METARstr="METAR";
  alias identifier=METARstr;
 }
 
 if(kindOfProduct == `TAF ` ){
- template      TAF "taf/boot.def" ;
+ template TAF "taf/boot.def" ;
  constant TAFstr="TAF";
  alias ls.identifier=TAFstr;
 }
 
 if(kindOfProduct == 2303214662){
- template      HDF5 "hdf5/boot.def" ;
- constant  HDF5str="HDF5";
+ template HDF5 "hdf5/boot.def" ;
+ constant HDF5str="HDF5";
  alias ls.identifier=HDF5str;
 }
 
 if(kindOfProduct == `WRAP`){
- template      WRAP "wrap/boot.def" ;
- constant  WRAPstr="WRAP";
+ template WRAP "wrap/boot.def" ;
+ constant WRAPstr="WRAP";
  alias ls.identifier=WRAPstr;
 }

definitions/bufr/section.3.def

@@ -51,7 +51,7 @@ unsigned[2]     numberOfSubsets : dump;
 alias ls.numberOfSubsets=numberOfSubsets;
 
 if (section2Present && bufrHeaderCentre==98 && section2Length==52) {
-    if ( rdbType == 2 || rdbType == 3 || rdbType == 8 || rdbType == 12 ) {
+    if ( rdbType == 2 || rdbType == 3 || rdbType == 8 || rdbType == 12 || rdbType == 30 ) {
         transient isSatelliteType=1;
     } else {
         transient isSatelliteType=0;

definitions/common/c-11.table

@@ -2,19 +2,26 @@
 0 0 WMO Secretariat
 1 ammc Melbourne (WMC)
 2 2 Melbourne (WMC)
+3 3 Melbourne (WMC)
 4 rums Moscow (WMC)
 5 5 Moscow (WMC)
+6 6 Moscow (WMC)
 7 kwbc US National Weather Service - NCEP (WMC)
 8 8 US National Weather Service - NWSTG (WMC)
 9 9 US National Weather Service - Other (WMC)
 10 10 Cairo (RSMC/RAFC)
+11 11 Cairo (RSMC/RAFC)
 12 12 Dakar (RSMC/RAFC)
+13 13 Dakar (RSMC/RAFC)
 14 14 Nairobi (RSMC/RAFC)
-16 16 Atananarivo (RSMC)
+15 15 Nairobi (RSMC/RAFC)
+16 16 Casablanca (RSMC)
+17 17 Tunis (RSMC)
 18 18 Tunis-Casablanca (RSMC)
 20 20 Las Palmas (RAFC)
 21 21 Algiers (RSMC)
-22 22 Lagos (RSMC)
+22 22 ACMAD
+23 23 Mozambique (NMC)
 24 fapr Pretoria (RSMC)
 26 26 Khabarovsk (RSMC)
 28 vabb New Delhi (IMD)
@@ -23,27 +30,38 @@
 32 32 Tashkent (RSMC)
 33 33 Jeddah (RSMC)
 34 rjtd Japanese Meteorological Agency - Tokyo (RSMC)
-36 36 Bankok
-37 37 Ulan Bator
+36 36 Bangkok
+37 37 Ulaanbaatar
 38 babj Beijing (RSMC)
 40 rksl Seoul
 41 sabm Buenos Aires (RSMC/RAFC)
 43 43 Brasilia (RSMC/RAFC)
 45 45 Santiago
 46 sbsj Brasilian Space Agency - INPE
+47 47 Colombia (NMC)
+48 48 Ecuador (NMC)
+49 49 Peru (NMC)
+50 50 Venezuela (Bolivarian Republic of) (NMC)
 51 51 Miami (RSMC/RAFC)
 52 52 National Hurricane Center, Miami
 53 53 Canadian Meteorological Service - Montreal (RSMC)
 54 cwao Canadian Meteorological Service - Montreal (RSMC)
 55 55 San Francisco
+56 56 ARINC Centre
 57 57 U.S. Air Force - Global Weather Center
 58 fnmo US Navy - Fleet Numerical Oceanography Center
 59 59 NOAA Forecast Systems Lab, Boulder CO
 60 60 National Center for Atmospheric Research (NCAR), Boulder, CO
+61 61 Service ARGOS - Landover
+62 62 US Naval Oceanographic Office
+63 63 International Research Institute for Climate and Society (IRI)
 64 64 Honolulu
 65 65 Darwin (RSMC)
 67 67 Melbourne (RSMC)
 69 nzkl Wellington (RSMC/RAFC)
+71 71 Nadi (RSMC)
+72 72 Singapore
+73 73 Malaysia (NMC)
 74 egrr U.K. Met Office - Exeter
 76 76 Moscow (RSMC/RAFC)
 78 edzw Offenbach (RSMC)
@@ -65,9 +83,34 @@
 97 97 European Space Agency (ESA)
 98 ecmf European Centre for Medium-Range Weather Forecasts
 99 99 DeBilt, Netherlands
+100 100 Brazzaville
+101 101 Abidjan
+102 102 Libya (NMC)
+103 103 Madagascar (NMC)
+104 104 Mauritius (NMC)
+105 105 Niger (NMC)
+106 106 Seychelles (NMC)
+107 107 Uganda (NMC)
+108 108 United Republic of Tanzania (NMC)
+109 109 Zimbabwe (NMC)
 110 110 Hong-Kong
+145 145 French Guiana
+146 146 Brazilian Navy Hydrographic Centre
+147 147 National Commission on Space Activities (CONAE) - Argentina
+148 148 Brazilian Department of Airspace Control - DECEA
 160 160 US NOAA/NESDIS
+161 161 US NOAA Office of Oceanic and Atmospheric Research
 173 nasa US National Aeronautics and Space Administration (NASA)
+
+174 174 Integrated Science Data Management/Marine Environmental Data Service (ISDM/MEDS - Canada)
+175 175 University Corporation for Atmospheric Research (UCAR) - United States
+176 176 Cooperative Institute for Meteorological Satellite Studies (CIMSS) - United States
+177 177 NOAA National Ocean Service - United States
+178 178 Spire Global, Inc.
+179 179 GeoOptics, Inc.
+180 180 PlanetiQ
+181 181 Atmospheric and Environmental Research (AER)
+
 195 wiix Indonesia (NMC)
 204 niwa  National Institute of Water and Atmospheric Research (NIWA - New Zealand)
 210 210  Frascati (ESA/ESRIN)
@@ -85,6 +128,8 @@
 222 222 Albania (NMC)
 223 223 Armenia (NMC)
 224 lowm Austria
+225 225 Azerbaijan (NMC)
+226 226 Belarus (NMC)
 227 ebum Belgium (NMC)
 228 228 Bosnia and Herzegovina (NMC)
 229 229 Bulgaria (NMC)
@@ -94,6 +139,7 @@
 233 eidb Dublin
 234 234 Israel (NMC)
 235 ingv INGV
+238 238 Lithuania (NMC)
 239 crfc CERFAX
 240 240 Malta (NMC)
 241 241 Monaco

definitions/grib1/localConcepts/ecmf/cfVarName.def

@@ -12659,7 +12659,7 @@
 	 table2Version = 140 ;
 	 indicatorOfParameter = 217 ;
 	}
-#Maximum individual wave height
+#Envelop-maximum individual wave height
 'hmax' = {
 	 table2Version = 140 ;
 	 indicatorOfParameter = 218 ;

definitions/grib1/localConcepts/ecmf/name.def

@@ -12659,8 +12659,8 @@
 	 table2Version = 140 ;
 	 indicatorOfParameter = 217 ;
 	}
-#Maximum individual wave height
-'Maximum individual wave height' = {
+#Envelop-maximum individual wave height
+'Envelop-maximum individual wave height' = {
 	 table2Version = 140 ;
 	 indicatorOfParameter = 218 ;
 	}

definitions/grib1/localConcepts/ecmf/paramId.def

@@ -12659,7 +12659,7 @@
 	 table2Version = 140 ;
 	 indicatorOfParameter = 217 ;
 	}
-#Maximum individual wave height
+#Envelop-maximum individual wave height
 '140218' = {
 	 table2Version = 140 ;
 	 indicatorOfParameter = 218 ;

definitions/grib1/localConcepts/ecmf/shortName.def

@@ -12659,7 +12659,7 @@
 	 table2Version = 140 ;
 	 indicatorOfParameter = 217 ;
 	}
-#Maximum individual wave height
+#Envelop-maximum individual wave height
 'hmax' = {
 	 table2Version = 140 ;
 	 indicatorOfParameter = 218 ;