From c37a5e758aed6d3cb955554e74ed1596a79692cc Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 3 Apr 2018 15:29:43 +0100
Subject: [PATCH] ECC-663: EFAS start and end step

---
 definitions/mars/grib.efas.an.def |  3 +--
 definitions/mars/grib.efas.cf.def |  3 +--
 definitions/mars/grib.efas.fc.def |  3 +--
 definitions/mars/grib.efas.fu.def |  3 +--
 definitions/mars/grib.efas.go.def |  5 +----
 definitions/mars/grib.efas.pf.def |  3 +--
 tests/grib_efas.sh                | 17 +++++++++++++++++
 7 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/definitions/mars/grib.efas.an.def b/definitions/mars/grib.efas.an.def
index b5590cc87..4632f6862 100644
--- a/definitions/mars/grib.efas.an.def
+++ b/definitions/mars/grib.efas.an.def
@@ -1,10 +1,9 @@
+# EFAS analysis (water balance)
 alias mars.step = startStep;
 
 alias mars.date = dateOfForecast;
 alias mars.time = timeOfForecast;
 
-# Water Balance
-
 #meta efas_suite_name sprintf("%s_%s_%s", inputOriginatingCentre, efas_forecast, efas_post_proc) : no_copy;
 alias mars.origin = inputOriginatingCentre;
 
diff --git a/definitions/mars/grib.efas.cf.def b/definitions/mars/grib.efas.cf.def
index 33f89316f..013d2da4c 100644
--- a/definitions/mars/grib.efas.cf.def
+++ b/definitions/mars/grib.efas.cf.def
@@ -1,5 +1,4 @@
-alias mars.step = startStep;
-
+# EFAS control forecast
 #meta efas_suite_name sprintf("%s_%s_%s", inputOriginatingCentre, efas_forecast, efas_post_proc) : no_copy;
 alias mars.origin = inputOriginatingCentre;
 
diff --git a/definitions/mars/grib.efas.fc.def b/definitions/mars/grib.efas.fc.def
index 33f89316f..018d0ff6f 100644
--- a/definitions/mars/grib.efas.fc.def
+++ b/definitions/mars/grib.efas.fc.def
@@ -1,5 +1,4 @@
-alias mars.step = startStep;
-
+# EFAS forecast
 #meta efas_suite_name sprintf("%s_%s_%s", inputOriginatingCentre, efas_forecast, efas_post_proc) : no_copy;
 alias mars.origin = inputOriginatingCentre;
 
diff --git a/definitions/mars/grib.efas.fu.def b/definitions/mars/grib.efas.fu.def
index 5fc276407..6dea1033d 100644
--- a/definitions/mars/grib.efas.fu.def
+++ b/definitions/mars/grib.efas.fu.def
@@ -1,10 +1,9 @@
+# EFAS Fullup
 alias mars.step = startStep;
 
 alias mars.date = dateOfForecast;
 alias mars.time = timeOfForecast;
 
-# Fillup
-
 #meta efas_suite_name sprintf("%s_%s", inputOriginatingCentre, efas_post_proc) : no_copy;
 alias mars.origin = inputOriginatingCentre;
 
diff --git a/definitions/mars/grib.efas.go.def b/definitions/mars/grib.efas.go.def
index 8b72bdbcc..9def2ce65 100644
--- a/definitions/mars/grib.efas.go.def
+++ b/definitions/mars/grib.efas.go.def
@@ -1,10 +1,7 @@
-alias mars.step = startStep;
-
+# EFAS Gridded observations
 alias mars.date = dateOfForecast;
 alias mars.time = timeOfForecast;
 
-# Gridded observations
-
 alias mars.origin = inputOriginatingCentre;
 
 alias mars.anoffset=anoffset;
diff --git a/definitions/mars/grib.efas.pf.def b/definitions/mars/grib.efas.pf.def
index 4a9a7f2d5..9d4d869de 100644
--- a/definitions/mars/grib.efas.pf.def
+++ b/definitions/mars/grib.efas.pf.def
@@ -1,5 +1,4 @@
-alias mars.step = startStep;
-
+# EFAS Perturbed forecast
 #meta efas_suite_name sprintf("%s_%s_%s", inputOriginatingCentre, efas_forecast, efas_post_proc) : no_copy;
 alias mars.origin = inputOriginatingCentre;
 
diff --git a/tests/grib_efas.sh b/tests/grib_efas.sh
index 8bcb3b69e..4fc088ee0 100755
--- a/tests/grib_efas.sh
+++ b/tests/grib_efas.sh
@@ -64,6 +64,23 @@ ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,yearOfFor
   $sample $temp1
 grib_check_key_equals $temp1 anoffset 25
 
+# ECC-663: MARS step
+types="an fu"
+for t in $types; do
+  ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
+  $sample $temp1
+  grib_check_key_equals $temp1 mars.step 12 # start step
+  #${tools_dir}/grib_dump -Da $temp1 | grep mars.step
+done
+
+types="go fc pf cf"
+for t in $types; do
+  ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
+  $sample $temp1
+  grib_check_key_equals $temp1 mars.step 36 # end step
+  #${tools_dir}/grib_dump -Da $temp1 | grep mars.step
+done
+
 
 # Clean up
 rm -f $sample $temp1 $temp2 $temp3