diff --git a/definitions/grib1/localConcepts/ecmf/cfName.def b/definitions/grib1/localConcepts/ecmf/cfName.def index 24be76fe6..6758e1fd6 100644 --- a/definitions/grib1/localConcepts/ecmf/cfName.def +++ b/definitions/grib1/localConcepts/ecmf/cfName.def @@ -164,12 +164,12 @@ table2Version = 170 ; indicatorOfParameter = 135 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = { table2Version = 128 ; indicatorOfParameter = 137 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = { table2Version = 180 ; indicatorOfParameter = 137 ; diff --git a/definitions/grib1/localConcepts/ecmf/cfVarName.def b/definitions/grib1/localConcepts/ecmf/cfVarName.def index 8093e74e8..e139af08d 100644 --- a/definitions/grib1/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib1/localConcepts/ecmf/cfVarName.def @@ -869,12 +869,12 @@ table2Version = 160 ; indicatorOfParameter = 136 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'tcwv' = { table2Version = 128 ; indicatorOfParameter = 137 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'tcwv' = { table2Version = 180 ; indicatorOfParameter = 137 ; diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def index 408a5a0a2..b8da18e68 100644 --- a/definitions/grib1/localConcepts/ecmf/name.def +++ b/definitions/grib1/localConcepts/ecmf/name.def @@ -869,13 +869,13 @@ table2Version = 160 ; indicatorOfParameter = 136 ; } -#Total column water vapour -'Total column water vapour' = { +#Total column vertically-integrated water vapour +'Total column vertically-integrated water vapour' = { table2Version = 128 ; indicatorOfParameter = 137 ; } -#Total column water vapour -'Total column water vapour' = { +#Total column vertically-integrated water vapour +'Total column vertically-integrated water vapour' = { table2Version = 180 ; indicatorOfParameter = 137 ; } diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def index 9ee4800e4..e84689c28 100644 --- a/definitions/grib1/localConcepts/ecmf/paramId.def +++ b/definitions/grib1/localConcepts/ecmf/paramId.def @@ -869,12 +869,12 @@ table2Version = 160 ; indicatorOfParameter = 136 ; } -#Total column water vapour +#Total column vertically-integrated water vapour '137' = { table2Version = 128 ; indicatorOfParameter = 137 ; } -#Total column water vapour +#Total column vertically-integrated water vapour '137' = { table2Version = 180 ; indicatorOfParameter = 137 ; diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index a7a3acdc6..e35c97f62 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -869,12 +869,12 @@ table2Version = 160 ; indicatorOfParameter = 136 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'tcwv' = { table2Version = 128 ; indicatorOfParameter = 137 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'tcwv' = { table2Version = 180 ; indicatorOfParameter = 137 ; diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def index dcfe1371a..e704a0750 100644 --- a/definitions/grib1/localConcepts/ecmf/units.def +++ b/definitions/grib1/localConcepts/ecmf/units.def @@ -869,12 +869,12 @@ table2Version = 160 ; indicatorOfParameter = 136 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'kg m**-2' = { table2Version = 128 ; indicatorOfParameter = 137 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'kg m**-2' = { table2Version = 180 ; indicatorOfParameter = 137 ; diff --git a/definitions/grib1/localConcepts/rjtd/cfVarName.def b/definitions/grib1/localConcepts/rjtd/cfVarName.def index d91932f9b..30832fee8 100644 --- a/definitions/grib1/localConcepts/rjtd/cfVarName.def +++ b/definitions/grib1/localConcepts/rjtd/cfVarName.def @@ -85,7 +85,7 @@ table2Version = 200 ; indicatorOfParameter = 39 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'tcwv' = { table2Version = 200 ; indicatorOfParameter = 54 ; diff --git a/definitions/grib1/localConcepts/rjtd/name.def b/definitions/grib1/localConcepts/rjtd/name.def index bd139be7c..f8135ed56 100644 --- a/definitions/grib1/localConcepts/rjtd/name.def +++ b/definitions/grib1/localConcepts/rjtd/name.def @@ -85,8 +85,8 @@ table2Version = 200 ; indicatorOfParameter = 39 ; } -#Total column water vapour -'Total column water vapour' = { +#Total column vertically-integrated water vapour +'Total column vertically-integrated water vapour' = { table2Version = 200 ; indicatorOfParameter = 54 ; } diff --git a/definitions/grib1/localConcepts/rjtd/paramId.def b/definitions/grib1/localConcepts/rjtd/paramId.def index 300ecdf85..6f9406a17 100644 --- a/definitions/grib1/localConcepts/rjtd/paramId.def +++ b/definitions/grib1/localConcepts/rjtd/paramId.def @@ -85,7 +85,7 @@ table2Version = 200 ; indicatorOfParameter = 39 ; } -#Total column water vapour +#Total column vertically-integrated water vapour '137' = { table2Version = 200 ; indicatorOfParameter = 54 ; diff --git a/definitions/grib1/localConcepts/rjtd/shortName.def b/definitions/grib1/localConcepts/rjtd/shortName.def index b65dce323..1118423f2 100644 --- a/definitions/grib1/localConcepts/rjtd/shortName.def +++ b/definitions/grib1/localConcepts/rjtd/shortName.def @@ -85,7 +85,7 @@ table2Version = 200 ; indicatorOfParameter = 39 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'tcwv' = { table2Version = 200 ; indicatorOfParameter = 54 ; diff --git a/definitions/grib1/localConcepts/rjtd/units.def b/definitions/grib1/localConcepts/rjtd/units.def index 9e951ab1a..a70158e2a 100644 --- a/definitions/grib1/localConcepts/rjtd/units.def +++ b/definitions/grib1/localConcepts/rjtd/units.def @@ -85,7 +85,7 @@ table2Version = 200 ; indicatorOfParameter = 39 ; } -#Total column water vapour +#Total column vertically-integrated water vapour 'kg m**-2' = { table2Version = 200 ; indicatorOfParameter = 54 ; diff --git a/definitions/grib2/cfName.def b/definitions/grib2/cfName.def index 61f003516..3a7efb24b 100644 --- a/definitions/grib2/cfName.def +++ b/definitions/grib2/cfName.def @@ -5,6 +5,12 @@ parameterCategory = 2 ; parameterNumber = 0 ; } +#Total column vertically-integrated water vapour +'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #Surface solar radiation downwards 'surface_downwelling_shortwave_flux_in_air' = { discipline = 0 ; diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index 37b1eb839..1e143a3bf 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -199,6 +199,12 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Total column vertically-integrated water vapour +'tcwv' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #Surface solar radiation downwards 'ssrd' = { discipline = 0 ; @@ -4152,12 +4158,6 @@ parameterCategory = 1 ; parameterNumber = 13 ; } -#Total column integrated water vapour -'tciwv' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 64 ; - } #Rain precipitation rate 'rprate' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/ecmf/cfName.def b/definitions/grib2/localConcepts/ecmf/cfName.def index 8bfd92122..759542767 100644 --- a/definitions/grib2/localConcepts/ecmf/cfName.def +++ b/definitions/grib2/localConcepts/ecmf/cfName.def @@ -1,10 +1,4 @@ # Automatically generated by ./create_def.pl, do not edit -#Total column water vapour -'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 137 ; - } #Soil temperature level 1 'surface_temperature' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/cfName.legacy.def b/definitions/grib2/localConcepts/ecmf/cfName.legacy.def index 5716da4a0..40921db07 100644 --- a/definitions/grib2/localConcepts/ecmf/cfName.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/cfName.legacy.def @@ -106,3 +106,9 @@ parameterCategory = 210 ; parameterNumber = 74 ; } +#Total column vertically-integrated water vapour +'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 137 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def index 42afc420b..5eacadcfb 100644 --- a/definitions/grib2/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def @@ -671,12 +671,6 @@ parameterCategory = 128 ; parameterNumber = 128 ; } -#Total column water vapour -'tcwv' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 137 ; - } #Soil temperature level 1 'stl1' = { discipline = 192 ; @@ -922,9 +916,11 @@ } #Runoff 'ro' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 205 ; + localTablesVersion = 1 ; + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 201 ; + typeOfStatisticalProcessing = 1 ; } #Total column ozone 'tco3' = { @@ -1042,12 +1038,13 @@ } #Total precipitation 'tp' = { + localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 1 ; - parameterNumber = 52 ; + parameterNumber = 193 ; typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 255 ; typeOfStatisticalProcessing = 1 ; - unitsFactor = 1000 ; } #Instantaneous eastward turbulent surface stress 'iews' = { diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def b/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def index 14091ee51..3483a32a4 100644 --- a/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def @@ -322,3 +322,15 @@ parameterCategory = 210 ; parameterNumber = 74 ; } +#Runoff +'ro' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 205 ; +} +#Total column vertically-integrated water vapour +'tcwv' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 137 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def index 3d50050de..7059df37d 100644 --- a/definitions/grib2/localConcepts/ecmf/name.def +++ b/definitions/grib2/localConcepts/ecmf/name.def @@ -671,12 +671,6 @@ parameterCategory = 128 ; parameterNumber = 128 ; } -#Total column water vapour -'Total column water vapour' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 137 ; - } #Soil temperature level 1 'Soil temperature level 1' = { discipline = 192 ; @@ -922,9 +916,11 @@ } #Runoff 'Runoff' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 205 ; + localTablesVersion = 1 ; + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 201 ; + typeOfStatisticalProcessing = 1 ; } #Total column ozone 'Total column ozone' = { @@ -1042,12 +1038,13 @@ } #Total precipitation 'Total precipitation' = { + localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 1 ; - parameterNumber = 52 ; + parameterNumber = 193 ; typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 255 ; typeOfStatisticalProcessing = 1 ; - unitsFactor = 1000 ; } #Instantaneous eastward turbulent surface stress 'Instantaneous eastward turbulent surface stress' = { diff --git a/definitions/grib2/localConcepts/ecmf/name.legacy.def b/definitions/grib2/localConcepts/ecmf/name.legacy.def index 7af957339..06e97a813 100644 --- a/definitions/grib2/localConcepts/ecmf/name.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/name.legacy.def @@ -322,3 +322,15 @@ parameterCategory = 210 ; parameterNumber = 74 ; } +#Runoff +'Runoff' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 205 ; +} +#Total column vertically-integrated water vapour +'Total column vertically-integrated water vapour' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 137 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def index bc24f9edf..0a755d9ca 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.def @@ -671,12 +671,6 @@ parameterCategory = 128 ; parameterNumber = 128 ; } -#Total column water vapour -'137' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 137 ; - } #Soil temperature level 1 '139' = { discipline = 192 ; @@ -922,9 +916,11 @@ } #Runoff '205' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 205 ; + localTablesVersion = 1 ; + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 201 ; + typeOfStatisticalProcessing = 1 ; } #Total column ozone '206' = { @@ -1042,12 +1038,13 @@ } #Total precipitation '228' = { + localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 1 ; - parameterNumber = 52 ; + parameterNumber = 193 ; typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 255 ; typeOfStatisticalProcessing = 1 ; - unitsFactor = 1000 ; } #Instantaneous eastward turbulent surface stress '229' = { diff --git a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def index 2f495f888..9156fc038 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def @@ -322,3 +322,15 @@ parameterCategory = 210 ; parameterNumber = 74 ; } +#Runoff +'205' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 205 ; +} +#Total column vertically-integrated water vapour +'137' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 137 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def index 93ed4b4ba..5ebd52ff4 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.def @@ -671,12 +671,6 @@ parameterCategory = 128 ; parameterNumber = 128 ; } -#Total column water vapour -'tcwv' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 137 ; - } #Soil temperature level 1 'stl1' = { discipline = 192 ; @@ -922,9 +916,11 @@ } #Runoff 'ro' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 205 ; + localTablesVersion = 1 ; + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 201 ; + typeOfStatisticalProcessing = 1 ; } #Total column ozone 'tco3' = { @@ -1042,12 +1038,13 @@ } #Total precipitation 'tp' = { + localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 1 ; - parameterNumber = 52 ; + parameterNumber = 193 ; typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 255 ; typeOfStatisticalProcessing = 1 ; - unitsFactor = 1000 ; } #Instantaneous eastward turbulent surface stress 'iews' = { diff --git a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def index 378f29473..d74e426b1 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def @@ -322,3 +322,15 @@ parameterCategory = 210 ; parameterNumber = 74 ; } +#Runoff +'ro' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 205 ; +} +#Total column vertically-integrated water vapour +'tcwv' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 137 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def index 8e39b57b0..9aa6a6025 100644 --- a/definitions/grib2/localConcepts/ecmf/units.def +++ b/definitions/grib2/localConcepts/ecmf/units.def @@ -671,12 +671,6 @@ parameterCategory = 128 ; parameterNumber = 128 ; } -#Total column water vapour -'kg m**-2' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 137 ; - } #Soil temperature level 1 'K' = { discipline = 192 ; @@ -922,9 +916,11 @@ } #Runoff 'm' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 205 ; + localTablesVersion = 1 ; + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 201 ; + typeOfStatisticalProcessing = 1 ; } #Total column ozone 'kg m**-2' = { @@ -1042,12 +1038,13 @@ } #Total precipitation 'm' = { + localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 1 ; - parameterNumber = 52 ; + parameterNumber = 193 ; typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 255 ; typeOfStatisticalProcessing = 1 ; - unitsFactor = 1000 ; } #Instantaneous eastward turbulent surface stress 'N m**-2' = { diff --git a/definitions/grib2/localConcepts/ecmf/units.legacy.def b/definitions/grib2/localConcepts/ecmf/units.legacy.def index fa2013b58..43543ca0e 100644 --- a/definitions/grib2/localConcepts/ecmf/units.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/units.legacy.def @@ -322,3 +322,15 @@ parameterCategory = 210 ; parameterNumber = 74 ; } +#Runoff +'m' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 205 ; +} +#Total column vertically-integrated water vapour +'kg m**-2' = { + discipline = 192 ; + parameterCategory = 128 ; + parameterNumber = 137 ; +} diff --git a/definitions/grib2/localConcepts/uerra/cfVarName.def b/definitions/grib2/localConcepts/uerra/cfVarName.def index dad2760fc..e7b0c35c1 100644 --- a/definitions/grib2/localConcepts/uerra/cfVarName.def +++ b/definitions/grib2/localConcepts/uerra/cfVarName.def @@ -90,6 +90,12 @@ scaleFactorOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 3 ; } +#Total column integrated water vapour +'tciwv' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #2 metre relative humidity 'r2' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/uerra/name.def b/definitions/grib2/localConcepts/uerra/name.def index bd2aa0b2a..d402dec3a 100644 --- a/definitions/grib2/localConcepts/uerra/name.def +++ b/definitions/grib2/localConcepts/uerra/name.def @@ -90,6 +90,12 @@ scaleFactorOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 3 ; } +#Total column integrated water vapour +'Total column integrated water vapour' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #2 metre relative humidity '2 metre relative humidity' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/uerra/paramId.def b/definitions/grib2/localConcepts/uerra/paramId.def index 373960eea..f77ef2457 100644 --- a/definitions/grib2/localConcepts/uerra/paramId.def +++ b/definitions/grib2/localConcepts/uerra/paramId.def @@ -90,6 +90,12 @@ scaleFactorOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 3 ; } +#Total column integrated water vapour +'260057' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #2 metre relative humidity '260242' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/uerra/shortName.def b/definitions/grib2/localConcepts/uerra/shortName.def index 30852f792..083669314 100644 --- a/definitions/grib2/localConcepts/uerra/shortName.def +++ b/definitions/grib2/localConcepts/uerra/shortName.def @@ -90,6 +90,12 @@ scaleFactorOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 3 ; } +#Total column integrated water vapour +'tciwv' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #2 metre relative humidity '2r' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/uerra/units.def b/definitions/grib2/localConcepts/uerra/units.def index ff8a48918..b48890eb3 100644 --- a/definitions/grib2/localConcepts/uerra/units.def +++ b/definitions/grib2/localConcepts/uerra/units.def @@ -90,6 +90,12 @@ scaleFactorOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 3 ; } +#Total column integrated water vapour +'kg m**-2' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #2 metre relative humidity '%' = { discipline = 0 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index c733412ab..53da51bfb 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -199,6 +199,12 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Total column vertically-integrated water vapour +'Total column vertically-integrated water vapour' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #Surface solar radiation downwards 'Surface solar radiation downwards' = { discipline = 0 ; @@ -4152,12 +4158,6 @@ parameterCategory = 1 ; parameterNumber = 13 ; } -#Total column integrated water vapour -'Total column integrated water vapour' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 64 ; - } #Rain precipitation rate 'Rain precipitation rate' = { discipline = 0 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 2f3f1fb54..7795ed814 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -199,6 +199,12 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Total column vertically-integrated water vapour +'137' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #Surface solar radiation downwards '169' = { discipline = 0 ; @@ -4152,12 +4158,6 @@ parameterCategory = 1 ; parameterNumber = 13 ; } -#Total column integrated water vapour -'260057' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 64 ; - } #Rain precipitation rate '260058' = { discipline = 0 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index beeae73af..107af96c7 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -199,6 +199,12 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Total column vertically-integrated water vapour +'tcwv' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #Surface solar radiation downwards 'ssrd' = { discipline = 0 ; @@ -4152,12 +4158,6 @@ parameterCategory = 1 ; parameterNumber = 13 ; } -#Total column integrated water vapour -'tciwv' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 64 ; - } #Rain precipitation rate 'rprate' = { discipline = 0 ; diff --git a/definitions/grib2/tables/local/ecmf/1/4.2.0.1.table b/definitions/grib2/tables/local/ecmf/1/4.2.0.1.table index bf525b287..387f915de 100644 --- a/definitions/grib2/tables/local/ecmf/1/4.2.0.1.table +++ b/definitions/grib2/tables/local/ecmf/1/4.2.0.1.table @@ -1,3 +1,3 @@ # Code table 4.2 - discipline=0 category=1 for ECMWF 192 192 Snow evaporation rate (kg m-2 s-1) - +193 193 Total precipitation (m) diff --git a/definitions/grib2/tables/local/ecmf/1/4.2.2.0.table b/definitions/grib2/tables/local/ecmf/1/4.2.2.0.table index d9bc80cf6..97f95b595 100644 --- a/definitions/grib2/tables/local/ecmf/1/4.2.2.0.table +++ b/definitions/grib2/tables/local/ecmf/1/4.2.2.0.table @@ -8,4 +8,5 @@ 198 198 GPP coefficient from Biogenic Flux Adjustment System 199 199 Rec coefficient from Biogenic Flux Adjustment System 200 200 Surface roughness length for heat (m) +201 201 Water runoff (m) 255 255 Missing diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 3774e3501..f34b21706 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -199,6 +199,12 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Total column vertically-integrated water vapour +'kg m**-2' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 64 ; + } #Surface solar radiation downwards 'J m**-2' = { discipline = 0 ; @@ -4152,12 +4158,6 @@ parameterCategory = 1 ; parameterNumber = 13 ; } -#Total column integrated water vapour -'kg m**-2' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 64 ; - } #Rain precipitation rate 'kg m**-2 s**-1' = { discipline = 0 ; diff --git a/tests/grib1to2.sh b/tests/grib1to2.sh index 74140cc32..5f98013a4 100755 --- a/tests/grib1to2.sh +++ b/tests/grib1to2.sh @@ -50,13 +50,15 @@ do done -echo "ECC-457 ECMWF total precipitation..." -# ----------------------------------------- +echo "ECC-457,ECC-1298 ECMWF total precipitation..." +# --------------------------------------------------- input=${data_dir}/tp_ecmwf.grib output=temp.grib1to2.grib ${tools_dir}/grib_set -s edition=2 $input $output res=`${tools_dir}/grib_get -w count=1 -p edition,paramId,units $output` -[ "$res" = "2 228228 kg m**-2" ] +[ "$res" = "2 228 m" ] +res=`${tools_dir}/grib_get -w count=1 -p stepType $output` +[ "$res" = "accum" ] rm -f $output