From 17f590bc78a527f22e07285021e8cb46439f3add Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Thu, 21 Sep 2023 14:11:16 +0000 Subject: [PATCH 1/3] Testing: Add pseudo-centre destine --- definitions/grib2/localConcepts/destine/cfName.def | 9 +++++++++ definitions/grib2/localConcepts/destine/name.def | 9 +++++++++ definitions/grib2/localConcepts/destine/paramId.def | 9 +++++++++ definitions/grib2/localConcepts/destine/shortName.def | 9 +++++++++ definitions/grib2/localConcepts/destine/units.def | 9 +++++++++ tests/grib_check_param_concepts.sh | 3 +++ 6 files changed, 48 insertions(+) create mode 100644 definitions/grib2/localConcepts/destine/cfName.def create mode 100644 definitions/grib2/localConcepts/destine/name.def create mode 100644 definitions/grib2/localConcepts/destine/paramId.def create mode 100644 definitions/grib2/localConcepts/destine/shortName.def create mode 100644 definitions/grib2/localConcepts/destine/units.def diff --git a/definitions/grib2/localConcepts/destine/cfName.def b/definitions/grib2/localConcepts/destine/cfName.def new file mode 100644 index 000000000..e9ed7cabc --- /dev/null +++ b/definitions/grib2/localConcepts/destine/cfName.def @@ -0,0 +1,9 @@ +# Automatically generated by ./create_def.pl, do not edit +#Carbon Dioxide +'mass_fraction_of_carbon_dioxide_in_air' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 3 ; + is_chemical = 1 ; +} diff --git a/definitions/grib2/localConcepts/destine/name.def b/definitions/grib2/localConcepts/destine/name.def new file mode 100644 index 000000000..6a6c16f1b --- /dev/null +++ b/definitions/grib2/localConcepts/destine/name.def @@ -0,0 +1,9 @@ +# Automatically generated by ./create_def.pl, do not edit +#Carbon Dioxide +'Carbon Dioxide' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 3 ; + is_chemical = 1 ; +} diff --git a/definitions/grib2/localConcepts/destine/paramId.def b/definitions/grib2/localConcepts/destine/paramId.def new file mode 100644 index 000000000..e553083dd --- /dev/null +++ b/definitions/grib2/localConcepts/destine/paramId.def @@ -0,0 +1,9 @@ +# Automatically generated by ./create_def.pl, do not edit +#Carbon Dioxide +'210061' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 3 ; + is_chemical = 1 ; +} diff --git a/definitions/grib2/localConcepts/destine/shortName.def b/definitions/grib2/localConcepts/destine/shortName.def new file mode 100644 index 000000000..e4ce474f6 --- /dev/null +++ b/definitions/grib2/localConcepts/destine/shortName.def @@ -0,0 +1,9 @@ +# Automatically generated by ./create_def.pl, do not edit +#Carbon Dioxide +'co2' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 3 ; + is_chemical = 1 ; +} diff --git a/definitions/grib2/localConcepts/destine/units.def b/definitions/grib2/localConcepts/destine/units.def new file mode 100644 index 000000000..78052444a --- /dev/null +++ b/definitions/grib2/localConcepts/destine/units.def @@ -0,0 +1,9 @@ +# Automatically generated by ./create_def.pl, do not edit +#Carbon Dioxide +'kg kg**-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 3 ; + is_chemical = 1 ; +} diff --git a/tests/grib_check_param_concepts.sh b/tests/grib_check_param_concepts.sh index d16fe3135..940762ddc 100755 --- a/tests/grib_check_param_concepts.sh +++ b/tests/grib_check_param_concepts.sh @@ -24,6 +24,8 @@ $EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/gri $EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/tigge/paramId.def $EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/s2s/paramId.def $EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/era6/paramId.def +$EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/destine/paramId.def + $EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/shortName.def $EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/ecmf/shortName.def @@ -32,6 +34,7 @@ $EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/g $EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/tigge/shortName.def $EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/s2s/shortName.def $EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/era6/shortName.def +$EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/destine/shortName.def # Check the group: name.def paramId.def shortName.def units.def cfVarName.def # ---------------------------------------------------------------------------- From ff72b3650996f2f53b3596187e15383c5e717426 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Thu, 21 Sep 2023 14:31:11 +0000 Subject: [PATCH 2/3] ECC-1692 GRIB2: Add Carbon Dioxide parameter encoding to 210061 for pseudo-centre DestinationEarth --- definitions/grib2/localConcepts/destine/paramId.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/grib2/localConcepts/destine/paramId.def b/definitions/grib2/localConcepts/destine/paramId.def index e553083dd..94e564449 100644 --- a/definitions/grib2/localConcepts/destine/paramId.def +++ b/definitions/grib2/localConcepts/destine/paramId.def @@ -1,7 +1,7 @@ # Automatically generated by ./create_def.pl, do not edit #Carbon Dioxide '210061' = { - discipline = 0 ; + discipline = 0 ; parameterCategory = 20 ; parameterNumber = 2 ; constituentType = 3 ; From ee77c57a5de4ddab941a1af9877a98ec6c600009 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Thu, 21 Sep 2023 14:40:48 +0000 Subject: [PATCH 3/3] ECC-1692: GRIB2: Add Carbon Dioxide parameter encoding to 210061 for pseudo-centre DestinationEarth --- definitions/grib1/localConcepts/ecmf/cfVarName.def | 2 +- definitions/grib1/localConcepts/ecmf/name.def | 4 ++-- definitions/grib1/localConcepts/ecmf/paramId.def | 2 +- definitions/grib1/localConcepts/ecmf/shortName.def | 2 +- definitions/grib1/localConcepts/ecmf/units.def | 2 +- definitions/grib2/localConcepts/destine/cfName.def | 2 +- definitions/grib2/localConcepts/destine/name.def | 4 ++-- definitions/grib2/localConcepts/destine/paramId.def | 4 ++-- definitions/grib2/localConcepts/destine/shortName.def | 2 +- definitions/grib2/localConcepts/destine/units.def | 2 +- definitions/grib2/localConcepts/ecmf/cfName.def | 2 +- definitions/grib2/localConcepts/ecmf/cfVarName.def | 2 +- definitions/grib2/localConcepts/ecmf/name.def | 4 ++-- definitions/grib2/localConcepts/ecmf/paramId.def | 2 +- definitions/grib2/localConcepts/ecmf/shortName.def | 2 +- definitions/grib2/localConcepts/ecmf/units.def | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/definitions/grib1/localConcepts/ecmf/cfVarName.def b/definitions/grib1/localConcepts/ecmf/cfVarName.def index 3788ed167..7e4d47596 100644 --- a/definitions/grib1/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib1/localConcepts/ecmf/cfVarName.def @@ -16314,7 +16314,7 @@ table2Version = 210 ; indicatorOfParameter = 54 ; } -#Carbon Dioxide +#Carbon dioxide mass mixing ratio 'co2' = { table2Version = 210 ; indicatorOfParameter = 61 ; diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def index cc9185af2..a406fa1c2 100644 --- a/definitions/grib1/localConcepts/ecmf/name.def +++ b/definitions/grib1/localConcepts/ecmf/name.def @@ -16314,8 +16314,8 @@ table2Version = 210 ; indicatorOfParameter = 54 ; } -#Carbon Dioxide -'Carbon Dioxide' = { +#Carbon dioxide mass mixing ratio +'Carbon dioxide mass mixing ratio' = { table2Version = 210 ; indicatorOfParameter = 61 ; } diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def index 36bd6d1b9..7819fe507 100644 --- a/definitions/grib1/localConcepts/ecmf/paramId.def +++ b/definitions/grib1/localConcepts/ecmf/paramId.def @@ -16314,7 +16314,7 @@ table2Version = 210 ; indicatorOfParameter = 54 ; } -#Carbon Dioxide +#Carbon dioxide mass mixing ratio '210061' = { table2Version = 210 ; indicatorOfParameter = 61 ; diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index fe2df90e9..bf1926b11 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -16314,7 +16314,7 @@ table2Version = 210 ; indicatorOfParameter = 54 ; } -#Carbon Dioxide +#Carbon dioxide mass mixing ratio 'co2' = { table2Version = 210 ; indicatorOfParameter = 61 ; diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def index 97687e8ab..a196126fe 100644 --- a/definitions/grib1/localConcepts/ecmf/units.def +++ b/definitions/grib1/localConcepts/ecmf/units.def @@ -16314,7 +16314,7 @@ table2Version = 210 ; indicatorOfParameter = 54 ; } -#Carbon Dioxide +#Carbon dioxide mass mixing ratio 'kg kg**-1' = { table2Version = 210 ; indicatorOfParameter = 61 ; diff --git a/definitions/grib2/localConcepts/destine/cfName.def b/definitions/grib2/localConcepts/destine/cfName.def index e9ed7cabc..acde985fd 100644 --- a/definitions/grib2/localConcepts/destine/cfName.def +++ b/definitions/grib2/localConcepts/destine/cfName.def @@ -1,5 +1,5 @@ # Automatically generated by ./create_def.pl, do not edit -#Carbon Dioxide +#Carbon dioxide mass mixing ratio 'mass_fraction_of_carbon_dioxide_in_air' = { discipline = 0 ; parameterCategory = 20 ; diff --git a/definitions/grib2/localConcepts/destine/name.def b/definitions/grib2/localConcepts/destine/name.def index 6a6c16f1b..a00484536 100644 --- a/definitions/grib2/localConcepts/destine/name.def +++ b/definitions/grib2/localConcepts/destine/name.def @@ -1,6 +1,6 @@ # Automatically generated by ./create_def.pl, do not edit -#Carbon Dioxide -'Carbon Dioxide' = { +#Carbon dioxide mass mixing ratio +'Carbon dioxide mass mixing ratio' = { discipline = 0 ; parameterCategory = 20 ; parameterNumber = 2 ; diff --git a/definitions/grib2/localConcepts/destine/paramId.def b/definitions/grib2/localConcepts/destine/paramId.def index 94e564449..e9080e6d4 100644 --- a/definitions/grib2/localConcepts/destine/paramId.def +++ b/definitions/grib2/localConcepts/destine/paramId.def @@ -1,7 +1,7 @@ # Automatically generated by ./create_def.pl, do not edit -#Carbon Dioxide +#Carbon dioxide mass mixing ratio '210061' = { - discipline = 0 ; + discipline = 0 ; parameterCategory = 20 ; parameterNumber = 2 ; constituentType = 3 ; diff --git a/definitions/grib2/localConcepts/destine/shortName.def b/definitions/grib2/localConcepts/destine/shortName.def index e4ce474f6..8c26930a3 100644 --- a/definitions/grib2/localConcepts/destine/shortName.def +++ b/definitions/grib2/localConcepts/destine/shortName.def @@ -1,5 +1,5 @@ # Automatically generated by ./create_def.pl, do not edit -#Carbon Dioxide +#Carbon dioxide mass mixing ratio 'co2' = { discipline = 0 ; parameterCategory = 20 ; diff --git a/definitions/grib2/localConcepts/destine/units.def b/definitions/grib2/localConcepts/destine/units.def index 78052444a..b7edf253c 100644 --- a/definitions/grib2/localConcepts/destine/units.def +++ b/definitions/grib2/localConcepts/destine/units.def @@ -1,5 +1,5 @@ # Automatically generated by ./create_def.pl, do not edit -#Carbon Dioxide +#Carbon dioxide mass mixing ratio 'kg kg**-1' = { discipline = 0 ; parameterCategory = 20 ; diff --git a/definitions/grib2/localConcepts/ecmf/cfName.def b/definitions/grib2/localConcepts/ecmf/cfName.def index e347e08e7..f32ddc9a7 100644 --- a/definitions/grib2/localConcepts/ecmf/cfName.def +++ b/definitions/grib2/localConcepts/ecmf/cfName.def @@ -518,7 +518,7 @@ parameterCategory = 151 ; parameterNumber = 154 ; } -#Carbon Dioxide +#Carbon dioxide mass mixing ratio 'mass_fraction_of_carbon_dioxide_in_air' = { discipline = 192 ; parameterCategory = 210 ; diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def index 11b9114f1..8627e2155 100644 --- a/definitions/grib2/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def @@ -20449,7 +20449,7 @@ parameterCategory = 210 ; parameterNumber = 54 ; } -#Carbon Dioxide +#Carbon dioxide mass mixing ratio 'co2' = { discipline = 192 ; parameterCategory = 210 ; diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def index a19566c16..4933de9a0 100644 --- a/definitions/grib2/localConcepts/ecmf/name.def +++ b/definitions/grib2/localConcepts/ecmf/name.def @@ -20449,8 +20449,8 @@ parameterCategory = 210 ; parameterNumber = 54 ; } -#Carbon Dioxide -'Carbon Dioxide' = { +#Carbon dioxide mass mixing ratio +'Carbon dioxide mass mixing ratio' = { discipline = 192 ; parameterCategory = 210 ; parameterNumber = 61 ; diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def index 612bfb714..c038ad987 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.def @@ -20449,7 +20449,7 @@ parameterCategory = 210 ; parameterNumber = 54 ; } -#Carbon Dioxide +#Carbon dioxide mass mixing ratio '210061' = { discipline = 192 ; parameterCategory = 210 ; diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def index 568d0bc15..3a812e21b 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.def @@ -20449,7 +20449,7 @@ parameterCategory = 210 ; parameterNumber = 54 ; } -#Carbon Dioxide +#Carbon dioxide mass mixing ratio 'co2' = { discipline = 192 ; parameterCategory = 210 ; diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def index df75cd083..c875e073f 100644 --- a/definitions/grib2/localConcepts/ecmf/units.def +++ b/definitions/grib2/localConcepts/ecmf/units.def @@ -20449,7 +20449,7 @@ parameterCategory = 210 ; parameterNumber = 54 ; } -#Carbon Dioxide +#Carbon dioxide mass mixing ratio 'kg kg**-1' = { discipline = 192 ; parameterCategory = 210 ;