From 2efe189895a05d0c23647fa53f45284d4ab523d4 Mon Sep 17 00:00:00 2001
From: Sebastien Villaume <sebastien.villaume@ecmwf.int>
Date: Fri, 21 Jun 2024 11:44:12 +0100
Subject: [PATCH] ECC-1846 working on modelName and modelVersion

---
 definitions/grib2/local/ecmf/section4_extras.def          | 4 ++--
 .../grib2/localConcepts/ecmf/modelVersionConcept_IFS.def  | 8 ++++++++
 definitions/grib2/section.4.def                           | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/definitions/grib2/local/ecmf/section4_extras.def b/definitions/grib2/local/ecmf/section4_extras.def
index 4639e1fa8..11cec8f50 100644
--- a/definitions/grib2/local/ecmf/section4_extras.def
+++ b/definitions/grib2/local/ecmf/section4_extras.def
@@ -4,10 +4,10 @@ constant modelNameDefault = "unknown";
 constant modelVersionDefault = "unknown";
 
 if (centre is "ecmf" or datasetForLocal is "era6") {
- concept_nofail modelName (modelNameDefault, "modelNameConcept.def",conceptsDir2,conceptsDir1): no_copy, dump;
+ concept_nofail modelName (modelNameDefault, "modelNameConcept.def",conceptsMasterDir,conceptsLocalDirAll): no_copy, dump;
 
  if (!(modelName is "unknown")) {
-    concept_nofail modelVersion (modelVersionDefault, "modelVersionConcept_[modelName].def",conceptsDir2,conceptsDir1): no_copy, dump;
+    concept_nofail modelVersion (modelVersionDefault, "modelVersionConcept_[modelName].def",conceptsMasterDir,conceptsLocalDirAll): no_copy, dump;
     alias ls.model = modelName;
     alias mars.model = modelName;
  }
diff --git a/definitions/grib2/localConcepts/ecmf/modelVersionConcept_IFS.def b/definitions/grib2/localConcepts/ecmf/modelVersionConcept_IFS.def
index 38757a209..8445b7489 100644
--- a/definitions/grib2/localConcepts/ecmf/modelVersionConcept_IFS.def
+++ b/definitions/grib2/localConcepts/ecmf/modelVersionConcept_IFS.def
@@ -1,2 +1,10 @@
+'cy49r1' = { generatingProcessIdentifier = 155; } 
 'cy48r1' = { generatingProcessIdentifier = 154; }
 'cy47r3' = { generatingProcessIdentifier = 153; }
+'cy47r2' = { generatingProcessIdentifier = 152; }
+'cy47r1' = { generatingProcessIdentifier = 151; }
+'cy46r1' = { generatingProcessIdentifier = 150; }
+'cy45r1' = { generatingProcessIdentifier = 149; }
+'cy43r3' = { generatingProcessIdentifier = 148; }
+'cy43r1' = { generatingProcessIdentifier = 147; }
+'cy41r2' = { generatingProcessIdentifier = 146; }
diff --git a/definitions/grib2/section.4.def b/definitions/grib2/section.4.def
index 410e7bcdc..19a9cad2f 100644
--- a/definitions/grib2/section.4.def
+++ b/definitions/grib2/section.4.def
@@ -79,7 +79,7 @@ template parameters "grib2/parameters.def";
 
 
 #adding hook for local extras 
-template_nofail section4_extras "grib2/local/[centreForLocal]/section4_extras.def";
+template_nofail section4_extras "grib2/local/[centre]/section4_extras.def";
 
 # Detect if this is for Generalized vertical height coordinates
 if (defined(typeOfFirstFixedSurface)) {