ECC-663: EFAS start and end step

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;
 

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;
 

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;
 

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;
 

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;

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;
 

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