diff --git a/Testing/Installation/testecmwfapi_member.py b/Testing/Installation/testecmwfapi_member.py
new file mode 100644
index 0000000000000000000000000000000000000000..66cc7c1eed9f4ebaa6f541b41bb62fc9b3df9be7
--- /dev/null
+++ b/Testing/Installation/testecmwfapi_member.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+
+import pytest
+from ecmwfapi import ECMWFService
+
+class TestECMWFApi:
+    """
+    """
+
+    def test_member():
+        server = ECMWFService("mars")
+
+        server.execute({'class'   : "ei",
+                        'time'    : "00",
+                        'date'    : "2013-09-01/to/2013-09-30",
+                        'step'    : "0",
+                        'type'    : "an",
+                        'levtype' : "sfc",
+                        'param'   : "165.128/41.128",
+                        'grid'    : "0.75/0.75"},
+                       "interim201309.grib")
+
diff --git a/Testing/Installation/testecmwfapi_public.py b/Testing/Installation/testecmwfapi_public.py
new file mode 100644
index 0000000000000000000000000000000000000000..6e261df92ee7e776521013b5fcbceb4b4c7887bc
--- /dev/null
+++ b/Testing/Installation/testecmwfapi_public.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+
+import pytest
+from ecmwfapi import ECMWFDataServer
+
+class TestECMWFApi:
+    """
+    """
+
+    def test_public():
+        server = ECMWFDataServer()
+
+        server.retrieve({'dataset' : "interim",
+                         'time'    : "00",
+                         'date'    : "2013-09-01/to/2013-09-30",
+                         'step'    : "0",
+                         'type'    : "an",
+                         'levtype' : "sfc",
+                         'param'   : "165.128/41.128",
+                         'grid'    : "0.75/0.75",
+                         'target'  : "interim201309.grib"
+                        })
+
+
diff --git a/Testing/Regression/Compare_gribfiles/README.md b/Testing/Regression/Compare_gribfiles/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..af6d3f7af8d8af0637fc6dc7ed7c858357c4a38a
--- /dev/null
+++ b/Testing/Regression/Compare_gribfiles/README.md
@@ -0,0 +1,35 @@
+# Testcase - Grib file comparison
+
+This testcase is composed of a number of comparisons of grib files from two different flex_extract versions. 
+
+
+## Description
+
+A single test run tests if there are the same number of files and the files have the same names. 
+The test also checks if the files of each version have the same number of grib messages. It also uses the command line program "grib_compare" to check the equality of grib message headers. A comparison of the statistics of each grib message is also done with "grib_compare".
+ 
+
+
+Manually retrieve test data?
+
+
+
+## Usage
+
+python test_cmp_grib_files.py -r <path-to-reference-files> -n <path-to-new-files>  -p <file-pattern> 
+
+e.g. python test_cmp_grib_file.py -r 7.0.4/EA5/ -n 7.1/EA5/ -p 'EA*'
+
+## Author
+ Anne Philipp
+
+
+## License
+    (C) Copyright 2014-2019.
+
+    SPDX-License-Identifier: CC-BY-4.0
+
+    This work is licensed under the Creative Commons Attribution 4.0
+    International License. To view a copy of this license, visit
+    http://creativecommons.org/licenses/by/4.0/ or send a letter to
+    Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
diff --git a/Testing/Regression/Compare_gribfiles/test_cmp_grib_file.py b/Testing/Regression/Compare_gribfiles/test_cmp_grib_file.py
index 31d52c7c8361fbef2ccf2790b6184a2972f4faf5..920fe71caa0d0dff406cfc97e84b5e6e4f238f5b 100644
--- a/Testing/Regression/Compare_gribfiles/test_cmp_grib_file.py
+++ b/Testing/Regression/Compare_gribfiles/test_cmp_grib_file.py
@@ -1,6 +1,20 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-"""
+"""Comparison of resulting Grib files of two flex_extract versions.
+
+
+
+The script should be called like:
+
+    python test_cmp_grib_files.py -r <path-to-reference-files> -n <path-to-new-files>  -p <file-pattern>
+
+Note
+----
+
+
+Example
+-------
+    python test_cmp_grib_file.py -r 7.0.4/EA5/ -n 7.1/EA5/ -p 'EA*'
 """
 
 # ------------------------------------------------------------------------------
diff --git a/Testing/Regression/Mars_request/7.0.3/EA5.highres_mr.csv b/Testing/Regression/Mars_request/7.0.3/EA5.highres_mr.csv
deleted file mode 100644
index 32869108b72f7609731bb09ffed05e321b810866..0000000000000000000000000000000000000000
--- a/Testing/Regression/Mars_request/7.0.3/EA5.highres_mr.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 60.0/-100.0/0.0/60.0, , 20181029/to/20181031, 1, , 0.25/0.25, 1, SFC, EA, OFF, LSP/CP/SSHF/EWSS/NSSS/SSR, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/FCOG_acc_SL.20181029.3282.6480.grb, 06/18, FC
-1, 24, 60.0/-100.0/0.0/60.0, , 20181030/to/20181030, 1, , 0.25/0.25, 60/to/137, ML, EA, OFF, T/Q/U/V/77, , 799, 00, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/ANOG__ML.20181030.3282.6480.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-2, 24, 60.0/-100.0/0.0/60.0, , 20181030, 1, , 0.25/0.25, 1, SFC, EA, OFF, 160/27/28/244, , 799, 000, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/OG_OROLSM__SL.20181030.3282.6480.grb, 00, AN
-3, 24, 60.0/-100.0/0.0/60.0, , 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, LNSP, , 799, 00, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/ANSH__SL.20181030.3282.6480.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-4, 24, 60.0/-100.0/0.0/60.0, , 20181030/to/20181030, 1, , 0.25/0.25, 1, SFC, EA, OFF, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 799, 00, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/ANOG__SL.20181030.3282.6480.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
diff --git a/Testing/Regression/Mars_request/7.0.3/EA5.public_mr.csv b/Testing/Regression/Mars_request/7.0.3/EA5.public_mr.csv
deleted file mode 100644
index 05160cfb4fd067ade6ff0e2bfadc3ab28722a766..0000000000000000000000000000000000000000
--- a/Testing/Regression/Mars_request/7.0.3/EA5.public_mr.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181029/to/20181031, 1, , 1.0/1.0, 1, SFC, EA, OFF, LSP/CP/SSHF/EWSS/NSSS/SSR, , 213, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/FCOG_acc_SL.20181029.3282.6697.grb, 06/18, FC
-1, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , 1.0/1.0, 1/to/137, ML, EA, OFF, T/Q/U/V/77, , 213, 00, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/ANOG__ML.20181030.3282.6697.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-2, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 160/27/28/244, , 213, 000, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/OG_OROLSM__SL.20181030.3282.6697.grb, 00, AN
-3, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, LNSP, , 213, 00, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/ANSH__SL.20181030.3282.6697.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-4, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 213, 00, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/ANOG__SL.20181030.3282.6697.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
diff --git a/Testing/Regression/Mars_request/7.0.3/EA5_mr.csv b/Testing/Regression/Mars_request/7.0.3/EA5_mr.csv
deleted file mode 100644
index c25d64036d083487a4d5834e5c9ca9caf08482ff..0000000000000000000000000000000000000000
--- a/Testing/Regression/Mars_request/7.0.3/EA5_mr.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 16, 75.0/-25.0/10.0/60.0, None, 20181029/to/20181031, 1, , 1.0/1.0, 1, SFC, EA, OFF, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/FCOG_acc_SL.20181029.3282.6620.grb, 06/18, FC
-1, 16, 75.0/-25.0/10.0/60.0, , 20181030/to/20181030, 1, , 1.0/1.0, 130/to/137, ML, EA, OFF, T/Q/U/V/77, , 159, 00, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/ANOG__ML.20181030.3282.6620.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-2, 16, 75.0/-25.0/10.0/60.0, , 20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 160/27/28/244, , 159, 000, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/OG_OROLSM__SL.20181030.3282.6620.grb, 00, AN
-3, 16, 75.0/-25.0/10.0/60.0, , 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, LNSP, , 159, 00, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/ANSH__SL.20181030.3282.6620.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-4, 16, 75.0/-25.0/10.0/60.0, , 20181030/to/20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 159, 00, OPER, /raid60/nas/tmc/Anne/FLEX_EXTRACT_REPO/flex_extract/python/../work/ANOG__SL.20181030.3282.6620.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
diff --git a/Testing/Regression/Mars_request/7.1/CERA.public_mr.csv b/Testing/Regression/Mars_request/7.1/CERA.public_mr.csv
index 75354df8b0aa4a02eee4bee356415e3e7a0d6ba4..9c7b0a1d44e539c5dd8b5fcc8fd5c8276083d4d6 100644
--- a/Testing/Regression/Mars_request/7.1/CERA.public_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/CERA.public_mr.csv
@@ -1,6 +1,6 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900505/to/19900507, 1, , 1.0/1.0, 1, SFC, EP, 000, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/24/by/3, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.19900505.135731.135732.grb, 18, FC
-1, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900506, 1, , 1.0/1.0, 1, SFC, EP, 000, 160.128/027.128/028.128/244.128, , 159, 000, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.19900506.135731.135732.grb, 00, AN
-2, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900506/to/19900506, 1, , 1.0/1.0, 1/to/91, ML, EP, 000, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.19900506.135731.135732.grb, 00/03/06/09/12/15/18/21, AN
-3, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900506/to/19900506, 1, , 1.0/1.0, 1, SFC, EP, 000, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/027.128/028.128/173.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.19900506.135731.135732.grb, 00/03/06/09/12/15/18/21, AN
-4, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900506/to/19900506, 1, , OFF, 1, ML, EP, 000, 152.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.19900506.135731.135732.grb, 00/03/06/09/12/15/18/21, AN
+1, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900505/to/19900507, 1, , 1.0/1.0, 1, SFC, EP, 000, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/24/by/3, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.19900505.100525.100526.grb, 18, FC
+1, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900506, 1, , 1.0/1.0, 1, SFC, EP, 000, 160.128/027.128/028.128/244.128, , 159, 000, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.19900506.100525.100526.grb, 00, AN
+2, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900506/to/19900506, 1, , 1.0/1.0, 1/to/91, ML, EP, 000, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.19900506.100525.100526.grb, 00/03/06/09/12/15/18/21, AN
+3, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900506/to/19900506, 1, , 1.0/1.0, 1, SFC, EP, 000, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/027.128/028.128/173.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.19900506.100525.100526.grb, 00/03/06/09/12/15/18/21, AN
+4, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900506/to/19900506, 1, , OFF, 1, ML, EP, 000, 152.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.19900506.100525.100526.grb, 00/03/06/09/12/15/18/21, AN
diff --git a/Testing/Regression/Mars_request/7.1/CERA_mr.csv b/Testing/Regression/Mars_request/7.1/CERA_mr.csv
index efbf1281acc09f71f08572e91f41df8187f7fe8f..332fbbd6ca0c9bf678beadbfdc9d934e57a4f556 100644
--- a/Testing/Regression/Mars_request/7.1/CERA_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/CERA_mr.csv
@@ -1,6 +1,6 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.0/-90.0/180.0, None, 19990808/to/19990810, 1, , 1.0/1.0, 1, SFC, EP, 000, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/24/by/3, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.19990808.135790.135791.grb, 18, FC
-1, 24, 90.0/-179.0/-90.0/180.0, None, 19990809, 1, , 1.0/1.0, 1, SFC, EP, 000, 160.128/027.128/028.128/244.128, , 159, 000, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.19990809.135790.135791.grb, 00, AN
-2, 24, 90.0/-179.0/-90.0/180.0, None, 19990809/to/19990809, 1, , 1.0/1.0, 1/to/91, ML, EP, 000, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.19990809.135790.135791.grb, 00/03/06/09/12/15/18/21, AN
-3, 24, 90.0/-179.0/-90.0/180.0, None, 19990809/to/19990809, 1, , 1.0/1.0, 1, SFC, EP, 000, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/027.128/028.128/173.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.19990809.135790.135791.grb, 00/03/06/09/12/15/18/21, AN
-4, 24, 90.0/-179.0/-90.0/180.0, None, 19990809/to/19990809, 1, , OFF, 1, ML, EP, 000, 152.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.19990809.135790.135791.grb, 00/03/06/09/12/15/18/21, AN
+1, 24, 90.0/-179.0/-90.0/180.0, None, 19990808/to/19990810, 1, , 1.0/1.0, 1, SFC, EP, 000, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/24/by/3, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.19990808.100520.100521.grb, 18, FC
+1, 24, 90.0/-179.0/-90.0/180.0, None, 19990809, 1, , 1.0/1.0, 1, SFC, EP, 000, 160.128/027.128/028.128/244.128, , 159, 000, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.19990809.100520.100521.grb, 00, AN
+2, 24, 90.0/-179.0/-90.0/180.0, None, 19990809/to/19990809, 1, , 1.0/1.0, 1/to/91, ML, EP, 000, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.19990809.100520.100521.grb, 00/03/06/09/12/15/18/21, AN
+3, 24, 90.0/-179.0/-90.0/180.0, None, 19990809/to/19990809, 1, , 1.0/1.0, 1, SFC, EP, 000, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/027.128/028.128/173.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.19990809.100520.100521.grb, 00/03/06/09/12/15/18/21, AN
+4, 24, 90.0/-179.0/-90.0/180.0, None, 19990809/to/19990809, 1, , OFF, 1, ML, EP, 000, 152.128, , 159, 00, ENDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.19990809.100520.100521.grb, 00/03/06/09/12/15/18/21, AN
diff --git a/Testing/Regression/Mars_request/7.1/CF_mr.csv b/Testing/Regression/Mars_request/7.1/CF_mr.csv
index 78cf6181b395f9712c5eb6eab27005186ef8fcee..77f0257c3d03479b27dfe71ac169c8b62caf1551 100644
--- a/Testing/Regression/Mars_request/7.1/CF_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/CF_mr.csv
@@ -1,8 +1,8 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , 1.0/1.0, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/36/by/3, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFOG_acc_SL.20190506.136203.136204.grb, 12, CF
-1, 24, , None, 20190506/to/20190506, 1, reduced, 80, 1, ML, OD, OFF, 133.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFGG__SL.20190506.136203.136204.grb, 12, CF
-2, 24, 90.0/-179.0/-90.0/180.0, None, 20190506, 1, , 1.0/1.0, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190506.136203.136204.grb, 00, AN
-3, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , 1.0/1.0, 89/to/91, ML, OD, OFF, 130.128/133.128/135.128/246.128/247.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFOG__ML.20190506.136203.136204.grb, 12, CF
-4, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFOG__SL.20190506.136203.136204.grb, 12, CF
-5, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , OFF, 1/to/91, ML, OD, OFF, 131.128/132.128/155.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFSH__ML.20190506.136203.136204.grb, 12, CF
-6, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , OFF, 1, ML, OD, OFF, 152.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFSH__SL.20190506.136203.136204.grb, 12, CF
+1, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , 1.0/1.0, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/36/by/3, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFOG_acc_SL.20190506.100515.100516.grb, 12, CF
+1, 24, , None, 20190506/to/20190506, 1, reduced, 80, 1, ML, OD, OFF, 133.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFGG__SL.20190506.100515.100516.grb, 12, CF
+2, 24, 90.0/-179.0/-90.0/180.0, None, 20190506, 1, , 1.0/1.0, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190506.100515.100516.grb, 00, AN
+3, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , 1.0/1.0, 89/to/91, ML, OD, OFF, 130.128/133.128/135.128/246.128/247.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFOG__ML.20190506.100515.100516.grb, 12, CF
+4, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFOG__SL.20190506.100515.100516.grb, 12, CF
+5, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , OFF, 1/to/91, ML, OD, OFF, 131.128/132.128/155.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFSH__ML.20190506.100515.100516.grb, 12, CF
+6, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , OFF, 1, ML, OD, OFF, 152.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFSH__SL.20190506.100515.100516.grb, 12, CF
diff --git a/Testing/Regression/Mars_request/7.1/CV_mr.csv b/Testing/Regression/Mars_request/7.1/CV_mr.csv
index 1fddfaa26099fc1f87286f837276775668222244..cb87b65355c2ac11cd32bb945e1bae0e03610959 100644
--- a/Testing/Regression/Mars_request/7.1/CV_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/CV_mr.csv
@@ -1,8 +1,8 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , 1.0/1.0, 1, SFC, OD, 001, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/36/by/3, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CVOG_acc_SL.20120506.136262.136263.grb, 12, CV
-1, 24, , None, 20120506/to/20120506, 1, reduced, 80, 1, ML, OD, 001, 133.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CVGG__SL.20120506.136262.136263.grb, 12, CV
-2, 24, 90.0/-179.0/-90.0/180.0, None, 20120506, 1, , 1.0/1.0, 1, SFC, OD, 001, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20120506.136262.136263.grb, 00, AN
-3, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , 1.0/1.0, 1/to/62, ML, OD, 001, 130.128/133.128/135.128/246.128/247.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CVOG__ML.20120506.136262.136263.grb, 12, CV
-4, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , 1.0/1.0, 1, SFC, OD, 001, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CVOG__SL.20120506.136262.136263.grb, 12, CV
-5, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , OFF, 1/to/62, ML, OD, 001, 131.128/132.128/155.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CVSH__ML.20120506.136262.136263.grb, 12, CV
-6, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , OFF, 1, ML, OD, 001, 152.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CVSH__SL.20120506.136262.136263.grb, 12, CV
+1, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , 1.0/1.0, 1, SFC, OD, 001, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/36/by/3, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CVOG_acc_SL.20120506.100510.100511.grb, 12, CV
+1, 24, , None, 20120506/to/20120506, 1, reduced, 80, 1, ML, OD, 001, 133.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CVGG__SL.20120506.100510.100511.grb, 12, CV
+2, 24, 90.0/-179.0/-90.0/180.0, None, 20120506, 1, , 1.0/1.0, 1, SFC, OD, 001, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20120506.100510.100511.grb, 00, AN
+3, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , 1.0/1.0, 1/to/62, ML, OD, 001, 130.128/133.128/135.128/246.128/247.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CVOG__ML.20120506.100510.100511.grb, 12, CV
+4, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , 1.0/1.0, 1, SFC, OD, 001, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CVOG__SL.20120506.100510.100511.grb, 12, CV
+5, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , OFF, 1/to/62, ML, OD, 001, 131.128/132.128/155.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CVSH__ML.20120506.100510.100511.grb, 12, CV
+6, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , OFF, 1, ML, OD, 001, 152.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CVSH__SL.20120506.100510.100511.grb, 12, CV
diff --git a/Testing/Regression/Mars_request/7.1/EA5.highres_mr.csv b/Testing/Regression/Mars_request/7.1/EA5.highres_mr.csv
index 6b069b5fb5d18a1c1cbd2fe03f5ac7bad812647b..1dc1200a901c51148d1c310be834a49329be1d3a 100644
--- a/Testing/Regression/Mars_request/7.1/EA5.highres_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/EA5.highres_mr.csv
@@ -1,6 +1,6 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 60.0/-100.0/0.0/60.0, None, 20181029/to/20181031, 1, , 0.25/0.25, 1, SFC, EA, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20181029.135553.135554.grb, 06/18, FC
-1, 24, 60.0/-100.0/0.0/60.0, None, 20181030, 1, , 0.25/0.25, 1, SFC, EA, OFF, 160.128/027.128/028.128/244.128, , 799, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.135553.135554.grb, 00, AN
-2, 24, 60.0/-100.0/0.0/60.0, None, 20181030/to/20181030, 1, , 0.25/0.25, 60/to/137, ML, EA, OFF, 130.128/133.128/131.128/132.128/077.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20181030.135553.135554.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-3, 24, 60.0/-100.0/0.0/60.0, None, 20181030/to/20181030, 1, , 0.25/0.25, 1, SFC, EA, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20181030.135553.135554.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-4, 24, 60.0/-100.0/0.0/60.0, None, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, 152.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20181030.135553.135554.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
+1, 24, 60.0/-100.0/0.0/60.0, None, 20181029/to/20181031, 1, , 0.25/0.25, 1, SFC, EA, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20181029.100505.100506.grb, 06/18, FC
+1, 24, 60.0/-100.0/0.0/60.0, None, 20181030, 1, , 0.25/0.25, 1, SFC, EA, OFF, 160.128/027.128/028.128/244.128, , 799, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.100505.100506.grb, 00, AN
+2, 24, 60.0/-100.0/0.0/60.0, None, 20181030/to/20181030, 1, , 0.25/0.25, 60/to/137, ML, EA, OFF, 130.128/133.128/131.128/132.128/077.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.20181030.100505.100506.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
+3, 24, 60.0/-100.0/0.0/60.0, None, 20181030/to/20181030, 1, , 0.25/0.25, 1, SFC, EA, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.20181030.100505.100506.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
+4, 24, 60.0/-100.0/0.0/60.0, None, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, 152.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.20181030.100505.100506.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
diff --git a/Testing/Regression/Mars_request/7.1/EA5.public_mr.csv b/Testing/Regression/Mars_request/7.1/EA5.public_mr.csv
index 33fd028e13474120cbc517b4cb0b355d1190241f..be1edb7652c75492498f670a7f7243be7cbe5ec4 100644
--- a/Testing/Regression/Mars_request/7.1/EA5.public_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/EA5.public_mr.csv
@@ -1,6 +1,6 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181029/to/20181031, 1, , 1.0/1.0, 1, SFC, EA, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 213, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20181029.135612.135613.grb, 06/18, FC
-1, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 160.128/027.128/028.128/244.128, , 213, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.135612.135613.grb, 00, AN
-2, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , 1.0/1.0, 1/to/137, ML, EA, OFF, 130.128/133.128/131.128/132.128/077.128, , 213, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20181030.135612.135613.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-3, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 213, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20181030.135612.135613.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-4, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, 152.128, , 213, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20181030.135612.135613.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
+1, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181029/to/20181031, 1, , 1.0/1.0, 1, SFC, EA, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 213, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20181029.100500.100501.grb, 06/18, FC
+1, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 160.128/027.128/028.128/244.128, , 213, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.100500.100501.grb, 00, AN
+2, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , 1.0/1.0, 1/to/137, ML, EA, OFF, 130.128/133.128/131.128/132.128/077.128, , 213, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.20181030.100500.100501.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
+3, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 213, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.20181030.100500.100501.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
+4, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, 152.128, , 213, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.20181030.100500.100501.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
diff --git a/Testing/Regression/Mars_request/7.1/EA5_mr.csv b/Testing/Regression/Mars_request/7.1/EA5_mr.csv
index 8b5bd124d08a297be8fe0c401b148dabf2375e43..5a907db0a9f30e8cc9a15073a5d173eb6269b3b0 100644
--- a/Testing/Regression/Mars_request/7.1/EA5_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/EA5_mr.csv
@@ -1,6 +1,6 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 16, 75.0/-25.0/10.0/60.0, None, 20181029/to/20181031, 1, , 1.0/1.0, 1, SFC, EA, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20181029.135671.135672.grb, 06/18, FC
-1, 16, 75.0/-25.0/10.0/60.0, None, 20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 160.128/027.128/028.128/244.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.135671.135672.grb, 00, AN
-2, 16, 75.0/-25.0/10.0/60.0, None, 20181030/to/20181030, 1, , 1.0/1.0, 130/to/137, ML, EA, OFF, 130.128/133.128/131.128/132.128/077.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20181030.135671.135672.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-3, 16, 75.0/-25.0/10.0/60.0, None, 20181030/to/20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20181030.135671.135672.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-4, 16, 75.0/-25.0/10.0/60.0, None, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, 152.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20181030.135671.135672.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
+1, 16, 75.0/-25.0/10.0/60.0, None, 20181029/to/20181031, 1, , 1.0/1.0, 1, SFC, EA, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20181029.100495.100496.grb, 06/18, FC
+1, 16, 75.0/-25.0/10.0/60.0, None, 20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 160.128/027.128/028.128/244.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.100495.100496.grb, 00, AN
+2, 16, 75.0/-25.0/10.0/60.0, None, 20181030/to/20181030, 1, , 1.0/1.0, 130/to/137, ML, EA, OFF, 130.128/133.128/131.128/132.128/077.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.20181030.100495.100496.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
+3, 16, 75.0/-25.0/10.0/60.0, None, 20181030/to/20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.20181030.100495.100496.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
+4, 16, 75.0/-25.0/10.0/60.0, None, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, 152.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.20181030.100495.100496.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
diff --git a/Testing/Regression/Mars_request/7.1/EI.public_mr.csv b/Testing/Regression/Mars_request/7.1/EI.public_mr.csv
index 997e1687701309c3ecb68f85dec7558a7a7677cb..d40365d5ed59bd7522e56ec01a9468441ca8169d 100644
--- a/Testing/Regression/Mars_request/7.1/EI.public_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/EI.public_mr.csv
@@ -1,8 +1,8 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.0/-90.0/180.0, interim, 20180630/to/20180702, 1, , 1.0/1.0, 1, SFC, EI, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 6/to/12/by/6, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20180630.136144.136145.grb, 00/12, FC
-1, 24, , interim, 20180701/to/20180701, 1, reduced, 80, 1, ML, EI, OFF, 133.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANGG__SL.20180701.136144.136145.grb, 00/06/12/18, AN
-2, 24, 90.0/-179.0/-90.0/180.0, interim, 20180701, 1, , 1.0/1.0, 1, SFC, EI, OFF, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20180701.136144.136145.grb, 00, AN
-3, 24, 90.0/-179.0/-90.0/180.0, interim, 20180701/to/20180701, 1, , 1.0/1.0, 1/to/60, ML, EI, OFF, 130.128/133.128/246.128/247.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20180701.136144.136145.grb, 00/06/12/18, AN
-4, 24, 90.0/-179.0/-90.0/180.0, interim, 20180701/to/20180701, 1, , 1.0/1.0, 1, SFC, EI, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20180701.136144.136145.grb, 00/06/12/18, AN
-5, 24, 90.0/-179.0/-90.0/180.0, interim, 20180701/to/20180701, 1, , OFF, 1/to/60, ML, EI, OFF, 131.128/132.128/155.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__ML.20180701.136144.136145.grb, 00/06/12/18, AN
-6, 24, 90.0/-179.0/-90.0/180.0, interim, 20180701/to/20180701, 1, , OFF, 1, ML, EI, OFF, 152.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20180701.136144.136145.grb, 00/06/12/18, AN
+1, 24, 90.0/-179.0/-90.0/180.0, interim, 20180630/to/20180702, 1, , 1.0/1.0, 1, SFC, EI, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 6/to/12/by/6, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20180630.100490.100491.grb, 00/12, FC
+1, 24, , interim, 20180701/to/20180701, 1, reduced, 80, 1, ML, EI, OFF, 133.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANGG__SL.20180701.100490.100491.grb, 00/06/12/18, AN
+2, 24, 90.0/-179.0/-90.0/180.0, interim, 20180701, 1, , 1.0/1.0, 1, SFC, EI, OFF, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20180701.100490.100491.grb, 00, AN
+3, 24, 90.0/-179.0/-90.0/180.0, interim, 20180701/to/20180701, 1, , 1.0/1.0, 1/to/60, ML, EI, OFF, 130.128/133.128/246.128/247.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.20180701.100490.100491.grb, 00/06/12/18, AN
+4, 24, 90.0/-179.0/-90.0/180.0, interim, 20180701/to/20180701, 1, , 1.0/1.0, 1, SFC, EI, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.20180701.100490.100491.grb, 00/06/12/18, AN
+5, 24, 90.0/-179.0/-90.0/180.0, interim, 20180701/to/20180701, 1, , OFF, 1/to/60, ML, EI, OFF, 131.128/132.128/155.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__ML.20180701.100490.100491.grb, 00/06/12/18, AN
+6, 24, 90.0/-179.0/-90.0/180.0, interim, 20180701/to/20180701, 1, , OFF, 1, ML, EI, OFF, 152.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.20180701.100490.100491.grb, 00/06/12/18, AN
diff --git a/Testing/Regression/Mars_request/7.1/EI_mr.csv b/Testing/Regression/Mars_request/7.1/EI_mr.csv
index 5d667059184ac5cb9f0f61d2a86d4e823c103f19..bd0414d3ce4e674058e47513ca3c21265cb08760 100644
--- a/Testing/Regression/Mars_request/7.1/EI_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/EI_mr.csv
@@ -1,13 +1,13 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.0/-90.0/180.0, None, 20160706/to/20160708, 1, , 1.0/1.0, 1, SFC, EI, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/12/by/3, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20160706.135849.135850.grb, 00/12, FC
-1, 24, , None, 20160707/to/20160707, 1, reduced, 80, 1, ML, EI, OFF, 133.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANGG__SL.20160707.135849.135850.grb, 00/12, AN
-2, 24, 90.0/-179.0/-90.0/180.0, None, 20160707, 1, , 1.0/1.0, 1, SFC, EI, OFF, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20160707.135849.135850.grb, 00, AN
-3, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , 1.0/1.0, 1/to/60, ML, EI, OFF, 130.128/133.128/246.128/247.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20160707.135849.135850.grb, 00/12, AN
-4, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , 1.0/1.0, 1, SFC, EI, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20160707.135849.135850.grb, 00/12, AN
-5, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , OFF, 1/to/60, ML, EI, OFF, 131.128/132.128/155.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__ML.20160707.135849.135850.grb, 00/12, AN
-6, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , OFF, 1, ML, EI, OFF, 152.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20160707.135849.135850.grb, 00/12, AN
-7, 24, , None, 20160707/to/20160707, 1, reduced, 80, 1, ML, EI, OFF, 133.128, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCGG__SL.20160707.135849.135850.grb, 00/12, FC
-8, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , 1.0/1.0, 1/to/60, ML, EI, OFF, 130.128/133.128/246.128/247.128, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__ML.20160707.135849.135850.grb, 00/12, FC
-9, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , 1.0/1.0, 1, SFC, EI, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__SL.20160707.135849.135850.grb, 00/12, FC
-10, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , OFF, 1/to/60, ML, EI, OFF, 131.128/132.128/155.128, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__ML.20160707.135849.135850.grb, 00/12, FC
-11, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , OFF, 1, ML, EI, OFF, 152.128, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__SL.20160707.135849.135850.grb, 00/12, FC
+1, 24, 90.0/-179.0/-90.0/180.0, None, 20160706/to/20160708, 1, , 1.0/1.0, 1, SFC, EI, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/12/by/3, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20160706.100485.100486.grb, 00/12, FC
+1, 24, , None, 20160707/to/20160707, 1, reduced, 80, 1, ML, EI, OFF, 133.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANGG__SL.20160707.100485.100486.grb, 00/12, AN
+2, 24, 90.0/-179.0/-90.0/180.0, None, 20160707, 1, , 1.0/1.0, 1, SFC, EI, OFF, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20160707.100485.100486.grb, 00, AN
+3, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , 1.0/1.0, 1/to/60, ML, EI, OFF, 130.128/133.128/246.128/247.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.20160707.100485.100486.grb, 00/12, AN
+4, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , 1.0/1.0, 1, SFC, EI, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.20160707.100485.100486.grb, 00/12, AN
+5, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , OFF, 1/to/60, ML, EI, OFF, 131.128/132.128/155.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__ML.20160707.100485.100486.grb, 00/12, AN
+6, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , OFF, 1, ML, EI, OFF, 152.128, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.20160707.100485.100486.grb, 00/12, AN
+7, 24, , None, 20160707/to/20160707, 1, reduced, 80, 1, ML, EI, OFF, 133.128, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCGG__SL.20160707.100485.100486.grb, 00/12, FC
+8, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , 1.0/1.0, 1/to/60, ML, EI, OFF, 130.128/133.128/246.128/247.128, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__ML.20160707.100485.100486.grb, 00/12, FC
+9, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , 1.0/1.0, 1, SFC, EI, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__SL.20160707.100485.100486.grb, 00/12, FC
+10, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , OFF, 1/to/60, ML, EI, OFF, 131.128/132.128/155.128, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__ML.20160707.100485.100486.grb, 00/12, FC
+11, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , OFF, 1, ML, EI, OFF, 152.128, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__SL.20160707.100485.100486.grb, 00/12, FC
diff --git a/Testing/Regression/Mars_request/7.1/OD.ELDA.FC.eta.ens.double_mr.csv b/Testing/Regression/Mars_request/7.1/OD.ELDA.FC.eta.ens.double_mr.csv
index fbf2875b689a3f593e284de6aea25c5ccb7baa47..8cd71ad559860e8d8d51c05ee33f7da93e4b5a3d 100644
--- a/Testing/Regression/Mars_request/7.1/OD.ELDA.FC.eta.ens.double_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/OD.ELDA.FC.eta.ens.double_mr.csv
@@ -1,9 +1,9 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190602, 1, , 1.0/1.0, 1, SFC, OD, 000/TO/025, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/12/by/3, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20190531.136321.136322.grb, 06/18, FC
-1, 24, 30.0/-10.0/10.0/10.0, None, 20190531, 1, , 1.0/1.0, 1, SFC, OD, 000/TO/025, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190531.136321.136322.grb, 00, AN
-2, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , 1.0/1.0, 1/TO/137, ML, OD, 000/TO/025, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 00, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20190531.136321.136322.grb, 00/06/12/18, AN
-3, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , 1.0/1.0, 1, SFC, OD, 000/TO/025, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128/134.128, , 159, 00, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20190531.136321.136322.grb, 00/06/12/18, AN
-4, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , OFF, 1, ML, OD, 000/TO/025, 152.128, , 159, 00, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20190531.136321.136322.grb, 00/06/12/18, AN
-5, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , 1.0/1.0, 1/TO/137, ML, OD, 000/TO/025, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 09/03, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__ML.20190531.136321.136322.grb, 18/06, FC
-6, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , 1.0/1.0, 1, SFC, OD, 000/TO/025, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128/134.128, , 159, 09/03, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__SL.20190531.136321.136322.grb, 18/06, FC
-7, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , OFF, 1, ML, OD, 000/TO/025, 152.128, , 159, 09/03, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__SL.20190531.136321.136322.grb, 18/06, FC
+1, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190602, 1, , 1.0/1.0, 1, SFC, OD, 000/TO/025, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/12/by/3, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20190531.100480.100481.grb, 06/18, FC
+1, 24, 30.0/-10.0/10.0/10.0, None, 20190531, 1, , 1.0/1.0, 1, SFC, OD, 000/TO/025, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190531.100480.100481.grb, 00, AN
+2, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , 1.0/1.0, 1/TO/137, ML, OD, 000/TO/025, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 00, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.20190531.100480.100481.grb, 00/06/12/18, AN
+3, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , 1.0/1.0, 1, SFC, OD, 000/TO/025, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128/134.128, , 159, 00, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.20190531.100480.100481.grb, 00/06/12/18, AN
+4, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , OFF, 1, ML, OD, 000/TO/025, 152.128, , 159, 00, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.20190531.100480.100481.grb, 00/06/12/18, AN
+5, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , 1.0/1.0, 1/TO/137, ML, OD, 000/TO/025, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 09/03, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__ML.20190531.100480.100481.grb, 18/06, FC
+6, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , 1.0/1.0, 1, SFC, OD, 000/TO/025, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128/134.128, , 159, 09/03, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__SL.20190531.100480.100481.grb, 18/06, FC
+7, 24, 30.0/-10.0/10.0/10.0, None, 20190531/to/20190601, 1, , OFF, 1, ML, OD, 000/TO/025, 152.128, , 159, 09/03, ELDA, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__SL.20190531.100480.100481.grb, 18/06, FC
diff --git a/Testing/Regression/Mars_request/7.1/OD.ENFO.CF_mr.csv b/Testing/Regression/Mars_request/7.1/OD.ENFO.CF_mr.csv
index d468c3f06b41448bd24245538f7574140f7a3398..864c5a34d4b50de0f5883fb1e6e4fb1367bd3bf9 100644
--- a/Testing/Regression/Mars_request/7.1/OD.ENFO.CF_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/OD.ENFO.CF_mr.csv
@@ -1,8 +1,8 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.0/-90.0/180.0, None, 20190531/to/20190602, 1, , 1.0/1.0, 1, SFC, OD, 000, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/9/by/3, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFOG_acc_SL.20190531.136439.136440.grb, 00/12, CF
-1, 24, , None, 20190601/to/20190601, 1, reduced, 80, 1, ML, OD, 000, 133.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFGG__SL.20190601.136439.136440.grb, 00/12, CF
-2, 24, 90.0/-179.0/-90.0/180.0, None, 20190601, 1, , 1.0/1.0, 1, SFC, OD, 000, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190601.136439.136440.grb, 00, AN
-3, 24, 90.0/-179.0/-90.0/180.0, None, 20190601/to/20190601, 1, , 1.0/1.0, 1/TO/91, ML, OD, 000, 130.128/133.128/246.128/247.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFOG__ML.20190601.136439.136440.grb, 00/12, CF
-4, 24, 90.0/-179.0/-90.0/180.0, None, 20190601/to/20190601, 1, , 1.0/1.0, 1, SFC, OD, 000, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128/134.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFOG__SL.20190601.136439.136440.grb, 00/12, CF
-5, 24, 90.0/-179.0/-90.0/180.0, None, 20190601/to/20190601, 1, , OFF, 1/to/91, ML, OD, 000, 131.128/132.128/155.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFSH__ML.20190601.136439.136440.grb, 00/12, CF
-6, 24, 90.0/-179.0/-90.0/180.0, None, 20190601/to/20190601, 1, , OFF, 1, ML, OD, 000, 152.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//CFSH__SL.20190601.136439.136440.grb, 00/12, CF
+1, 24, 90.0/-179.0/-90.0/180.0, None, 20190531/to/20190602, 1, , 1.0/1.0, 1, SFC, OD, 000, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/9/by/3, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFOG_acc_SL.20190531.100475.100476.grb, 00/12, CF
+1, 24, , None, 20190601/to/20190601, 1, reduced, 80, 1, ML, OD, 000, 133.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFGG__SL.20190601.100475.100476.grb, 00/12, CF
+2, 24, 90.0/-179.0/-90.0/180.0, None, 20190601, 1, , 1.0/1.0, 1, SFC, OD, 000, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190601.100475.100476.grb, 00, AN
+3, 24, 90.0/-179.0/-90.0/180.0, None, 20190601/to/20190601, 1, , 1.0/1.0, 1/TO/91, ML, OD, 000, 130.128/133.128/246.128/247.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFOG__ML.20190601.100475.100476.grb, 00/12, CF
+4, 24, 90.0/-179.0/-90.0/180.0, None, 20190601/to/20190601, 1, , 1.0/1.0, 1, SFC, OD, 000, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128/134.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFOG__SL.20190601.100475.100476.grb, 00/12, CF
+5, 24, 90.0/-179.0/-90.0/180.0, None, 20190601/to/20190601, 1, , OFF, 1/to/91, ML, OD, 000, 131.128/132.128/155.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFSH__ML.20190601.100475.100476.grb, 00/12, CF
+6, 24, 90.0/-179.0/-90.0/180.0, None, 20190601/to/20190601, 1, , OFF, 1, ML, OD, 000, 152.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//CFSH__SL.20190601.100475.100476.grb, 00/12, CF
diff --git a/Testing/Regression/Mars_request/7.1/OD.ENFO.PF_mr.csv b/Testing/Regression/Mars_request/7.1/OD.ENFO.PF_mr.csv
index 8986816dad3e9ac10c579c3735e71bd6720b4dd1..2662baaeddc1fcb5686bc6d4c53ca74c1e0682e4 100644
--- a/Testing/Regression/Mars_request/7.1/OD.ENFO.PF_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/OD.ENFO.PF_mr.csv
@@ -1,8 +1,8 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.0/-90.0/180.0, None, 20190630/to/20190702, 1, , 1.0/1.0, 1, SFC, OD, 001/TO/050, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/9/by/3, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//PFOG_acc_SL.20190630.136380.136381.grb, 00, PF
-1, 24, , None, 20190701/to/20190701, 1, reduced, 80, 1, ML, OD, 001/TO/050, 133.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//PFGG__SL.20190701.136380.136381.grb, 00/12, PF
-2, 24, 90.0/-179.0/-90.0/180.0, None, 20190701, 1, , 1.0/1.0, 1, SFC, OD, 001/TO/050, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190701.136380.136381.grb, 00, AN
-3, 24, 90.0/-179.0/-90.0/180.0, None, 20190701/to/20190701, 1, , 1.0/1.0, 85/TO/91, ML, OD, 001/TO/050, 130.128/133.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//PFOG__ML.20190701.136380.136381.grb, 00/12, PF
-4, 24, 90.0/-179.0/-90.0/180.0, None, 20190701/to/20190701, 1, , 1.0/1.0, 1, SFC, OD, 001/TO/050, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128/134.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//PFOG__SL.20190701.136380.136381.grb, 00/12, PF
-5, 24, 90.0/-179.0/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1/to/91, ML, OD, 001/TO/050, 131.128/132.128/155.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//PFSH__ML.20190701.136380.136381.grb, 00/12, PF
-6, 24, 90.0/-179.0/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1, ML, OD, 001/TO/050, 152.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//PFSH__SL.20190701.136380.136381.grb, 00/12, PF
+1, 24, 90.0/-179.0/-90.0/180.0, None, 20190630/to/20190702, 1, , 1.0/1.0, 1, SFC, OD, 001/TO/050, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/9/by/3, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//PFOG_acc_SL.20190630.100470.100471.grb, 00, PF
+1, 24, , None, 20190701/to/20190701, 1, reduced, 80, 1, ML, OD, 001/TO/050, 133.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//PFGG__SL.20190701.100470.100471.grb, 00/12, PF
+2, 24, 90.0/-179.0/-90.0/180.0, None, 20190701, 1, , 1.0/1.0, 1, SFC, OD, 001/TO/050, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190701.100470.100471.grb, 00, AN
+3, 24, 90.0/-179.0/-90.0/180.0, None, 20190701/to/20190701, 1, , 1.0/1.0, 85/TO/91, ML, OD, 001/TO/050, 130.128/133.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//PFOG__ML.20190701.100470.100471.grb, 00/12, PF
+4, 24, 90.0/-179.0/-90.0/180.0, None, 20190701/to/20190701, 1, , 1.0/1.0, 1, SFC, OD, 001/TO/050, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128/134.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//PFOG__SL.20190701.100470.100471.grb, 00/12, PF
+5, 24, 90.0/-179.0/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1/to/91, ML, OD, 001/TO/050, 131.128/132.128/155.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//PFSH__ML.20190701.100470.100471.grb, 00/12, PF
+6, 24, 90.0/-179.0/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1, ML, OD, 001/TO/050, 152.128, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//PFSH__SL.20190701.100470.100471.grb, 00/12, PF
diff --git a/Testing/Regression/Mars_request/7.1/OD.OPER.4V.operational_mr.csv b/Testing/Regression/Mars_request/7.1/OD.OPER.4V.operational_mr.csv
index 1a416725cb9e3fd3a8e14c8e194ab5fe2eefa252..47a677d90c7287eccd78da3054744e2afbf452a9 100644
--- a/Testing/Regression/Mars_request/7.1/OD.OPER.4V.operational_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/OD.OPER.4V.operational_mr.csv
@@ -1,18 +1,18 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 60.0/-25.0/10.0/60.0, None, 20190709/to/20190711, 1, , 1.0/1.0, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 255, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20190709.136085.136086.grb, 00/12, FC
-1, 24, , None, 20190710/to/20190710, 1, reduced, 128, 1, ML, OD, OFF, 133.128, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//4VGG__SL.20190710.136085.136086.grb, 09/21, 4V
-2, 24, 60.0/-25.0/10.0/60.0, None, 20190710, 1, , 1.0/1.0, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 255, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190710.136085.136086.grb, 00, AN
-3, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1/to/137, ML, OD, OFF, 130.128/133.128/246.128/247.128, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//4VOG__ML.20190710.136085.136086.grb, 09/21, 4V
-4, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//4VOG__SL.20190710.136085.136086.grb, 09/21, 4V
-5, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1/to/137, ML, OD, OFF, 131.128/132.128/155.128, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//4VSH__ML.20190710.136085.136086.grb, 09/21, 4V
-6, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//4VSH__SL.20190710.136085.136086.grb, 09/21, 4V
-7, 24, , None, 20190710/to/20190710, 1, reduced, 128, 1, ML, OD, OFF, 133.128, , 255, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANGG__SL.20190710.136085.136086.grb, 00/06/18, AN
-8, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1/to/137, ML, OD, OFF, 130.128/133.128/246.128/247.128, , 255, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20190710.136085.136086.grb, 00/06/18, AN
-9, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 255, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20190710.136085.136086.grb, 00/06/18, AN
-10, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1/to/137, ML, OD, OFF, 131.128/132.128/155.128, , 255, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__ML.20190710.136085.136086.grb, 00/06/18, AN
-11, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 255, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20190710.136085.136086.grb, 00/06/18, AN
-12, 24, , None, 20190710/to/20190710, 1, reduced, 128, 1, ML, OD, OFF, 133.128, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCGG__SL.20190710.136085.136086.grb, 00/12, FC
-13, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1/to/137, ML, OD, OFF, 130.128/133.128/246.128/247.128, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__ML.20190710.136085.136086.grb, 00/12, FC
-14, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__SL.20190710.136085.136086.grb, 00/12, FC
-15, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1/to/137, ML, OD, OFF, 131.128/132.128/155.128, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__ML.20190710.136085.136086.grb, 00/12, FC
-16, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__SL.20190710.136085.136086.grb, 00/12, FC
+1, 24, 60.0/-25.0/10.0/60.0, None, 20190709/to/20190711, 1, , 1.0/1.0, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 255, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20190709.100465.100466.grb, 00/12, FC
+1, 24, , None, 20190710/to/20190710, 1, reduced, 128, 1, ML, OD, OFF, 133.128, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//4VGG__SL.20190710.100465.100466.grb, 09/21, 4V
+2, 24, 60.0/-25.0/10.0/60.0, None, 20190710, 1, , 1.0/1.0, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 255, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190710.100465.100466.grb, 00, AN
+3, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1/to/137, ML, OD, OFF, 130.128/133.128/246.128/247.128, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//4VOG__ML.20190710.100465.100466.grb, 09/21, 4V
+4, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//4VOG__SL.20190710.100465.100466.grb, 09/21, 4V
+5, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1/to/137, ML, OD, OFF, 131.128/132.128/155.128, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//4VSH__ML.20190710.100465.100466.grb, 09/21, 4V
+6, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//4VSH__SL.20190710.100465.100466.grb, 09/21, 4V
+7, 24, , None, 20190710/to/20190710, 1, reduced, 128, 1, ML, OD, OFF, 133.128, , 255, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANGG__SL.20190710.100465.100466.grb, 00/06/18, AN
+8, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1/to/137, ML, OD, OFF, 130.128/133.128/246.128/247.128, , 255, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.20190710.100465.100466.grb, 00/06/18, AN
+9, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 255, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.20190710.100465.100466.grb, 00/06/18, AN
+10, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1/to/137, ML, OD, OFF, 131.128/132.128/155.128, , 255, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__ML.20190710.100465.100466.grb, 00/06/18, AN
+11, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 255, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.20190710.100465.100466.grb, 00/06/18, AN
+12, 24, , None, 20190710/to/20190710, 1, reduced, 128, 1, ML, OD, OFF, 133.128, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCGG__SL.20190710.100465.100466.grb, 00/12, FC
+13, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1/to/137, ML, OD, OFF, 130.128/133.128/246.128/247.128, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__ML.20190710.100465.100466.grb, 00/12, FC
+14, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__SL.20190710.100465.100466.grb, 00/12, FC
+15, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1/to/137, ML, OD, OFF, 131.128/132.128/155.128, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__ML.20190710.100465.100466.grb, 00/12, FC
+16, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__SL.20190710.100465.100466.grb, 00/12, FC
diff --git a/Testing/Regression/Mars_request/7.1/OD.OPER.FC.36hours_mr.csv b/Testing/Regression/Mars_request/7.1/OD.OPER.FC.36hours_mr.csv
index 88e20bae7d33d5bde0ddf7c2db9b2f200b82c7bb..e63a05e83c0af4ee924b2978f0505d6cc7e5a7cb 100644
--- a/Testing/Regression/Mars_request/7.1/OD.OPER.FC.36hours_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/OD.OPER.FC.36hours_mr.csv
@@ -1,6 +1,6 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.0/-90.0/180.0, None, 20190406/to/20190406, 1, , 1.0/1.0, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/36/by/3, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20190406.135908.135909.grb, 00, FC
-1, 24, 90.0/-179.0/-90.0/180.0, None, 20190406, 1, , 1.0/1.0, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190406.135908.135909.grb, 00, AN
-2, 24, 90.0/-179.0/-90.0/180.0, None, 20190406/to/20190406, 1, , 1.0/1.0, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__ML.20190406.135908.135909.grb, 00, FC
-3, 24, 90.0/-179.0/-90.0/180.0, None, 20190406/to/20190406, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__SL.20190406.135908.135909.grb, 00, FC
-4, 24, 90.0/-179.0/-90.0/180.0, None, 20190406/to/20190406, 1, , OFF, 1, ML, OD, OFF, 152.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__SL.20190406.135908.135909.grb, 00, FC
+1, 24, 90.0/-179.0/-90.0/180.0, None, 20190406/to/20190406, 1, , 1.0/1.0, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/36/by/3, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20190406.100460.100461.grb, 00, FC
+1, 24, 90.0/-179.0/-90.0/180.0, None, 20190406, 1, , 1.0/1.0, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190406.100460.100461.grb, 00, AN
+2, 24, 90.0/-179.0/-90.0/180.0, None, 20190406/to/20190406, 1, , 1.0/1.0, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__ML.20190406.100460.100461.grb, 00, FC
+3, 24, 90.0/-179.0/-90.0/180.0, None, 20190406/to/20190406, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__SL.20190406.100460.100461.grb, 00, FC
+4, 24, 90.0/-179.0/-90.0/180.0, None, 20190406/to/20190406, 1, , OFF, 1, ML, OD, OFF, 152.128, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__SL.20190406.100460.100461.grb, 00, FC
diff --git a/Testing/Regression/Mars_request/7.1/OD.OPER.FC.twiceaday_mr.csv b/Testing/Regression/Mars_request/7.1/OD.OPER.FC.twiceaday_mr.csv
index 319f64b700b55d41501b0d85fb45edf0dee2dbb1..a263334ad5de5590ae572cd46621437e588d44e6 100644
--- a/Testing/Regression/Mars_request/7.1/OD.OPER.FC.twiceaday_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/OD.OPER.FC.twiceaday_mr.csv
@@ -1,6 +1,6 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.0/-90.0/180.0, None, 20190604/to/20190606, 1, , 1.0/1.0, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/12/by/3, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20190604.135967.135968.grb, 00/12, FC
-1, 24, 90.0/-179.0/-90.0/180.0, None, 20190605, 1, , 1.0/1.0, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190605.135967.135968.grb, 00, AN
-2, 24, 90.0/-179.0/-90.0/180.0, None, 20190605/to/20190605, 1, , 1.0/1.0, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 00/03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__ML.20190605.135967.135968.grb, 00/12, FC
-3, 24, 90.0/-179.0/-90.0/180.0, None, 20190605/to/20190605, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00/03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__SL.20190605.135967.135968.grb, 00/12, FC
-4, 24, 90.0/-179.0/-90.0/180.0, None, 20190605/to/20190605, 1, , OFF, 1, ML, OD, OFF, 152.128, , 159, 00/03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__SL.20190605.135967.135968.grb, 00/12, FC
+1, 24, 90.0/-179.0/-90.0/180.0, None, 20190604/to/20190606, 1, , 1.0/1.0, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 159, 3/to/12/by/3, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20190604.100455.100456.grb, 00/12, FC
+1, 24, 90.0/-179.0/-90.0/180.0, None, 20190605, 1, , 1.0/1.0, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190605.100455.100456.grb, 00, AN
+2, 24, 90.0/-179.0/-90.0/180.0, None, 20190605/to/20190605, 1, , 1.0/1.0, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 159, 00/03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__ML.20190605.100455.100456.grb, 00/12, FC
+3, 24, 90.0/-179.0/-90.0/180.0, None, 20190605/to/20190605, 1, , 1.0/1.0, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 159, 00/03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__SL.20190605.100455.100456.grb, 00/12, FC
+4, 24, 90.0/-179.0/-90.0/180.0, None, 20190605/to/20190605, 1, , OFF, 1, ML, OD, OFF, 152.128, , 159, 00/03/06/09, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__SL.20190605.100455.100456.grb, 00/12, FC
diff --git a/Testing/Regression/Mars_request/7.1/OD.OPER.global.025_mr.csv b/Testing/Regression/Mars_request/7.1/OD.OPER.global.025_mr.csv
index 63e16cae7beb776005fa8aa51ddeeb7e052ce599..480a1bea7ec6f531b6421fcf2bb47867d37741d7 100644
--- a/Testing/Regression/Mars_request/7.1/OD.OPER.global.025_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/OD.OPER.global.025_mr.csv
@@ -1,9 +1,9 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 90.0/-179.75/-90.0/180.0, None, 20190630/to/20190702, 1, , 0.25/0.25, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20190630.136026.136027.grb, 00/12, FC
-1, 24, 90.0/-179.75/-90.0/180.0, None, 20190701, 1, , 0.25/0.25, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 799, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190701.136026.136027.grb, 00, AN
-2, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , 0.25/0.25, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20190701.136026.136027.grb, 00/12, AN
-3, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , 0.25/0.25, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20190701.136026.136027.grb, 00/12, AN
-4, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1, ML, OD, OFF, 152.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20190701.136026.136027.grb, 00/12, AN
-5, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , 0.25/0.25, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__ML.20190701.136026.136027.grb, 00/12, FC
-6, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , 0.25/0.25, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__SL.20190701.136026.136027.grb, 00/12, FC
-7, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1, ML, OD, OFF, 152.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__SL.20190701.136026.136027.grb, 00/12, FC
+1, 24, 90.0/-179.75/-90.0/180.0, None, 20190630/to/20190702, 1, , 0.25/0.25, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20190630.100450.100451.grb, 00/12, FC
+1, 24, 90.0/-179.75/-90.0/180.0, None, 20190701, 1, , 0.25/0.25, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 799, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190701.100450.100451.grb, 00, AN
+2, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , 0.25/0.25, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.20190701.100450.100451.grb, 00/12, AN
+3, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , 0.25/0.25, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.20190701.100450.100451.grb, 00/12, AN
+4, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1, ML, OD, OFF, 152.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.20190701.100450.100451.grb, 00/12, AN
+5, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , 0.25/0.25, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__ML.20190701.100450.100451.grb, 00/12, FC
+6, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , 0.25/0.25, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__SL.20190701.100450.100451.grb, 00/12, FC
+7, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1, ML, OD, OFF, 152.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__SL.20190701.100450.100451.grb, 00/12, FC
diff --git a/Testing/Regression/Mars_request/7.1/OD.OPER.highres.eta_mr.csv b/Testing/Regression/Mars_request/7.1/OD.OPER.highres.eta_mr.csv
index ca4996db8447c245cd6b91eb575071b4e16e6134..da6d440ddfde624d5ad56814364ec769f4a3261b 100644
--- a/Testing/Regression/Mars_request/7.1/OD.OPER.highres.eta_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/OD.OPER.highres.eta_mr.csv
@@ -1,9 +1,9 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 60.0/-10.0/30.0/30.0, None, 20190709/to/20190711, 1, , 0.2/0.2, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20190709.136498.136499.grb, 00/12, FC
-1, 24, 60.0/-10.0/30.0/30.0, None, 20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 799, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190710.136498.136499.grb, 00, AN
-2, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20190710.136498.136499.grb, 00/12, AN
-3, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20190710.136498.136499.grb, 00/12, AN
-4, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20190710.136498.136499.grb, 00/12, AN
-5, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__ML.20190710.136498.136499.grb, 00/12, FC
-6, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__SL.20190710.136498.136499.grb, 00/12, FC
-7, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__SL.20190710.136498.136499.grb, 00/12, FC
+1, 24, 60.0/-10.0/30.0/30.0, None, 20190709/to/20190711, 1, , 0.2/0.2, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20190709.100445.100446.grb, 00/12, FC
+1, 24, 60.0/-10.0/30.0/30.0, None, 20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 799, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190710.100445.100446.grb, 00, AN
+2, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.20190710.100445.100446.grb, 00/12, AN
+3, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.20190710.100445.100446.grb, 00/12, AN
+4, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.20190710.100445.100446.grb, 00/12, AN
+5, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1/to/137, ML, OD, OFF, 130.128/133.128/131.128/132.128/077.128/246.128/247.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__ML.20190710.100445.100446.grb, 00/12, FC
+6, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__SL.20190710.100445.100446.grb, 00/12, FC
+7, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__SL.20190710.100445.100446.grb, 00/12, FC
diff --git a/Testing/Regression/Mars_request/7.1/OD.OPER.highres.gauss_mr.csv b/Testing/Regression/Mars_request/7.1/OD.OPER.highres.gauss_mr.csv
index 9912e5f3e8ab908a88dc66b2fecdefb06f0d9139..9dceb9113421eea0916884da4051f42e0c521ffa 100644
--- a/Testing/Regression/Mars_request/7.1/OD.OPER.highres.gauss_mr.csv
+++ b/Testing/Regression/Mars_request/7.1/OD.OPER.highres.gauss_mr.csv
@@ -1,13 +1,13 @@
 request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 60.0/-10.0/30.0/30.0, None, 20190709/to/20190711, 1, , 0.2/0.2, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 1279, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20190709.136557.136558.grb, 00/12, FC
-1, 24, , None, 20190710/to/20190710, 1, reduced, 640, 1, ML, OD, OFF, 133.128, , 1279, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANGG__SL.20190710.136557.136558.grb, 00/12, AN
-2, 24, 60.0/-10.0/30.0/30.0, None, 20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 1279, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190710.136557.136558.grb, 00, AN
-3, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1/to/137, ML, OD, OFF, 130.128/133.128/246.128/247.128, , 1279, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20190710.136557.136558.grb, 00/12, AN
-4, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 1279, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20190710.136557.136558.grb, 00/12, AN
-5, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1/to/137, ML, OD, OFF, 131.128/132.128/155.128, , 1279, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__ML.20190710.136557.136558.grb, 00/12, AN
-6, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 1279, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20190710.136557.136558.grb, 00/12, AN
-7, 24, , None, 20190710/to/20190710, 1, reduced, 640, 1, ML, OD, OFF, 133.128, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCGG__SL.20190710.136557.136558.grb, 00/12, FC
-8, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1/to/137, ML, OD, OFF, 130.128/133.128/246.128/247.128, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__ML.20190710.136557.136558.grb, 00/12, FC
-9, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG__SL.20190710.136557.136558.grb, 00/12, FC
-10, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1/to/137, ML, OD, OFF, 131.128/132.128/155.128, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__ML.20190710.136557.136558.grb, 00/12, FC
-11, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCSH__SL.20190710.136557.136558.grb, 00/12, FC
+1, 24, 60.0/-10.0/30.0/30.0, None, 20190709/to/20190711, 1, , 0.2/0.2, 1, SFC, OD, OFF, 142.128/143.128/146.128/180.128/181.128/176.128, , 1279, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG_acc_SL.20190709.100439.100440.grb, 00/12, FC
+1, 24, , None, 20190710/to/20190710, 1, reduced, 640, 1, ML, OD, OFF, 133.128, , 1279, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANGG__SL.20190710.100439.100440.grb, 00/12, AN
+2, 24, 60.0/-10.0/30.0/30.0, None, 20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 160.128/027.128/028.128/173.128, , 1279, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//OG_OROLSM__SL.20190710.100439.100440.grb, 00, AN
+3, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1/to/137, ML, OD, OFF, 130.128/133.128/246.128/247.128, , 1279, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__ML.20190710.100439.100440.grb, 00/12, AN
+4, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 1279, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANOG__SL.20190710.100439.100440.grb, 00/12, AN
+5, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1/to/137, ML, OD, OFF, 131.128/132.128/155.128, , 1279, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__ML.20190710.100439.100440.grb, 00/12, AN
+6, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 1279, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//ANSH__SL.20190710.100439.100440.grb, 00/12, AN
+7, 24, , None, 20190710/to/20190710, 1, reduced, 640, 1, ML, OD, OFF, 133.128, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCGG__SL.20190710.100439.100440.grb, 00/12, FC
+8, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1/to/137, ML, OD, OFF, 130.128/133.128/246.128/247.128, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__ML.20190710.100439.100440.grb, 00/12, FC
+9, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , 0.2/0.2, 1, SFC, OD, OFF, 141.128/151.128/164.128/165.128/166.128/167.128/168.128/129.128/172.128/186.128/187.128/188.128/235.128/139.128/039.128, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCOG__SL.20190710.100439.100440.grb, 00/12, FC
+10, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1/to/137, ML, OD, OFF, 131.128/132.128/155.128, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__ML.20190710.100439.100440.grb, 00/12, FC
+11, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, 152.128, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/Testing/Regression/Mars_request/./7.1//FCSH__SL.20190710.100439.100440.grb, 00/12, FC
diff --git a/Testing/Regression/Mars_request/Log/log_2019-10-02_23-42-22 b/Testing/Regression/Mars_request/Log/log_2019-10-02_23-42-22
new file mode 100644
index 0000000000000000000000000000000000000000..5a42150eadd04296f6b39e9ce25598560225903f
--- /dev/null
+++ b/Testing/Regression/Mars_request/Log/log_2019-10-02_23-42-22
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 : 
diff --git a/Testing/Regression/Mars_request/Log/log_2019-10-02_23-42-34 b/Testing/Regression/Mars_request/Log/log_2019-10-02_23-42-34
new file mode 100644
index 0000000000000000000000000000000000000000..5a42150eadd04296f6b39e9ce25598560225903f
--- /dev/null
+++ b/Testing/Regression/Mars_request/Log/log_2019-10-02_23-42-34
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 : 
diff --git a/Testing/Regression/Mars_request/Log/log_2019-10-02_23-42-53 b/Testing/Regression/Mars_request/Log/log_2019-10-02_23-42-53
new file mode 100644
index 0000000000000000000000000000000000000000..f1f5fed3813671f9d2fafb6c02ca6d2b5c357522
--- /dev/null
+++ b/Testing/Regression/Mars_request/Log/log_2019-10-02_23-42-53
@@ -0,0 +1,25 @@
+Compare mars requests between version 7.0.4 and version 7.1 : 
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
+... CONTROL_OD.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_OD.ENFO.PF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ENFO.CF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ELDA.FC.eta.ens.double_mr ... FAILED!
+... 	Unconsistency happend to be in column: date
+
+... CONTROL_EI_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_CV_mr ... OK!
+... CONTROL_CF_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
diff --git a/Testing/Regression/Mars_request/Log/log_2019-10-04_14-42-30 b/Testing/Regression/Mars_request/Log/log_2019-10-04_14-42-30
new file mode 100644
index 0000000000000000000000000000000000000000..f1f5fed3813671f9d2fafb6c02ca6d2b5c357522
--- /dev/null
+++ b/Testing/Regression/Mars_request/Log/log_2019-10-04_14-42-30
@@ -0,0 +1,25 @@
+Compare mars requests between version 7.0.4 and version 7.1 : 
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
+... CONTROL_OD.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_OD.ENFO.PF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ENFO.CF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ELDA.FC.eta.ens.double_mr ... FAILED!
+... 	Unconsistency happend to be in column: date
+
+... CONTROL_EI_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_CV_mr ... OK!
+... CONTROL_CF_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
diff --git a/Testing/Regression/Mars_request/Log/log_2019-10-04_15-06-58 b/Testing/Regression/Mars_request/Log/log_2019-10-04_15-06-58
new file mode 100644
index 0000000000000000000000000000000000000000..5a42150eadd04296f6b39e9ce25598560225903f
--- /dev/null
+++ b/Testing/Regression/Mars_request/Log/log_2019-10-04_15-06-58
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 : 
diff --git a/Testing/Regression/Mars_request/Log/log_2019-10-04_15-09-27 b/Testing/Regression/Mars_request/Log/log_2019-10-04_15-09-27
new file mode 100644
index 0000000000000000000000000000000000000000..f1f5fed3813671f9d2fafb6c02ca6d2b5c357522
--- /dev/null
+++ b/Testing/Regression/Mars_request/Log/log_2019-10-04_15-09-27
@@ -0,0 +1,25 @@
+Compare mars requests between version 7.0.4 and version 7.1 : 
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
+... CONTROL_OD.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_OD.ENFO.PF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ENFO.CF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ELDA.FC.eta.ens.double_mr ... FAILED!
+... 	Unconsistency happend to be in column: date
+
+... CONTROL_EI_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_CV_mr ... OK!
+... CONTROL_CF_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
diff --git a/Testing/Regression/Mars_request/Log/log_2019-10-04_16-36-49 b/Testing/Regression/Mars_request/Log/log_2019-10-04_16-36-49
new file mode 100644
index 0000000000000000000000000000000000000000..f1f5fed3813671f9d2fafb6c02ca6d2b5c357522
--- /dev/null
+++ b/Testing/Regression/Mars_request/Log/log_2019-10-04_16-36-49
@@ -0,0 +1,25 @@
+Compare mars requests between version 7.0.4 and version 7.1 : 
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
+... CONTROL_OD.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_OD.ENFO.PF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ENFO.CF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ELDA.FC.eta.ens.double_mr ... FAILED!
+... 	Unconsistency happend to be in column: date
+
+... CONTROL_EI_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_CV_mr ... OK!
+... CONTROL_CF_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
diff --git a/Testing/Regression/Mars_request/Log/log_2019-10-11_16-33-36 b/Testing/Regression/Mars_request/Log/log_2019-10-11_16-33-36
new file mode 100644
index 0000000000000000000000000000000000000000..f1f5fed3813671f9d2fafb6c02ca6d2b5c357522
--- /dev/null
+++ b/Testing/Regression/Mars_request/Log/log_2019-10-11_16-33-36
@@ -0,0 +1,25 @@
+Compare mars requests between version 7.0.4 and version 7.1 : 
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
+... CONTROL_OD.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_OD.ENFO.PF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ENFO.CF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ELDA.FC.eta.ens.double_mr ... FAILED!
+... 	Unconsistency happend to be in column: date
+
+... CONTROL_EI_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_CV_mr ... OK!
+... CONTROL_CF_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
diff --git a/Testing/Regression/Mars_request/Log/log_2019-11-05_19-46-23 b/Testing/Regression/Mars_request/Log/log_2019-11-05_19-46-23
new file mode 100644
index 0000000000000000000000000000000000000000..f1f5fed3813671f9d2fafb6c02ca6d2b5c357522
--- /dev/null
+++ b/Testing/Regression/Mars_request/Log/log_2019-11-05_19-46-23
@@ -0,0 +1,25 @@
+Compare mars requests between version 7.0.4 and version 7.1 : 
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
+... CONTROL_OD.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_OD.ENFO.PF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ENFO.CF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ELDA.FC.eta.ens.double_mr ... FAILED!
+... 	Unconsistency happend to be in column: date
+
+... CONTROL_EI_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_CV_mr ... OK!
+... CONTROL_CF_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
diff --git a/Testing/Regression/Mars_request/Log/log_2019-11-26_14-45-26 b/Testing/Regression/Mars_request/Log/log_2019-11-26_14-45-26
new file mode 100644
index 0000000000000000000000000000000000000000..f1f5fed3813671f9d2fafb6c02ca6d2b5c357522
--- /dev/null
+++ b/Testing/Regression/Mars_request/Log/log_2019-11-26_14-45-26
@@ -0,0 +1,25 @@
+Compare mars requests between version 7.0.4 and version 7.1 : 
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
+... CONTROL_OD.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_OD.ENFO.PF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ENFO.CF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ELDA.FC.eta.ens.double_mr ... FAILED!
+... 	Unconsistency happend to be in column: date
+
+... CONTROL_EI_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_CV_mr ... OK!
+... CONTROL_CF_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
diff --git a/Testing/Regression/Mars_request/README.md b/Testing/Regression/Mars_request/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..807f66116003588e2af94cefa09c3a0c6a8c604e
--- /dev/null
+++ b/Testing/Regression/Mars_request/README.md
@@ -0,0 +1,60 @@
+# Testcase - Mars request comparison
+
+This testcase is composed of a number of comparisons of mars requests from two different flex_extract versions.
+
+## Description
+
+A single test compares the content of mars requests from two flex_extract versions. It checks for equal number of columns in the requests, if both versions have the same number of requests and the same request content.
+
+The CONTROL files to be tested are stored in the CONTROL - directory. The corresponding mars request files of the previous version are stored in the directory 7.0.4. These are the references for version 7.1. During the execution of this test, the mars request files for version 7.1 are created and stored ( overwritten ) in directory 7.1. Results of the tests are stored in log files in the Log dir. Some extra output is printed on standard output. 
+
+A log message could look like: 
+
+Compare mars requests between version 7.0.4 and version 7.1 : 
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
+... CONTROL_OD.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_OD.ENFO.PF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ENFO.CF_mr ... FAILED!
+... 	Unconsistency happend to be in column: step
+
+... CONTROL_OD.ELDA.FC.eta.ens.double_mr ... FAILED!
+... 	Unconsistency happend to be in column: date
+
+... CONTROL_EI_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_CV_mr ... OK!
+... CONTROL_CF_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+
+
+
+
+## Usage
+
+python test_cmp_mars_requests.py <previous-version> <version-to-be-tested>
+
+e.g. python test_cmp_mars_requests.py 7.0.4 7.1
+
+## Author
+ Anne Philipp
+
+
+## License
+    (C) Copyright 2014-2019.
+
+    SPDX-License-Identifier: CC-BY-4.0
+
+    This work is licensed under the Creative Commons Attribution 4.0
+    International License. To view a copy of this license, visit
+    http://creativecommons.org/licenses/by/4.0/ or send a letter to
+    Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
diff --git a/Testing/Regression/Mars_request/COMMANDS.txt b/Testing/Regression/Mars_request/create_old_mars_requests.txt
similarity index 67%
rename from Testing/Regression/Mars_request/COMMANDS.txt
rename to Testing/Regression/Mars_request/create_old_mars_requests.txt
index 4f7d9992e371e4a1d1ef65d76cbdac14ecbfe17a..9491396453a71d8705e84a648090bab5fb9823f7 100644
--- a/Testing/Regression/Mars_request/COMMANDS.txt
+++ b/Testing/Regression/Mars_request/create_old_mars_requests.txt
@@ -1,3 +1,32 @@
+#!/bin/bash
+#
+# @Author: Anne Philipp
+#
+# @Date: October, 10 2019
+#
+# @Description: Creates the mars request files with the older (7.0.4) 
+#               version of flex_extract and places them in the test directory
+#               of mars request  comparsion tests.
+#
+# @License:
+#    (C) Copyright 2014-2019.
+#
+#    SPDX-License-Identifier: CC-BY-4.0
+#
+#    This work is licensed under the Creative Commons Attribution 4.0
+#    International License. To view a copy of this license, visit
+#    http://creativecommons.org/licenses/by/4.0/ or send a letter to
+#    Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+#               
+# @ChangeHistory:  
+#
+# @Usage: 
+#        start script within the old flex_extract python directory
+#        ./create_old_mars_request.txt  <path to mars request test directory of old version>
+#        e.g. ./create_old_mars_request.txt <local_path>/flex_extract_v7.1/Testing/Regression/Mars_request/7.0.4/
+#
+
+
 ./submit.py --controlfile=CONTROL_CERA_mr --request=1
 mv ../work/mars_requests.csv ../work/CERA_mr.csv
 
@@ -50,4 +79,7 @@ mv ../work/mars_requests.csv ../work/OD.OPER.global.025_mr.csv
 mv ../work/mars_requests.csv ../work/OD.OPER.highres.eta_mr.csv
 
 ./submit.py --controlfile=CONTROL_OD.OPER.highres.gauss_mr --request=1
-mv ../work/mars_requests.csv ../work/OD.OPER.highres.gauss_mr.csv
\ No newline at end of file
+mv ../work/mars_requests.csv ../work/OD.OPER.highres.gauss_mr.csv
+
+
+mv ./work/*_mr.csv ${1}
diff --git a/Testing/Regression/Mars_request/run_local.sh b/Testing/Regression/Mars_request/run_local.sh
index 17b6d15b4f676ce05c4ebc6c67d2a7d6202ff467..783e2a1682acc33b090b764a99dc184f9c6eb3b2 100755
--- a/Testing/Regression/Mars_request/run_local.sh
+++ b/Testing/Regression/Mars_request/run_local.sh
@@ -50,7 +50,7 @@ PUBLIC=0
 # -----------------------------------------------------------------
 
 # PATH TO SUBMISSION SCRIPT
-pyscript=../../../source/python/submit.py
+pyscript=../../../Source/Python/submit.py
 
 # INITIALIZE EMPTY PARAMETERLIST
 parameterlist=""
diff --git a/Testing/Regression/Mars_request/test_cmp_mars_requests.py b/Testing/Regression/Mars_request/test_cmp_mars_requests.py
old mode 100644
new mode 100755
index 20fcdc6378dac50e3cbdb66a365733a5690c5784..d5dc0de504eb3bd2784899a52688ea7bc93ef363
--- a/Testing/Regression/Mars_request/test_cmp_mars_requests.py
+++ b/Testing/Regression/Mars_request/test_cmp_mars_requests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Comparison of the created MARS requests of two flex_extract versions.
 
@@ -38,9 +38,9 @@ import subprocess
 import shutil
 from datetime import datetime
 
-sys.path.append('../../../source/python')
+sys.path.append('../../../Source/Python')
 import _config
-from  mods.tools import init128
+from  Mods.tools import init128
 
 # ------------------------------------------------------------------------------
 # FUNCTION
@@ -136,8 +136,11 @@ def test_mr_content_equality(mr_old, mr_new):
             lresult = True
         else:
             err_msg += 'Unconsistency happend to be in column: ' + col + '\n'
-            print mr_new[col]
-            print mr_old[col]
+            print("THERE SEEMS TO BE AN ERROR:")
+            print("CONTENT OF NEW VERSION:")
+            print(mr_new[col])
+            print("CONTENT OF OLD VERSION:")
+            print(mr_old[col])
             return False
     return lresult
 
@@ -185,8 +188,7 @@ def convert_param_step(mr_old):
             dtime = int(steps[1]) - int(steps[0])
             
             nsteps = str(int(steps[1]))+'/to/'+str(int(steps[-1]))+'/by/'+str(int(dtime))
-            return nsteps
-            
+            return nsteps            
     
     return mr_old
 
@@ -251,7 +253,7 @@ if __name__ == '__main__':
     currenttime = datetime.now()
     time_str = currenttime.strftime('%Y-%m-%d_%H-%M-%S')
     logfile = os.path.join(log_path, 'log_' + time_str)
-    with open(logfile, 'aw') as f:
+    with open(logfile, 'a') as f:
         f.write('Compare mars requests between version ' + old_dir +
                 ' and version ' + new_dir + ' : \n')
 
@@ -287,10 +289,10 @@ if __name__ == '__main__':
         # some format corrections are necessary to compare older versions with 7.1
         mr_old['param'] = mr_old['param'].apply(to_param_id, args=[table128])
         mr_old['number'] = mr_old['number'].apply(convert_param_numbers)  
-        if '142' in mr_old.ix[0,'param']: # if flux request
-            mr_old.ix[0,'step'] = convert_param_step(mr_old.ix[0,'step'])
+        if '142' in mr_old.loc[0,'param']: # if flux request
+            mr_old.loc[0,'step'] = convert_param_step(mr_old.loc[0,'step'])
 
-        print 'Results: ', c
+        print('Results: ', c)
 
         # do tests on mr files
         lcoleq = test_mr_column_equality(mr_old, mr_new)
@@ -301,7 +303,7 @@ if __name__ == '__main__':
         lfinal = lfinal and lcoleq and lnoeq and lcoeq
 
         # write out result to logging file
-        with open(logfile, 'aw') as f:
+        with open(logfile, 'a') as f:
             if lcoleq and lnoeq and lcoeq:
                 f.write('... ' + c + ' ... OK!' + '\n')
             else:
diff --git a/Testing/Controls/CONTROL.req.test b/Testing/Regression/Unit/Controls/CONTROL.req.test
similarity index 100%
rename from Testing/Controls/CONTROL.req.test
rename to Testing/Regression/Unit/Controls/CONTROL.req.test
diff --git a/Testing/Controls/CONTROL.test b/Testing/Regression/Unit/Controls/CONTROL.test
similarity index 100%
rename from Testing/Controls/CONTROL.test
rename to Testing/Regression/Unit/Controls/CONTROL.test
diff --git a/Testing/Controls/CONTROL.worktest b/Testing/Regression/Unit/Controls/CONTROL.worktest
similarity index 100%
rename from Testing/Controls/CONTROL.worktest
rename to Testing/Regression/Unit/Controls/CONTROL.worktest
diff --git a/Testing/Dir/FCOG__ML.20160410.40429.16424.grb b/Testing/Regression/Unit/Dir/FCOG__ML.20160410.40429.16424.grb
similarity index 100%
rename from Testing/Dir/FCOG__ML.20160410.40429.16424.grb
rename to Testing/Regression/Unit/Dir/FCOG__ML.20160410.40429.16424.grb
diff --git a/Testing/Dir/FCOG__SL.20160410.40429.16424.grb b/Testing/Regression/Unit/Dir/FCOG__SL.20160410.40429.16424.grb
similarity index 100%
rename from Testing/Dir/FCOG__SL.20160410.40429.16424.grb
rename to Testing/Regression/Unit/Dir/FCOG__SL.20160410.40429.16424.grb
diff --git a/Testing/Dir/FCSH__ML.20160410.40429.16424.grb b/Testing/Regression/Unit/Dir/FCSH__ML.20160410.40429.16424.grb
similarity index 100%
rename from Testing/Dir/FCSH__ML.20160410.40429.16424.grb
rename to Testing/Regression/Unit/Dir/FCSH__ML.20160410.40429.16424.grb
diff --git a/Testing/Dir/FCSH__SL.20160410.40429.16424.grb b/Testing/Regression/Unit/Dir/FCSH__SL.20160410.40429.16424.grb
similarity index 100%
rename from Testing/Dir/FCSH__SL.20160410.40429.16424.grb
rename to Testing/Regression/Unit/Dir/FCSH__SL.20160410.40429.16424.grb
diff --git a/Testing/Dir/SubTestDir/OG_OROLSM__SL.20160410.40429.16424.grb b/Testing/Regression/Unit/Dir/SubTestDir/OG_OROLSM__SL.20160410.40429.16424.grb
similarity index 100%
rename from Testing/Dir/SubTestDir/OG_OROLSM__SL.20160410.40429.16424.grb
rename to Testing/Regression/Unit/Dir/SubTestDir/OG_OROLSM__SL.20160410.40429.16424.grb
diff --git a/Testing/Dir/SubTestDir/SubSubTestDir/FCGG__SL.20160410.40429.16424.grb b/Testing/Regression/Unit/Dir/SubTestDir/SubSubTestDir/FCGG__SL.20160410.40429.16424.grb
similarity index 100%
rename from Testing/Dir/SubTestDir/SubSubTestDir/FCGG__SL.20160410.40429.16424.grb
rename to Testing/Regression/Unit/Dir/SubTestDir/SubSubTestDir/FCGG__SL.20160410.40429.16424.grb
diff --git a/Testing/Dir/SubTestDir2/FCOG_acc_SL.20160409.40429.16424.grb b/Testing/Regression/Unit/Dir/SubTestDir2/FCOG_acc_SL.20160409.40429.16424.grb
similarity index 100%
rename from Testing/Dir/SubTestDir2/FCOG_acc_SL.20160409.40429.16424.grb
rename to Testing/Regression/Unit/Dir/SubTestDir2/FCOG_acc_SL.20160409.40429.16424.grb
diff --git a/Testing/Regression/Unit/Dir/test.test b/Testing/Regression/Unit/Dir/test.test
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/Testing/Regression/Unit/InstallTar/mk_install_tar.sh b/Testing/Regression/Unit/InstallTar/mk_install_tar.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2a6bc413cd7ff208cd364bc3a9647a01dba4440f
--- /dev/null
+++ b/Testing/Regression/Unit/InstallTar/mk_install_tar.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+#
+# @Author: Anne Philipp
+#
+# @Date: November, 10 2018
+#
+# @Description: Makes a tar-ball for installation
+#
+
+# path to flex_extract base directory
+path=../../
+
+tarname='flex_extract_v7.1_local.tar'
+pwd
+tar -zcvf ../../Testing/Regression/Unit/InstallTar/$tarname  \
+        ${path}Source/Python/Classes/*py \
+        ${path}Source/Python/Mods/*py \
+        ${path}Source/Python/*py \
+        ${path}Source/Pythontest/*py \
+        ${path}Source/Fortran/*.f90 \
+        ${path}Source/Fortran/*.h \
+        ${path}Source/Fortran/makefile* \
+        ${path}Templates/convert.nl \
+        ${path}Templates/*.temp \
+        ${path}Templates/ecmwf_grib1_table_128 \
+        ${path}Run/run_local.sh \
+        ${path}Run/Control/CONTROL* \
+        --exclude=${path}Run/Control/Testgrid \
+        --exclude=${path}Run/Control/notPublic \
+        ${path}Run/Jobscripts \
+        ${path}LICENSE.md \
+        ${path}CODE_OF_CONDUCT.md \
+        ${path}README.md  \
+        ${path}Testing/* \
+        --exclude=*.ksh  \
+        --exclude=flex_extract_v7.1_*.tar
+                  
+                  
+                  
+tarname='flex_extract_v7.1_ecgate.tar'
+
+tar -zcvf ../../Testing/Regression/Unit/InstallTar/$tarname \
+        ${path}Source/Python/Classes/*py \
+        ${path}Source/Python/Mods/*py \
+        ${path}Source/Python/*py \
+        ${path}Source/Pythontest/*py \
+        ${path}Source/Fortran/*.f90 \
+        ${path}Source/Fortran/*.h \
+        ${path}Source/Fortran/makefile* \
+        ${path}Templates/convert.nl \
+        ${path}Templates/*.temp \
+        ${path}Templates/ecmwf_grib1_table_128 \
+        ${path}Run/ECMWF_ENV \
+        ${path}Run/run.sh \
+        ${path}Run/Control/CONTROL* \
+        --exclude=${path}Run/Control/Testgrid \
+        --exclude=${path}Run/Control/notPublic \
+        ${path}Run/Jobscripts \
+        ${path}LICENSE.md \
+        ${path}CODE_OF_CONDUCT.md \
+        ${path}README.md \
+        ${path}Testing/* \
+        --exclude=*.ksh  \
+        --exclude=flex_extract_v7.1_*.tar
+                  
+                 
+                  
+                  
+                  
+                  
diff --git a/Testing/Regression/Unit/InstallTar/un_install_tar.sh b/Testing/Regression/Unit/InstallTar/un_install_tar.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2e8d52c454ddce8de891ac7ea448d8fa39d2fcba
--- /dev/null
+++ b/Testing/Regression/Unit/InstallTar/un_install_tar.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# @Author: Anne Philipp
+#
+# @Date: November, 10 2018
+#
+# @Description: Untar a tar-ball for installation
+#
+
+tarname='flex_extract_v7.1_local.tar'
+dirname='flex_extract_v7.1_local'
+path=../../Testing/Regression/Unit/InstallTar/
+mkdir $path$dirname
+cd $path$dirname
+tar xvf ../$tarname 
+cd ../../../../../Source/Pythontest
+
+tarname='flex_extract_v7.1_ecgate.tar'
+dirname='flex_extract_v7.1_ecgate'
+path=../../Testing/Regression/Unit/InstallTar/
+mkdir $path$dirname
+cd $path$dirname
+tar xvf ../$tarname 
+cd ../../../../../Source/Pythontest
diff --git a/Testing/Regression/Unit/Testfiles/CONTROL.test b/Testing/Regression/Unit/Testfiles/CONTROL.test
new file mode 100644
index 0000000000000000000000000000000000000000..46b4008b87a0084ad1fbcd2b83255b8c63716efa
--- /dev/null
+++ b/Testing/Regression/Unit/Testfiles/CONTROL.test
@@ -0,0 +1,14 @@
+DTIME 3
+TYPE AN FC FC FC FC FC AN FC FC FC FC FC AN FC FC FC FC FC AN FC FC FC FC FC
+TIME 00 00 00 00 00 00 06 00 00 00 00 00 12 12 12 12 12 12 18 12 12 12 12 12
+STEP 00 01 02 03 04 05 00 07 08 09 10 11 00 01 02 03 04 05 00 07 08 09 10 11
+CLASS EI
+STREAM OPER
+EXPVER 1
+GRID 5000  
+LEFT -10000
+LOWER 30000
+UPPER 40000
+RIGHT 10000
+LEVELIST 59/to/60
+RESOL 63
diff --git a/Testing/Regression/Unit/Testfiles/ECMWF_ENV.test b/Testing/Regression/Unit/Testfiles/ECMWF_ENV.test
new file mode 100644
index 0000000000000000000000000000000000000000..dc258a940b6cacb52706c196b6ea9a5f609cc72c
--- /dev/null
+++ b/Testing/Regression/Unit/Testfiles/ECMWF_ENV.test
@@ -0,0 +1,4 @@
+ECUID testuser
+ECGID testgroup
+GATEWAY gateway.test.ac.at
+DESTINATION user@destination
diff --git a/Testing/Regression/Unit/Testfiles/compilejob.test b/Testing/Regression/Unit/Testfiles/compilejob.test
new file mode 100644
index 0000000000000000000000000000000000000000..3a4646f868234a3db43d23a818ec38b89b6f1ba6
--- /dev/null
+++ b/Testing/Regression/Unit/Testfiles/compilejob.test
@@ -0,0 +1,69 @@
+#!/bin/ksh
+
+# ON ECGB:
+# start with ecaccess-job-submit -queueName ecgb NAME_OF_THIS_FILE  on gateway server
+# start with sbatch NAME_OF_THIS_FILE directly on machine
+
+#SBATCH --workdir=/scratch/ms/testgroup/testuser
+#SBATCH --qos=normal
+#SBATCH --job-name=flex_ecmwf
+#SBATCH --output=flex_ecmwf.%j.out
+#SBATCH --error=flex_ecmwf.%j.out
+#SBATCH --mail-type=FAIL
+#SBATCH --time=12:00:00
+
+## CRAY specific batch requests
+##PBS -N flex_ecmwf
+##PBS -q ns
+##PBS -S /usr/bin/ksh
+##PBS -o /scratch/ms/testgroup/testuser/flex_ecmwf.${Jobname}.${Job_ID}.out
+# job output is in .ecaccess_DO_NOT_REMOVE
+##PBS -j oe
+##PBS -V
+##PBS -l EC_threads_per_task=1
+##PBS -l EC_memory_per_task=3200MB
+
+set -x
+export VERSION=7.1
+case ${HOST} in
+  *ecg*)
+  module unload grib_api
+  module unload eccodes
+  module load eccodes
+  module load python
+  module unload emos
+  module load emos/455-r64
+  export FLEXPART_ROOT_SCRIPTS=fp_root_test_path
+  export MAKEFILE=Makefile.TEST
+  ;;
+  *cca*)
+  module switch PrgEnv-cray PrgEnv-intel
+  module load eccodes
+  module load emos
+  module load python
+  echo ${GROUP}
+  echo ${HOME}
+  echo ${HOME} | awk -F / '{print $1, $2, $3, $4}'
+  export GROUP=`echo ${HOME} | awk -F / '{print $4}'`
+  export SCRATCH=/scratch/ms/${GROUP}/${USER}
+  export FLEXPART_ROOT_SCRIPTS=fp_root_test_path
+  export MAKEFILE=Makefile.TEST
+  ;;
+esac
+
+mkdir -p ${FLEXPART_ROOT_SCRIPTS}/flex_extract_v${VERSION}
+cd ${FLEXPART_ROOT_SCRIPTS}/flex_extract_v${VERSION}   # if FLEXPART_ROOT is not set this means cd to the home directory
+tar -xvf ${HOME}/flex_extract_v${VERSION}.tar
+cd source/fortran
+\rm *.o *.mod CONVERT2 
+make -f ${MAKEFILE} >flexcompile 2>flexcompile
+
+ls -l CONVERT2 >>flexcompile
+if [ $? -eq 0 ]; then
+  echo 'SUCCESS!' >>flexcompile
+  mail -s flexcompile.${HOST}.$$ ${USER} <flexcompile
+else
+  echo Environment: >>flexcompile
+  env >> flexcompile
+  mail -s "ERROR! flexcompile.${HOST}.$$" ${USER} <flexcompile
+fi
diff --git a/Testing/Regression/Unit/Testfiles/convert.nl.test b/Testing/Regression/Unit/Testfiles/convert.nl.test
new file mode 100644
index 0000000000000000000000000000000000000000..6134989413cdb76683d7f2c06c99dfd14b6fa56c
--- /dev/null
+++ b/Testing/Regression/Unit/Testfiles/convert.nl.test
@@ -0,0 +1,19 @@
+&NAMGEN
+  maxl = 61,
+  maxb = 46,
+  mlevel = 60,
+  mlevelist = "55/to/60",
+  mnauf = 63,
+  metapar = 77,
+  rlo0 = -15.0,
+  rlo1 = 45.0,
+  rla0 = 30.0,
+  rla1 = 75.0,
+  momega = 0,
+  momegadiff = 0,
+  mgauss = 1,
+  msmooth = 0,
+  meta = 0,
+  metadiff = 0,
+  mdpdeta = 1
+/
diff --git a/Testing/Regression/Unit/Testfiles/job.temp.test b/Testing/Regression/Unit/Testfiles/job.temp.test
new file mode 100644
index 0000000000000000000000000000000000000000..23424a3a873daf2cecd1ec99161d3e9286a3f083
--- /dev/null
+++ b/Testing/Regression/Unit/Testfiles/job.temp.test
@@ -0,0 +1,77 @@
+#!/bin/ksh
+
+# ON ECGB:
+# start with ecaccess-job-submit -queueName ecgb NAME_OF_THIS_FILE  on gateway server
+# start with sbatch NAME_OF_THIS_FILE directly on machine
+
+#SBATCH --workdir=/scratch/ms/testgroup/testuser
+#SBATCH --qos=normal
+#SBATCH --job-name=flex_ecmwf
+#SBATCH --output=flex_ecmwf.%j.out
+#SBATCH --error=flex_ecmwf.%j.out
+#SBATCH --mail-type=FAIL
+#SBATCH --time=12:00:00
+
+## CRAY specific batch requests
+##PBS -N flex_ecmwf
+##PBS -q np
+##PBS -S /usr/bin/ksh
+## -o /scratch/ms/testgroup/testuser/flex_ecmwf.${PBS_JOBID}.out
+## job output is in .ecaccess_DO_NOT_REMOVE
+##PBS -j oe
+##PBS -V
+##PBS -l EC_threads_per_task=24
+##PBS -l EC_memory_per_task=32000MB
+
+set -x
+export VERSION=7.1
+case ${HOST} in
+  *ecg*)
+  module load python
+  module unload grib_api
+  module unload eccodes
+  module load eccodes
+  module unload emos
+  module load emos/455-r64
+  export PATH=${PATH}:fp_root_test_path/flex_extract_v7.1/source/python
+  ;;
+  *cca*)
+  module switch PrgEnv-cray PrgEnv-intel
+  module load eccodes
+  module load emos
+  module load python
+  export SCRATCH=${TMPDIR}
+  export PATH=${PATH}:fp_root_test_path/flex_extract_v7.1/source/python
+  ;;
+esac
+
+cd ${SCRATCH}
+mkdir -p python$$
+cd python$$
+
+export CONTROL=CONTROL
+
+cat >${CONTROL}<<EOF
+EOF
+
+
+submit.py --controlfile=${CONTROL} --inputdir=./work --outputdir=./work 1> prot 2>&1
+
+if [ $? -eq 0 ] ; then
+  l=0
+  for muser in `grep -i MAILOPS ${CONTROL}`; do
+      if [ ${l} -gt 0 ] ; then 
+         mail -s flex.${HOST}.$$ ${muser} <prot
+      fi
+      l=$((${l}+1))
+  done
+else
+  l=0
+  for muser in `grep -i MAILFAIL ${CONTROL}`; do
+      if [ ${l} -gt 0 ] ; then 
+         mail -s "ERROR! flex.${HOST}.$$" ${muser} <prot
+      fi
+      l=$((${l}+1))
+  done
+fi
+
diff --git a/Testing/Regression/Unit/Testfiles/test_put_to_ecserver.txt b/Testing/Regression/Unit/Testfiles/test_put_to_ecserver.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f28a7b5dee1644a76232d820e59c2dcca24615bc
--- /dev/null
+++ b/Testing/Regression/Unit/Testfiles/test_put_to_ecserver.txt
@@ -0,0 +1,2 @@
+#This file is just for testing the submission of files to an ecserver. 
+ls -l