From acb0e9d87cb96f06dfaa95ba16a29ca34fbfa4e9 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 16 Dec 2021 16:42:40 +0000
Subject: [PATCH] Remove all instances of is_s2s from definitions

---
 definitions/grib2/boot.def                         | 2 +-
 definitions/grib2/localConcepts/cnmc/name.def      | 2 --
 definitions/grib2/localConcepts/cnmc/paramId.def   | 2 --
 definitions/grib2/localConcepts/cnmc/shortName.def | 2 --
 definitions/grib2/localConcepts/cnmc/units.def     | 2 --
 definitions/grib2/products_s2s.def                 | 1 -
 definitions/grib3/boot.def                         | 2 +-
 definitions/grib3/products_s2s.def                 | 1 -
 8 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/definitions/grib2/boot.def b/definitions/grib2/boot.def
index f8b04666f..89e8cdb20 100644
--- a/definitions/grib2/boot.def
+++ b/definitions/grib2/boot.def
@@ -17,7 +17,7 @@ constant million = 1000000 : hidden;
 constant grib2divider   = 1000000;
 alias extraDimensionPresent=zero;
 alias is_tigge = zero;
-#alias is_s2s = zero;
+
 transient angleSubdivisions=grib2divider;  # micro degrees
 
 meta gts_header gts_header() : no_copy,hidden,read_only;
diff --git a/definitions/grib2/localConcepts/cnmc/name.def b/definitions/grib2/localConcepts/cnmc/name.def
index 43a9b0f0b..b602f2eb8 100644
--- a/definitions/grib2/localConcepts/cnmc/name.def
+++ b/definitions/grib2/localConcepts/cnmc/name.def
@@ -11,7 +11,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
 	 subCentre = 102 ;
-	 is_s2s = 1 ;
 	}
 #2 metre dewpoint temperature
 '2 metre dewpoint temperature' = {
@@ -31,7 +30,6 @@
 	 scaledValueOfFirstFixedSurface = 2 ;
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 subCentre = 102 ;
-	 is_s2s = 1 ;
 	}
 #Pressure (S) (not reduced)
 'Pressure (S) (not reduced)' = {
diff --git a/definitions/grib2/localConcepts/cnmc/paramId.def b/definitions/grib2/localConcepts/cnmc/paramId.def
index a0a324fe6..31c822105 100644
--- a/definitions/grib2/localConcepts/cnmc/paramId.def
+++ b/definitions/grib2/localConcepts/cnmc/paramId.def
@@ -11,7 +11,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
 	 subCentre = 102 ;
-	 is_s2s = 1 ;
 	}
 #2 metre dewpoint temperature
 '168' = {
@@ -31,7 +30,6 @@
 	 scaledValueOfFirstFixedSurface = 2 ;
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 subCentre = 102 ;
-	 is_s2s = 1 ;
 	}
 #Pressure (S) (not reduced)
 '500000' = {
diff --git a/definitions/grib2/localConcepts/cnmc/shortName.def b/definitions/grib2/localConcepts/cnmc/shortName.def
index 2d0496ee2..5e8d4b9c7 100644
--- a/definitions/grib2/localConcepts/cnmc/shortName.def
+++ b/definitions/grib2/localConcepts/cnmc/shortName.def
@@ -11,7 +11,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
 	 subCentre = 102 ;
-	 is_s2s = 1 ;
 	}
 #2 metre dewpoint temperature
 '2d' = {
@@ -31,7 +30,6 @@
 	 scaledValueOfFirstFixedSurface = 2 ;
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 subCentre = 102 ;
-	 is_s2s = 1 ;
 	}
 #Pressure (S) (not reduced)
 'ps' = {
diff --git a/definitions/grib2/localConcepts/cnmc/units.def b/definitions/grib2/localConcepts/cnmc/units.def
index 177655a57..386699853 100644
--- a/definitions/grib2/localConcepts/cnmc/units.def
+++ b/definitions/grib2/localConcepts/cnmc/units.def
@@ -11,7 +11,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
 	 subCentre = 102 ;
-	 is_s2s = 1 ;
 	}
 #2 metre dewpoint temperature
 'K' = {
@@ -31,7 +30,6 @@
 	 scaledValueOfFirstFixedSurface = 2 ;
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 subCentre = 102 ;
-	 is_s2s = 1 ;
 	}
 #Pressure (S) (not reduced)
 'Pa' = {
diff --git a/definitions/grib2/products_s2s.def b/definitions/grib2/products_s2s.def
index 99e686f73..0f093ec17 100644
--- a/definitions/grib2/products_s2s.def
+++ b/definitions/grib2/products_s2s.def
@@ -3,7 +3,6 @@
 # S2S
 constant marsClass  = 's2';
 constant marsModel  = 'glob';
-#alias is_s2s = one;
 
 alias parameter.paramId=paramId;
 alias parameter.shortName=shortName;
diff --git a/definitions/grib3/boot.def b/definitions/grib3/boot.def
index 92a16c2c0..a0ce0595a 100644
--- a/definitions/grib3/boot.def
+++ b/definitions/grib3/boot.def
@@ -12,7 +12,7 @@ constant million = 1000000 : hidden;
 constant grib3divider   = 1000000;
 alias extraDimensionPresent=zero;
 alias is_tigge = zero;
-alias is_s2s = zero;
+
 transient angleSubdivisions=grib3divider;  # micro degrees
 
 meta gts_header gts_header() : no_copy,hidden,read_only;
diff --git a/definitions/grib3/products_s2s.def b/definitions/grib3/products_s2s.def
index 9afaa32a4..f4940cd6a 100644
--- a/definitions/grib3/products_s2s.def
+++ b/definitions/grib3/products_s2s.def
@@ -3,7 +3,6 @@
 # S2S
 constant marsClass  = 's2';
 constant marsModel  = 'glob';
-alias is_s2s = one;
 
 alias parameter.paramId=paramId;
 alias parameter.shortName=shortName;