From 2750e7d921b5652ec76e6779f42df2e245eab214 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 19 May 2021 17:40:44 +0100
Subject: [PATCH] ECC-1245: GRIB: Add typeOfPostProcessing for 'geff' to
 efas_post_proc

---
 definitions/grib2/local.98.41.def | 33 ++++++++++++++++---------------
 tests/grib_efas.sh                |  5 +++++
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/definitions/grib2/local.98.41.def b/definitions/grib2/local.98.41.def
index d502299f2..b15b31cb1 100644
--- a/definitions/grib2/local.98.41.def
+++ b/definitions/grib2/local.98.41.def
@@ -40,22 +40,23 @@ transient lsdate_bug = 1: hidden; # See ECC-707
 
 # Note: the key typeOfPostProcessing is in the PDTNs 70, 71, 72 and 73
 concept efas_post_proc {
-  "unknown"           = { typeOfPostProcessing=0  ; }
-  "lisflood"          = { typeOfPostProcessing=1  ; }
-  "lisflood_eric"     = { typeOfPostProcessing=2  ; }
-  "lisflood_season"   = { typeOfPostProcessing=3  ; }
-  "lisflood_merged"   = { typeOfPostProcessing=4  ; }
-  "lisflood_global"   = { typeOfPostProcessing=5  ; }
-  "ericha"            = { typeOfPostProcessing=51 ; }
-  "htessel_lisflood"  = { typeOfPostProcessing=101; }
-  "htessel_eric"      = { typeOfPostProcessing=102; }
-  "htessel_camaflood" = { typeOfPostProcessing=103; }
-  "epic"              = { typeOfPostProcessing=152; }
-  "jules_mrm"         = { typeOfPostProcessing=201; }
-  "htessel_mrm"       = { typeOfPostProcessing=202; }
-  "mhm_mrm"           = { typeOfPostProcessing=203; }
-  "pcrg_mrm"          = { typeOfPostProcessing=204; }
-  "meteogrid"         = { typeOfPostProcessing=205; }
+  "unknown"           = { typeOfPostProcessing = 0; }
+  "lisflood"          = { typeOfPostProcessing = 1; }
+  "lisflood_eric"     = { typeOfPostProcessing = 2; }
+  "lisflood_season"   = { typeOfPostProcessing = 3; }
+  "lisflood_merged"   = { typeOfPostProcessing = 4; }
+  "lisflood_global"   = { typeOfPostProcessing = 5; }
+  "geff"              = { typeOfPostProcessing = 10; }
+  "ericha"            = { typeOfPostProcessing = 51; }
+  "htessel_lisflood"  = { typeOfPostProcessing = 101; }
+  "htessel_eric"      = { typeOfPostProcessing = 102; }
+  "htessel_camaflood" = { typeOfPostProcessing = 103; }
+  "epic"              = { typeOfPostProcessing = 152; }
+  "jules_mrm"         = { typeOfPostProcessing = 201; }
+  "htessel_mrm"       = { typeOfPostProcessing = 202; }
+  "mhm_mrm"           = { typeOfPostProcessing = 203; }
+  "pcrg_mrm"          = { typeOfPostProcessing = 204; }
+  "meteogrid"         = { typeOfPostProcessing = 205; }
   "unknown"           = { dummy = 1; }
 } : hidden;
 
diff --git a/tests/grib_efas.sh b/tests/grib_efas.sh
index f1ef8452b..2e60766e5 100755
--- a/tests/grib_efas.sh
+++ b/tests/grib_efas.sh
@@ -50,6 +50,11 @@ grib_check_key_equals $temp2 is_efas,productDefinitionTemplateNumber,typeOfStati
 grib_check_key_equals $temp2 mars.origin 'ecmf'
 grib_check_key_equals $temp2 mars.model  'lisflood'
 
+${tools_dir}/grib_set -s \
+    setLocalDefinition=1,localDefinitionNumber=41,type=fc,inputOriginatingCentre=ecmf,typeOfPostProcessing=10 \
+    $temp1 $temp2
+grib_check_key_equals $temp2 mars.model  'geff'
+
 # Parameter tests
 ${tools_dir}/grib_set -s paramId=260267 $temp2 $temp3
 grib_check_key_equals $temp3 paramId,is_efas,lengthOfTimeRange '260267 1 6'