Merge branch 'ecmwf:develop' into feature/stepConversion

CMakeLists.txt

@@ -195,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

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/grib2/grib2LocalSectionNumber.98.table

@@ -21,6 +21,7 @@
 39 39 4DVar model errors for long window 4Dvar system
 41 41 The Flood Awareness System
 42 42 Lead Centre for Wave Forecast Verification
+43 43 EERIE project MARS labelling
 60 60 Ocean data analysis date and analysis time
 192 192 Multiple ECMWF local definitions
 300 300 Multi-dimensional parameters (deprecated)

definitions/grib2/local.98.28.def

@@ -1,4 +1,6 @@
-# Local Definition 28 - COSMO local area EPS
+# (C) Copyright 2005- ECMWF.
+
+# Local definition 28 - COSMO local area EPS
 
 unsigned[4] baseDateEPS : dump;
 unsigned[2] baseTimeEPS  : dump;

definitions/grib2/local.98.42.def

@@ -1,6 +1,6 @@
 # (C) Copyright 2005- ECMWF.
 
-# Definition 42 - WMO Lead Centre for Wave Forecast Verification (LC-WFV)
+# Local definition 42 - WMO Lead Centre for Wave Forecast Verification (LC-WFV)
 
 codetable[2] lcwfvSuiteName "grib2/lcwfv_suiteName.table" : dump;
 alias mars.origin = lcwfvSuiteName;

definitions/grib2/local.98.43.def

@@ -0,0 +1,21 @@
+# (C) Copyright 2005- ECMWF.
+
+# Local definition 43 - Class ed EERIE project climate keywords
+
+# CMIP related activity keyword
+codetable[2] activity "grib2/destine_activity.table" ;
+alias mars.activity = activity;
+
+# CMIP related experiment keyword
+codetable[2] experiment "grib2/destine_experiment.table" ;
+alias mars.experiment = experiment;
+
+# Climate run realization keyword, which relates to an initial condition perturbation
+unsigned[1] realization = 255 ;
+alias mars.realization = realization;
+
+# Remove mars domain from this data
+unalias mars.domain;
+
+# Add some padding just in case we want more keys in the future
+pad padding_loc43(30);

definitions/grib2/localConcepts/cerise/cfName.def

@@ -0,0 +1,53 @@
+# Automatically generated by ./create_def.pl, do not edit
+#Snow depth
+'lwe_thickness_of_surface_snow_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Large-scale precipitation
+'lwe_thickness_of_stratiform_precipitation_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective precipitation
+'lwe_thickness_of_convective_precipitation_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 195 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowfall
+'lwe_thickness_of_snowfall_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total cloud cover
+'cloud_area_fraction' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Evaporation
+'lwe_thickness_of_water_evaporation_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+}

definitions/grib2/localConcepts/cerise/cfVarName.def

@@ -1,4 +1,106 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Surface runoff
+'sro' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Sub-surface runoff
+'ssro' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snow depth
+'sd' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Large-scale precipitation
+'lsp' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective precipitation
+'cp' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 195 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowfall
+'sf' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total cloud cover
+'tcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Evaporation
+'e' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Low cloud cover
+'lcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	}
+#Runoff
+'ro' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 201 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total precipitation
+'tp' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Forecast albedo
+'fal' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	}
 #Mean surface runoff rate
 'msror' = {
 	 localTablesVersion = 1 ;
@@ -17,6 +119,15 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Potential evaporation
+'pev' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Mean total snowfall rate
 'mtsfr' = {
 	 localTablesVersion = 1 ;

definitions/grib2/localConcepts/cerise/name.def

@@ -1,4 +1,106 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Surface runoff
+'Surface runoff' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Sub-surface runoff
+'Sub-surface runoff' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snow depth
+'Snow depth' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Large-scale precipitation
+'Large-scale precipitation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective precipitation
+'Convective precipitation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 195 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowfall
+'Snowfall' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total cloud cover
+'Total cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Evaporation
+'Evaporation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Low cloud cover
+'Low cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	}
+#Runoff
+'Runoff' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 201 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total precipitation
+'Total precipitation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Forecast albedo
+'Forecast albedo' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	}
 #Mean surface runoff rate
 'Mean surface runoff rate' = {
 	 localTablesVersion = 1 ;
@@ -17,6 +119,15 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Potential evaporation
+'Potential evaporation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Mean total snowfall rate
 'Mean total snowfall rate' = {
 	 localTablesVersion = 1 ;