Introduce tablesVersion=2 to allow to use local paramId and WMO/local chemId together

definitions/grib2/localConcepts/ecmf/cfVarName.def

@@ -14162,6 +14162,74 @@
 	 parameterCategory = 20 ;
 	 parameterNumber = 192 ;
 	}
+#Volume-mean total column mixing ratio
+'vm_tc_vol_mixrat' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 195 ;
+	}
+#Emission mass flux from vegetation
+'emi_mflx_veg' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 192 ;
+	}
+#Emission mass flux from biomass burning
+'emi_mflx_biomburn' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 193 ;
+	}
+#Emission mass flux from settlements
+'emi_mflx_settl' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 194 ;
+	}
+#Emission mass flux from soil
+'emi_mflx_soil' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 195 ;
+	}
+#Emission mass flux from wild animals
+'emi_mflx_wildanim' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 196 ;
+	}
+#Aerosol negative fixer mass flux
+'aer_negfix_mflx' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 193 ;
+	}
+#Aerosol sink/loss mass flux
+'aer_sink_mflx' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 194 ;
+	}
+#Aerosol source/gain mass flux
+'aer_src_mflx' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 192 ;
+	}
 #Stream function gradient
 'strfgrd' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/chemFormula.def

@@ -81,12 +81,12 @@
 #Lumped alkenes
 'BIGENE' = {
 	constituentType = 60010 ;
-	localTablesVersion = 1 ;
+	localTablesVersion = 2 ;
 	}
 #Lumped alkanes
 'BIGALK' = {
 	constituentType = 60009 ;
-	localTablesVersion = 1 ;
+	localTablesVersion = 2 ;
 	}
 #Hydrogen atom
 'h_c' = {

definitions/grib2/localConcepts/ecmf/chemId.def

@@ -81,12 +81,12 @@
 #Lumped alkenes
 '124' = {
 	constituentType = 60010 ;
-	localTablesVersion = 1 ;
+	localTablesVersion = 2 ;
 	}
 #Lumped alkanes
 '126' = {
 	constituentType = 60009 ;
-	localTablesVersion = 1 ;
+	localTablesVersion = 2 ;
 	}
 #Hydrogen atom
 '177' = {

definitions/grib2/localConcepts/ecmf/chemName.def

@@ -81,12 +81,12 @@
 #Lumped alkenes
 'Lumped alkenes' = {
 	constituentType = 60010 ;
-	localTablesVersion = 1 ;
+	localTablesVersion = 2 ;
 	}
 #Lumped alkanes
 'Lumped alkanes' = {
 	constituentType = 60009 ;
-	localTablesVersion = 1 ;
+	localTablesVersion = 2 ;
 	}
 #Hydrogen atom
 'Hydrogen atom' = {

definitions/grib2/localConcepts/ecmf/chemShortName.def

@@ -81,12 +81,12 @@
 #Lumped alkenes
 'BIGENE' = {
 	constituentType = 60010 ;
-	localTablesVersion = 1 ;
+	localTablesVersion = 2 ;
 	}
 #Lumped alkanes
 'BIGALK' = {
 	constituentType = 60009 ;
-	localTablesVersion = 1 ;
+	localTablesVersion = 2 ;
 	}
 #Hydrogen atom
 'h_c' = {

definitions/grib2/localConcepts/ecmf/name.def

@@ -14162,6 +14162,74 @@
 	 parameterCategory = 20 ;
 	 parameterNumber = 192 ;
 	}
+#Volume-mean total column mixing ratio
+'Volume-mean total column mixing ratio' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 195 ;
+	}
+#Emission mass flux from vegetation
+'Emission mass flux from vegetation' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 192 ;
+	}
+#Emission mass flux from biomass burning
+'Emission mass flux from biomass burning' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 193 ;
+	}
+#Emission mass flux from settlements
+'Emission mass flux from settlements' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 194 ;
+	}
+#Emission mass flux from soil
+'Emission mass flux from soil' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 195 ;
+	}
+#Emission mass flux from wild animals
+'Emission mass flux from wild animals' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 196 ;
+	}
+#Aerosol negative fixer mass flux
+'Aerosol negative fixer mass flux' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 193 ;
+	}
+#Aerosol sink/loss mass flux
+'Aerosol sink/loss mass flux' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 194 ;
+	}
+#Aerosol source/gain mass flux
+'Aerosol source/gain mass flux' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 192 ;
+	}
 #Stream function gradient
 'Stream function gradient' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/paramId.def

@@ -14162,6 +14162,74 @@
 	 parameterCategory = 20 ;
 	 parameterNumber = 192 ;
 	}
+#Volume-mean total column mixing ratio
+'409000' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 195 ;
+	}
+#Emission mass flux from vegetation
+'412000' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 192 ;
+	}
+#Emission mass flux from biomass burning
+'417000' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 193 ;
+	}
+#Emission mass flux from settlements
+'432000' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 194 ;
+	}
+#Emission mass flux from soil
+'442000' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 195 ;
+	}
+#Emission mass flux from wild animals
+'443000' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 196 ;
+	}
+#Aerosol negative fixer mass flux
+'451000' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 193 ;
+	}
+#Aerosol sink/loss mass flux
+'452000' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 194 ;
+	}
+#Aerosol source/gain mass flux
+'453000' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 192 ;
+	}
 #Stream function gradient
 '129001' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/shortName.def

@@ -14162,6 +14162,74 @@
 	 parameterCategory = 20 ;
 	 parameterNumber = 192 ;
 	}
+#Volume-mean total column mixing ratio
+'vm_tc_vol_mixrat' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 195 ;
+	}
+#Emission mass flux from vegetation
+'emi_mflx_veg' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 192 ;
+	}
+#Emission mass flux from biomass burning
+'emi_mflx_biomburn' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 193 ;
+	}
+#Emission mass flux from settlements
+'emi_mflx_settl' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 194 ;
+	}
+#Emission mass flux from soil
+'emi_mflx_soil' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 195 ;
+	}
+#Emission mass flux from wild animals
+'emi_mflx_wildanim' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 196 ;
+	}
+#Aerosol negative fixer mass flux
+'aer_negfix_mflx' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 193 ;
+	}
+#Aerosol sink/loss mass flux
+'aer_sink_mflx' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 194 ;
+	}
+#Aerosol source/gain mass flux
+'aer_src_mflx' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 192 ;
+	}
 #Stream function gradient
 'strfgrd' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/units.def

@@ -14162,6 +14162,74 @@
 	 parameterCategory = 20 ;
 	 parameterNumber = 192 ;
 	}
+#Volume-mean total column mixing ratio
+'mol mol**-1' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 195 ;
+	}
+#Emission mass flux from vegetation
+'kg m**-2 s**-1' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 192 ;
+	}
+#Emission mass flux from biomass burning
+'kg m**-2 s**-1' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 193 ;
+	}
+#Emission mass flux from settlements
+'kg m**-2 s**-1' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 194 ;
+	}
+#Emission mass flux from soil
+'kg m**-2 s**-1' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 195 ;
+	}
+#Emission mass flux from wild animals
+'kg m**-2 s**-1' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 196 ;
+	}
+#Aerosol negative fixer mass flux
+'kg m**-2 s**-1' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 193 ;
+	}
+#Aerosol sink/loss mass flux
+'kg m**-2 s**-1' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 194 ;
+	}
+#Aerosol source/gain mass flux
+'kg m**-2 s**-1' = {
+	 localTablesVersion = 2 ;
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 192 ;
+	}
 #Stream function gradient
 'm**2 s**-1' = {
 	 discipline = 192 ;

definitions/grib2/tables/local/ecmf/1.1.table

@@ -3,4 +3,5 @@
 # . Only table entries and templates from the current Master table are valid.
 # 1-254 Number of local tables version used
 1 1 ECMWF local tables version 1
+2 2 ECMWF local tables version 2
 255 255 Missing

definitions/grib2/tables/local/ecmf/2/4.2.0.20.table

@@ -0,0 +1,5 @@
+# Code table 4.2 - discipline=0 category=20 for ECMWF
+192 192 Source/gain (kg m-2 s-1)
+193 193 Negative Fixer (kg m-2 s-1)
+194 194 Aerosol sink/loss mass flux (kg m**-2 s**-1)
+195 195 Volume-mean total column mixing ratio (mol mol**-1)