From 6275f7b5daf1fa813154448db7ac9eb9bfd2b771 Mon Sep 17 00:00:00 2001
From: Anne Philipp <anne.philipp@univie.ac.at>
Date: Mon, 29 Jul 2019 10:44:41 +0200
Subject: [PATCH] completed testcase for mars request comparison
---
.../Mars_request/7.0.4/CERA.public_mr.csv | 6 +
.../Regression/Mars_request/7.0.4/CERA_mr.csv | 6 +
test/Regression/Mars_request/7.0.4/CF_mr.csv | 8 ++
test/Regression/Mars_request/7.0.4/CV_mr.csv | 8 ++
.../Mars_request/7.0.4/EA5.highres_mr.csv | 6 +
.../Mars_request/7.0.4/EA5.public_mr.csv | 6 +
test/Regression/Mars_request/7.0.4/EA5_mr.csv | 6 +
.../Mars_request/7.0.4/EI.public_mr.csv | 8 ++
test/Regression/Mars_request/7.0.4/EI_mr.csv | 13 ++
.../7.0.4/OD.ELDA.FC.eta.ens.double_mr.csv | 9 ++
.../Mars_request/7.0.4/OD.ENFO.CF_mr.csv | 8 ++
.../Mars_request/7.0.4/OD.ENFO.PF_mr.csv | 8 ++
.../7.0.4/OD.OPER.4V.operational_mr.csv | 18 +++
.../7.0.4/OD.OPER.FC.36hours_mr.csv | 6 +
.../7.0.4/OD.OPER.FC.twiceaday_mr.csv | 6 +
.../7.0.4/OD.OPER.global.025_mr.csv | 9 ++
.../7.0.4/OD.OPER.highres.eta_mr.csv | 9 ++
.../7.0.4/OD.OPER.highres.gauss_mr.csv | 13 ++
.../Mars_request/7.1/CERA.public_mr.csv | 6 +
test/Regression/Mars_request/7.1/CERA_mr.csv | 6 +
test/Regression/Mars_request/7.1/CF_mr.csv | 8 ++
test/Regression/Mars_request/7.1/CV_mr.csv | 8 ++
.../Mars_request/7.1/EA5.highres_mr.csv | 10 +-
.../Mars_request/7.1/EA5.public_mr.csv | 10 +-
test/Regression/Mars_request/7.1/EA5_mr.csv | 10 +-
.../Mars_request/7.1/EI.public_mr.csv | 8 ++
test/Regression/Mars_request/7.1/EI_mr.csv | 13 ++
.../7.1/OD.ELDA.FC.eta.ens.double_mr.csv | 9 ++
.../Mars_request/7.1/OD.ENFO.CF_mr.csv | 8 ++
.../Mars_request/7.1/OD.ENFO.PF_mr.csv | 8 ++
.../7.1/OD.OPER.4V.operational_mr.csv | 18 +++
.../7.1/OD.OPER.FC.36hours_mr.csv | 6 +
.../7.1/OD.OPER.FC.twiceaday_mr.csv | 6 +
.../7.1/OD.OPER.global.025_mr.csv | 9 ++
.../7.1/OD.OPER.highres.eta_mr.csv | 9 ++
.../7.1/OD.OPER.highres.gauss_mr.csv | 13 ++
test/Regression/Mars_request/COMMANDS.txt | 53 ++++++++
.../Controls/CONTROL_CERA.public_mr | 41 +++++++
.../Mars_request/Controls/CONTROL_CERA_mr | 40 ++++++
.../Mars_request/Controls/CONTROL_CF_mr | 41 +++++++
.../Mars_request/Controls/CONTROL_CV_mr | 41 +++++++
.../Controls/CONTROL_EI.public_mr | 41 +++++++
.../Mars_request/Controls/CONTROL_EI_mr | 40 ++++++
.../CONTROL_OD.ELDA.FC.eta.ens.double_mr | 34 ++++++
.../Controls/CONTROL_OD.ENFO.CF_mr | 35 ++++++
.../Controls/CONTROL_OD.ENFO.PF_mr | 31 +++++
.../CONTROL_OD.OPER.4V.operational_mr | 32 +++++
.../Controls/CONTROL_OD.OPER.FC.36hours_mr | 41 +++++++
.../Controls/CONTROL_OD.OPER.FC.twiceaday_mr | 41 +++++++
.../Controls/CONTROL_OD.OPER.global.025_mr | 35 ++++++
.../Controls/CONTROL_OD.OPER.highres.eta_mr | 35 ++++++
.../Controls/CONTROL_OD.OPER.highres.gauss_mr | 38 ++++++
.../Mars_request/Log/log_2018-11-23_12-42-29 | 8 --
.../Mars_request/Log/log_2018-11-23_12-48-59 | 8 --
.../Mars_request/Log/log_2018-11-23_14-52-05 | 1 -
.../Mars_request/Log/log_2018-11-23_14-52-43 | 8 --
.../Mars_request/Log/log_2018-11-29_23-51-01 | 1 -
.../Mars_request/Log/log_2018-11-29_23-51-50 | 8 --
.../Mars_request/Log/log_2019-07-17_11-05-47 | 31 +++++
.../Mars_request/Log/log_2019-07-17_11-37-01 | 1 +
.../Mars_request/Log/log_2019-07-17_11-40-56 | 1 +
.../Mars_request/Log/log_2019-07-17_11-42-31 | 1 +
.../Mars_request/Log/log_2019-07-17_11-42-58 | 1 +
.../Mars_request/Log/log_2019-07-17_11-43-13 | 7 ++
.../Mars_request/Log/log_2019-07-17_11-43-50 | 31 +++++
.../Mars_request/Log/log_2019-07-17_11-47-22 | 1 +
.../Mars_request/Log/log_2019-07-17_11-47-44 | 1 +
.../Mars_request/Log/log_2019-07-17_11-47-59 | 1 +
.../Mars_request/Log/log_2019-07-17_11-49-07 | 1 +
.../Mars_request/Log/log_2019-07-17_11-50-37 | 1 +
.../Mars_request/Log/log_2019-07-17_11-51-09 | 1 +
.../Mars_request/Log/log_2019-07-17_11-51-24 | 31 +++++
.../Mars_request/Log/log_2019-07-17_11-51-35 | 31 +++++
.../Mars_request/Log/log_2019-07-17_11-52-51 | 31 +++++
.../Mars_request/Log/log_2019-07-17_11-53-25 | 31 +++++
.../Mars_request/Log/log_2019-07-17_11-55-07 | 31 +++++
.../Mars_request/Log/log_2019-07-17_11-55-54 | 31 +++++
.../Mars_request/Log/log_2019-07-17_11-56-03 | 31 +++++
.../Mars_request/Log/log_2019-07-17_11-56-52 | 25 ++++
test/Regression/Mars_request/run_local.sh | 8 +-
.../Mars_request/test_cmp_mars_requests.py | 115 +++++++++++++++++-
81 files changed, 1360 insertions(+), 55 deletions(-)
create mode 100644 test/Regression/Mars_request/7.0.4/CERA.public_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/CERA_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/CF_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/CV_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/EA5.highres_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/EA5.public_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/EA5_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/EI.public_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/EI_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/OD.ELDA.FC.eta.ens.double_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/OD.ENFO.CF_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/OD.ENFO.PF_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/OD.OPER.4V.operational_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/OD.OPER.FC.36hours_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/OD.OPER.FC.twiceaday_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/OD.OPER.global.025_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/OD.OPER.highres.eta_mr.csv
create mode 100644 test/Regression/Mars_request/7.0.4/OD.OPER.highres.gauss_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/CERA.public_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/CERA_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/CF_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/CV_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/EI.public_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/EI_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/OD.ELDA.FC.eta.ens.double_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/OD.ENFO.CF_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/OD.ENFO.PF_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/OD.OPER.4V.operational_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/OD.OPER.FC.36hours_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/OD.OPER.FC.twiceaday_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/OD.OPER.global.025_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/OD.OPER.highres.eta_mr.csv
create mode 100644 test/Regression/Mars_request/7.1/OD.OPER.highres.gauss_mr.csv
create mode 100644 test/Regression/Mars_request/COMMANDS.txt
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_CERA.public_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_CERA_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_CF_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_CV_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_EI.public_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_EI_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_OD.ELDA.FC.eta.ens.double_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_OD.ENFO.CF_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_OD.ENFO.PF_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_OD.OPER.4V.operational_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_OD.OPER.FC.36hours_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_OD.OPER.FC.twiceaday_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_OD.OPER.global.025_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_OD.OPER.highres.eta_mr
create mode 100644 test/Regression/Mars_request/Controls/CONTROL_OD.OPER.highres.gauss_mr
delete mode 100644 test/Regression/Mars_request/Log/log_2018-11-23_12-42-29
delete mode 100644 test/Regression/Mars_request/Log/log_2018-11-23_12-48-59
delete mode 100644 test/Regression/Mars_request/Log/log_2018-11-23_14-52-05
delete mode 100644 test/Regression/Mars_request/Log/log_2018-11-23_14-52-43
delete mode 100644 test/Regression/Mars_request/Log/log_2018-11-29_23-51-01
delete mode 100644 test/Regression/Mars_request/Log/log_2018-11-29_23-51-50
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-05-47
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-37-01
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-40-56
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-42-31
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-42-58
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-43-13
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-43-50
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-47-22
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-47-44
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-47-59
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-49-07
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-50-37
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-51-09
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-51-24
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-51-35
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-52-51
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-53-25
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-55-07
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-55-54
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-56-03
create mode 100644 test/Regression/Mars_request/Log/log_2019-07-17_11-56-52
diff --git a/test/Regression/Mars_request/7.0.4/CERA.public_mr.csv b/test/Regression/Mars_request/7.0.4/CERA.public_mr.csv
new file mode 100644
index 0000000..b97d8fd
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/CERA.public_mr.csv
@@ -0,0 +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, 0, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 3/to/24/by/3, ENDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.19900505.128701.181190.grb, 18, FC
+1, 24, 90.0/-179.0/-90.0/180.0, cera20c, 19900506, 1, , 1.0/1.0, 1, SFC, EP, 0, 160/27/28/244, , 159, 000, ENDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.19900506.128701.181190.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, 0, T/Q/U/V/77/CLWC/CIWC, , 159, 00, ENDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.19900506.128701.181190.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, 0, 141/151/164/165/166/167/168/129/172/27/28/173/186/187/188/235/139/39, , 159, 00, ENDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.19900506.128701.181190.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, 0, LNSP, , 159, 00, ENDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.19900506.128701.181190.grb, 00/03/06/09/12/15/18/21, AN
diff --git a/test/Regression/Mars_request/7.0.4/CERA_mr.csv b/test/Regression/Mars_request/7.0.4/CERA_mr.csv
new file mode 100644
index 0000000..6dc2cda
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/CERA_mr.csv
@@ -0,0 +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, 0, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 3/to/24/by/3, ENDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.19990808.128701.181188.grb, 18, FC
+1, 24, 90.0/-179.0/-90.0/180.0, None, 19990809, 1, , 1.0/1.0, 1, SFC, EP, 0, 160/27/28/244, , 159, 000, ENDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.19990809.128701.181188.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, 0, T/Q/U/V/77/CLWC/CIWC, , 159, 00, ENDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.19990809.128701.181188.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, 0, 141/151/164/165/166/167/168/129/172/27/28/173/186/187/188/235/139/39, , 159, 00, ENDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.19990809.128701.181188.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, 0, LNSP, , 159, 00, ENDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.19990809.128701.181188.grb, 00/03/06/09/12/15/18/21, AN
diff --git a/test/Regression/Mars_request/7.0.4/CF_mr.csv b/test/Regression/Mars_request/7.0.4/CF_mr.csv
new file mode 100644
index 0000000..95168d6
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/CF_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFOG_acc_SL.20190506.128701.181192.grb, 12, CF
+1, 24, , None, 20190506/to/20190506, 1, reduced, 80, 1, ML, OD, OFF, Q, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFGG__SL.20190506.128701.181192.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/27/28/173, , 159, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20190506.128701.181192.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, T/Q/W/CLWC/CIWC, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFOG__ML.20190506.128701.181192.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFOG__SL.20190506.128701.181192.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, U/V/D, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFSH__ML.20190506.128701.181192.grb, 12, CF
+6, 24, 90.0/-179.0/-90.0/180.0, None, 20190506/to/20190506, 1, , OFF, 1, ML, OD, OFF, LNSP, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFSH__SL.20190506.128701.181192.grb, 12, CF
diff --git a/test/Regression/Mars_request/7.0.4/CV_mr.csv b/test/Regression/Mars_request/7.0.4/CV_mr.csv
new file mode 100644
index 0000000..bf595e1
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/CV_mr.csv
@@ -0,0 +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, 1, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CVOG_acc_SL.20120506.128701.181194.grb, 12, CV
+1, 24, , None, 20120506/to/20120506, 1, reduced, 80, 1, ML, OD, 1, Q, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CVGG__SL.20120506.128701.181194.grb, 12, CV
+2, 24, 90.0/-179.0/-90.0/180.0, None, 20120506, 1, , 1.0/1.0, 1, SFC, OD, 1, 160/27/28/173, , 159, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20120506.128701.181194.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, 1, T/Q/W/CLWC/CIWC, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CVOG__ML.20120506.128701.181194.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, 1, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CVOG__SL.20120506.128701.181194.grb, 12, CV
+5, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , OFF, 1/to/62, ML, OD, 1, U/V/D, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CVSH__ML.20120506.128701.181194.grb, 12, CV
+6, 24, 90.0/-179.0/-90.0/180.0, None, 20120506/to/20120506, 1, , OFF, 1, ML, OD, 1, LNSP, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CVSH__SL.20120506.128701.181194.grb, 12, CV
diff --git a/test/Regression/Mars_request/7.0.4/EA5.highres_mr.csv b/test/Regression/Mars_request/7.0.4/EA5.highres_mr.csv
new file mode 100644
index 0000000..130e0f9
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/EA5.highres_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20181029.128701.181196.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/27/28/244, , 799, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20181030.128701.181196.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, T/Q/U/V/77, , 799, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.20181030.128701.181196.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 799, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.20181030.128701.181196.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, LNSP, , 799, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.20181030.128701.181196.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/test/Regression/Mars_request/7.0.4/EA5.public_mr.csv b/test/Regression/Mars_request/7.0.4/EA5.public_mr.csv
new file mode 100644
index 0000000..84f4180
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/EA5.public_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 213, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20181029.128701.181200.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/27/28/244, , 213, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20181030.128701.181200.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, T/Q/U/V/77, , 213, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.20181030.128701.181200.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 213, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.20181030.128701.181200.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, LNSP, , 213, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.20181030.128701.181200.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/test/Regression/Mars_request/7.0.4/EA5_mr.csv b/test/Regression/Mars_request/7.0.4/EA5_mr.csv
new file mode 100644
index 0000000..39beb05
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/EA5_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20181029.128701.181198.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/27/28/244, , 159, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20181030.128701.181198.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, T/Q/U/V/77, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.20181030.128701.181198.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.20181030.128701.181198.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, LNSP, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.20181030.128701.181198.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/test/Regression/Mars_request/7.0.4/EI.public_mr.csv b/test/Regression/Mars_request/7.0.4/EI.public_mr.csv
new file mode 100644
index 0000000..412f6c3
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/EI.public_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 6/to/12/by/6, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20180630.128701.181208.grb, 00/12, FC
+1, 24, , interim, 20180701/to/20180701, 1, reduced, 80, 1, ML, EI, OFF, Q, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANGG__SL.20180701.128701.181208.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/27/28/173, , 159, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20180701.128701.181208.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, T/Q/CLWC/CIWC, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.20180701.128701.181208.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.20180701.128701.181208.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, U/V/D, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__ML.20180701.128701.181208.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, LNSP, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.20180701.128701.181208.grb, 00/06/12/18, AN
diff --git a/test/Regression/Mars_request/7.0.4/EI_mr.csv b/test/Regression/Mars_request/7.0.4/EI_mr.csv
new file mode 100644
index 0000000..8257a6b
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/EI_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 3/to/12/by/3, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20160706.128701.181202.grb, 00/12, FC
+1, 24, , None, 20160707/to/20160707, 1, reduced, 80, 1, ML, EI, OFF, Q, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANGG__SL.20160707.128701.181202.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/27/28/173, , 159, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20160707.128701.181202.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, T/Q/CLWC/CIWC, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.20160707.128701.181202.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.20160707.128701.181202.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, U/V/D, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__ML.20160707.128701.181202.grb, 00/12, AN
+6, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , OFF, 1, ML, EI, OFF, LNSP, , 159, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.20160707.128701.181202.grb, 00/12, AN
+7, 24, , None, 20160707/to/20160707, 1, reduced, 80, 1, ML, EI, OFF, Q, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCGG__SL.20160707.128701.181202.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, T/Q/CLWC/CIWC, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__ML.20160707.128701.181202.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__SL.20160707.128701.181202.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, U/V/D, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__ML.20160707.128701.181202.grb, 00/12, FC
+11, 24, 90.0/-179.0/-90.0/180.0, None, 20160707/to/20160707, 1, , OFF, 1, ML, EI, OFF, LNSP, , 159, 03/06/09, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__SL.20160707.128701.181202.grb, 00/12, FC
diff --git a/test/Regression/Mars_request/7.0.4/OD.ELDA.FC.eta.ens.double_mr.csv b/test/Regression/Mars_request/7.0.4/OD.ELDA.FC.eta.ens.double_mr.csv
new file mode 100644
index 0000000..ebdbd14
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/OD.ELDA.FC.eta.ens.double_mr.csv
@@ -0,0 +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, 0/to/25, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 3/to/12/by/3, ELDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20190531.128701.181210.grb, 06/18, FC
+1, 24, 30.0/-10.0/10.0/10.0, None, 20190601, 1, , 1.0/1.0, 1, SFC, OD, 0/to/25, 160/27/28/173, , 159, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20190601.128701.181210.grb, 00, AN
+2, 24, 30.0/-10.0/10.0/10.0, None, 20190601/to/20190601, 1, , 1.0/1.0, 1/TO/137, ML, OD, 0/to/25, T/Q/U/V/77/CLWC/CIWC, , 159, 00, ELDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.20190601.128701.181210.grb, 00/06/12/18, AN
+3, 24, 30.0/-10.0/10.0/10.0, None, 20190601/to/20190601, 1, , 1.0/1.0, 1, SFC, OD, 0/to/25, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39/134, , 159, 00, ELDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.20190601.128701.181210.grb, 00/06/12/18, AN
+4, 24, 30.0/-10.0/10.0/10.0, None, 20190601/to/20190601, 1, , OFF, 1, ML, OD, 0/to/25, LNSP, , 159, 00, ELDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.20190601.128701.181210.grb, 00/06/12/18, AN
+5, 24, 30.0/-10.0/10.0/10.0, None, 20190601/to/20190601, 1, , 1.0/1.0, 1/TO/137, ML, OD, 0/to/25, T/Q/U/V/77/CLWC/CIWC, , 159, 09/03, ELDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__ML.20190601.128701.181210.grb, 18/06, FC
+6, 24, 30.0/-10.0/10.0/10.0, None, 20190601/to/20190601, 1, , 1.0/1.0, 1, SFC, OD, 0/to/25, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39/134, , 159, 09/03, ELDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__SL.20190601.128701.181210.grb, 18/06, FC
+7, 24, 30.0/-10.0/10.0/10.0, None, 20190601/to/20190601, 1, , OFF, 1, ML, OD, 0/to/25, LNSP, , 159, 09/03, ELDA, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__SL.20190601.128701.181210.grb, 18/06, FC
diff --git a/test/Regression/Mars_request/7.0.4/OD.ENFO.CF_mr.csv b/test/Regression/Mars_request/7.0.4/OD.ENFO.CF_mr.csv
new file mode 100644
index 0000000..14502cb
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/OD.ENFO.CF_mr.csv
@@ -0,0 +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, 0, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 3/to/12/by/3, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFOG_acc_SL.20190531.128701.181212.grb, 00/12, CF
+1, 24, , None, 20190601/to/20190601, 1, reduced, 80, 1, ML, OD, 0, Q, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFGG__SL.20190601.128701.181212.grb, 00/12, CF
+2, 24, 90.0/-179.0/-90.0/180.0, None, 20190601, 1, , 1.0/1.0, 1, SFC, OD, 0, 160/27/28/173, , 159, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20190601.128701.181212.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, 0, T/Q/CLWC/CIWC, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFOG__ML.20190601.128701.181212.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, 0, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39/134, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFOG__SL.20190601.128701.181212.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, 0, U/V/D, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFSH__ML.20190601.128701.181212.grb, 00/12, CF
+6, 24, 90.0/-179.0/-90.0/180.0, None, 20190601/to/20190601, 1, , OFF, 1, ML, OD, 0, LNSP, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/CFSH__SL.20190601.128701.181212.grb, 00/12, CF
diff --git a/test/Regression/Mars_request/7.0.4/OD.ENFO.PF_mr.csv b/test/Regression/Mars_request/7.0.4/OD.ENFO.PF_mr.csv
new file mode 100644
index 0000000..fbdf522
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/OD.ENFO.PF_mr.csv
@@ -0,0 +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, 1/TO/50, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 3/to/12/by/3, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/PFOG_acc_SL.20190630.128701.181214.grb, 00/12, PF
+1, 24, , None, 20190701/to/20190701, 1, reduced, 80, 1, ML, OD, 1/TO/50, Q, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/PFGG__SL.20190701.128701.181214.grb, 00/12, PF
+2, 24, 90.0/-179.0/-90.0/180.0, None, 20190701, 1, , 1.0/1.0, 1, SFC, OD, 1/TO/50, 160/27/28/173, , 159, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20190701.128701.181214.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, 1/TO/50, T/Q, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/PFOG__ML.20190701.128701.181214.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, 1/TO/50, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39/134, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/PFOG__SL.20190701.128701.181214.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, 1/TO/50, U/V/D, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/PFSH__ML.20190701.128701.181214.grb, 00/12, PF
+6, 24, 90.0/-179.0/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1, ML, OD, 1/TO/50, LNSP, , 159, 00/03/06/09, ENFO, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/PFSH__SL.20190701.128701.181214.grb, 00/12, PF
diff --git a/test/Regression/Mars_request/7.0.4/OD.OPER.4V.operational_mr.csv b/test/Regression/Mars_request/7.0.4/OD.OPER.4V.operational_mr.csv
new file mode 100644
index 0000000..7c18a53
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/OD.OPER.4V.operational_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 255, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20190709.128701.181216.grb, 00/12, FC
+1, 24, , None, 20190710/to/20190710, 1, reduced, 128, 1, ML, OD, OFF, Q, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/4VGG__SL.20190710.128701.181216.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/27/28/173, , 255, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20190710.128701.181216.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, T/Q/CLWC/CIWC, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/4VOG__ML.20190710.128701.181216.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/4VOG__SL.20190710.128701.181216.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, U/V/D, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/4VSH__ML.20190710.128701.181216.grb, 09/21, 4V
+6, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, LNSP, , 255, 00/03, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/4VSH__SL.20190710.128701.181216.grb, 09/21, 4V
+7, 24, , None, 20190710/to/20190710, 1, reduced, 128, 1, ML, OD, OFF, Q, , 255, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANGG__SL.20190710.128701.181216.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, T/Q/CLWC/CIWC, , 255, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.20190710.128701.181216.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 255, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.20190710.128701.181216.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, U/V/D, , 255, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__ML.20190710.128701.181216.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, LNSP, , 255, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.20190710.128701.181216.grb, 00/06/18, AN
+12, 24, , None, 20190710/to/20190710, 1, reduced, 128, 1, ML, OD, OFF, Q, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCGG__SL.20190710.128701.181216.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, T/Q/CLWC/CIWC, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__ML.20190710.128701.181216.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__SL.20190710.128701.181216.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, U/V/D, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__ML.20190710.128701.181216.grb, 00/12, FC
+16, 24, 60.0/-25.0/10.0/60.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, LNSP, , 255, 01/02/03/04/05/07/08/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__SL.20190710.128701.181216.grb, 00/12, FC
diff --git a/test/Regression/Mars_request/7.0.4/OD.OPER.FC.36hours_mr.csv b/test/Regression/Mars_request/7.0.4/OD.OPER.FC.36hours_mr.csv
new file mode 100644
index 0000000..905c4f4
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/OD.OPER.FC.36hours_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20190406.128701.181218.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/27/28/173, , 159, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20190406.128701.181218.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, T/Q/U/V/77/CLWC/CIWC, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__ML.20190406.128701.181218.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__SL.20190406.128701.181218.grb, 00, FC
+4, 24, 90.0/-179.0/-90.0/180.0, None, 20190406/to/20190406, 1, , OFF, 1, ML, OD, OFF, LNSP, , 159, 000/003/006/009/012/015/018/021/024/027/030/033/036, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__SL.20190406.128701.181218.grb, 00, FC
diff --git a/test/Regression/Mars_request/7.0.4/OD.OPER.FC.twiceaday_mr.csv b/test/Regression/Mars_request/7.0.4/OD.OPER.FC.twiceaday_mr.csv
new file mode 100644
index 0000000..0740870
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/OD.OPER.FC.twiceaday_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 3/to/12/by/3, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20190604.128701.181220.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/27/28/173, , 159, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20190605.128701.181220.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, T/Q/U/V/77/CLWC/CIWC, , 159, 00/03/06/09, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__ML.20190605.128701.181220.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 159, 00/03/06/09, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__SL.20190605.128701.181220.grb, 00/12, FC
+4, 24, 90.0/-179.0/-90.0/180.0, None, 20190605/to/20190605, 1, , OFF, 1, ML, OD, OFF, LNSP, , 159, 00/03/06/09, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__SL.20190605.128701.181220.grb, 00/12, FC
diff --git a/test/Regression/Mars_request/7.0.4/OD.OPER.global.025_mr.csv b/test/Regression/Mars_request/7.0.4/OD.OPER.global.025_mr.csv
new file mode 100644
index 0000000..9cb1d26
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/OD.OPER.global.025_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20190630.128701.181222.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/27/28/173, , 799, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20190701.128701.181222.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, T/Q/U/V/77/CLWC/CIWC, , 799, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.20190701.128701.181222.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 799, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.20190701.128701.181222.grb, 00/12, AN
+4, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1, ML, OD, OFF, LNSP, , 799, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.20190701.128701.181222.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, T/Q/U/V/77/CLWC/CIWC, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__ML.20190701.128701.181222.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__SL.20190701.128701.181222.grb, 00/12, FC
+7, 24, 90.0/-179.75/-90.0/180.0, None, 20190701/to/20190701, 1, , OFF, 1, ML, OD, OFF, LNSP, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__SL.20190701.128701.181222.grb, 00/12, FC
diff --git a/test/Regression/Mars_request/7.0.4/OD.OPER.highres.eta_mr.csv b/test/Regression/Mars_request/7.0.4/OD.OPER.highres.eta_mr.csv
new file mode 100644
index 0000000..14ed1f2
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/OD.OPER.highres.eta_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20190709.128701.181224.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/27/28/173, , 799, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20190710.128701.181224.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, T/Q/U/V/77/CLWC/CIWC, , 799, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.20190710.128701.181224.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 799, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.20190710.128701.181224.grb, 00/12, AN
+4, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, LNSP, , 799, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.20190710.128701.181224.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, T/Q/U/V/77/CLWC/CIWC, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__ML.20190710.128701.181224.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__SL.20190710.128701.181224.grb, 00/12, FC
+7, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, LNSP, , 799, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__SL.20190710.128701.181224.grb, 00/12, FC
diff --git a/test/Regression/Mars_request/7.0.4/OD.OPER.highres.gauss_mr.csv b/test/Regression/Mars_request/7.0.4/OD.OPER.highres.gauss_mr.csv
new file mode 100644
index 0000000..74f24f2
--- /dev/null
+++ b/test/Regression/Mars_request/7.0.4/OD.OPER.highres.gauss_mr.csv
@@ -0,0 +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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 1279, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG_acc_SL.20190709.128701.181226.grb, 00/12, FC
+1, 24, , None, 20190710/to/20190710, 1, reduced, 640, 1, ML, OD, OFF, Q, , 1279, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANGG__SL.20190710.128701.181226.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/27/28/173, , 1279, 000, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/OG_OROLSM__SL.20190710.128701.181226.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, T/Q/CLWC/CIWC, , 1279, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__ML.20190710.128701.181226.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 1279, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANOG__SL.20190710.128701.181226.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, U/V/D, , 1279, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__ML.20190710.128701.181226.grb, 00/12, AN
+6, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, LNSP, , 1279, 00, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/ANSH__SL.20190710.128701.181226.grb, 00/12, AN
+7, 24, , None, 20190710/to/20190710, 1, reduced, 640, 1, ML, OD, OFF, Q, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCGG__SL.20190710.128701.181226.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, T/Q/CLWC/CIWC, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__ML.20190710.128701.181226.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/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCOG__SL.20190710.128701.181226.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, U/V/D, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__ML.20190710.128701.181226.grb, 00/12, FC
+11, 24, 60.0/-10.0/30.0/30.0, None, 20190710/to/20190710, 1, , OFF, 1, ML, OD, OFF, LNSP, , 1279, 01/02/03/04/05/06/07/08/09/10/11, OPER, /raid60/nas/tmc/Anne/TESTFE704NEU/flex_extract_v7.0.4/python/../work/FCSH__SL.20190710.128701.181226.grb, 00/12, FC
diff --git a/test/Regression/Mars_request/7.1/CERA.public_mr.csv b/test/Regression/Mars_request/7.1/CERA.public_mr.csv
new file mode 100644
index 0000000..75354df
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/CERA.public_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/CERA_mr.csv b/test/Regression/Mars_request/7.1/CERA_mr.csv
new file mode 100644
index 0000000..efbf128
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/CERA_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/CF_mr.csv b/test/Regression/Mars_request/7.1/CF_mr.csv
new file mode 100644
index 0000000..78cf618
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/CF_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/CV_mr.csv b/test/Regression/Mars_request/7.1/CV_mr.csv
new file mode 100644
index 0000000..1fddfaa
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/CV_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/EA5.highres_mr.csv b/test/Regression/Mars_request/7.1/EA5.highres_mr.csv
index e523caa..6b069b5 100644
--- a/test/Regression/Mars_request/7.1/EA5.highres_mr.csv
+++ b/test/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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 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.100726.100727.grb, 06/18, FC
-1, 24, 60.0/-100.0/0.0/60.0, None, 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/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20181030.100726.100727.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, None, 20181030, 1, , 0.25/0.25, 1, SFC, EA, OFF, 160/27/28/244, , 799, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.100726.100727.grb, 00, AN
-3, 24, 60.0/-100.0/0.0/60.0, None, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, LNSP, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20181030.100726.100727.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, , 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/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20181030.100726.100727.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/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
diff --git a/test/Regression/Mars_request/7.1/EA5.public_mr.csv b/test/Regression/Mars_request/7.1/EA5.public_mr.csv
index 3569d0d..33fd028 100644
--- a/test/Regression/Mars_request/7.1/EA5.public_mr.csv
+++ b/test/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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 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.100842.100843.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/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20181030.100842.100843.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/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.100842.100843.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/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20181030.100842.100843.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/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20181030.100842.100843.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/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
diff --git a/test/Regression/Mars_request/7.1/EA5_mr.csv b/test/Regression/Mars_request/7.1/EA5_mr.csv
index 7bca6c7..8b5bd12 100644
--- a/test/Regression/Mars_request/7.1/EA5_mr.csv
+++ b/test/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, LSP/CP/SSHF/EWSS/NSSS/SSR, , 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.100785.100786.grb, 06/18, FC
-1, 16, 75.0/-25.0/10.0/60.0, None, 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/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20181030.100785.100786.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, None, 20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 160/27/28/244, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.100785.100786.grb, 00, AN
-3, 16, 75.0/-25.0/10.0/60.0, None, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, LNSP, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20181030.100785.100786.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, , 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/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20181030.100785.100786.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/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
diff --git a/test/Regression/Mars_request/7.1/EI.public_mr.csv b/test/Regression/Mars_request/7.1/EI.public_mr.csv
new file mode 100644
index 0000000..997e168
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/EI.public_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/EI_mr.csv b/test/Regression/Mars_request/7.1/EI_mr.csv
new file mode 100644
index 0000000..5d66705
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/EI_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/OD.ELDA.FC.eta.ens.double_mr.csv b/test/Regression/Mars_request/7.1/OD.ELDA.FC.eta.ens.double_mr.csv
new file mode 100644
index 0000000..fbf2875
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/OD.ELDA.FC.eta.ens.double_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/OD.ENFO.CF_mr.csv b/test/Regression/Mars_request/7.1/OD.ENFO.CF_mr.csv
new file mode 100644
index 0000000..d468c3f
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/OD.ENFO.CF_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/OD.ENFO.PF_mr.csv b/test/Regression/Mars_request/7.1/OD.ENFO.PF_mr.csv
new file mode 100644
index 0000000..8986816
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/OD.ENFO.PF_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/OD.OPER.4V.operational_mr.csv b/test/Regression/Mars_request/7.1/OD.OPER.4V.operational_mr.csv
new file mode 100644
index 0000000..1a41672
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/OD.OPER.4V.operational_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/OD.OPER.FC.36hours_mr.csv b/test/Regression/Mars_request/7.1/OD.OPER.FC.36hours_mr.csv
new file mode 100644
index 0000000..88e20ba
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/OD.OPER.FC.36hours_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/OD.OPER.FC.twiceaday_mr.csv b/test/Regression/Mars_request/7.1/OD.OPER.FC.twiceaday_mr.csv
new file mode 100644
index 0000000..319f64b
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/OD.OPER.FC.twiceaday_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/OD.OPER.global.025_mr.csv b/test/Regression/Mars_request/7.1/OD.OPER.global.025_mr.csv
new file mode 100644
index 0000000..63e16ca
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/OD.OPER.global.025_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/OD.OPER.highres.eta_mr.csv b/test/Regression/Mars_request/7.1/OD.OPER.highres.eta_mr.csv
new file mode 100644
index 0000000..ca4996d
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/OD.OPER.highres.eta_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/7.1/OD.OPER.highres.gauss_mr.csv b/test/Regression/Mars_request/7.1/OD.OPER.highres.gauss_mr.csv
new file mode 100644
index 0000000..9912e5f
--- /dev/null
+++ b/test/Regression/Mars_request/7.1/OD.OPER.highres.gauss_mr.csv
@@ -0,0 +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
diff --git a/test/Regression/Mars_request/COMMANDS.txt b/test/Regression/Mars_request/COMMANDS.txt
new file mode 100644
index 0000000..4f7d999
--- /dev/null
+++ b/test/Regression/Mars_request/COMMANDS.txt
@@ -0,0 +1,53 @@
+./submit.py --controlfile=CONTROL_CERA_mr --request=1
+mv ../work/mars_requests.csv ../work/CERA_mr.csv
+
+./submit.py --controlfile=CONTROL_CERA.public_mr --public=1 --request=1
+mv ../work/mars_requests.csv ../work/CERA.public_mr.csv
+
+./submit.py --controlfile=CONTROL_CF_mr --request=1
+mv ../work/mars_requests.csv ../work/CF_mr.csv
+
+./submit.py --controlfile=CONTROL_CV_mr --request=1
+mv ../work/mars_requests.csv ../work/CV_mr.csv
+
+./submit.py --controlfile=CONTROL_EA5.highres_mr --request=1
+mv ../work/mars_requests.csv ../work/EA5.highres_mr.csv
+
+./submit.py --controlfile=CONTROL_EA5_mr --request=1
+mv ../work/mars_requests.csv ../work/EA5_mr.csv
+
+./submit.py --controlfile=CONTROL_EA5.public_mr --public=1 --request=1
+mv ../work/mars_requests.csv ../work/EA5.public_mr.csv
+
+./submit.py --controlfile=CONTROL_EI_mr --request=1
+mv ../work/mars_requests.csv ../work/EI_mr.csv
+
+./submit.py --controlfile=CONTROL_EI.public_mr --request=1 --public=1
+mv ../work/mars_requests.csv ../work/EI.public_mr.csv
+
+./submit.py --controlfile=CONTROL_OD.ELDA.FC.eta.ens.double_mr --request=1
+mv ../work/mars_requests.csv ../work/OD.ELDA.FC.eta.ens.double_mr.csv
+
+./submit.py --controlfile=CONTROL_OD.ENFO.CF_mr --request=1
+mv ../work/mars_requests.csv ../work/OD.ENFO.CF_mr.csv
+
+./submit.py --controlfile=CONTROL_OD.ENFO.PF_mr --request=1
+mv ../work/mars_requests.csv ../work/OD.ENFO.PF_mr.csv
+
+./submit.py --controlfile=CONTROL_OD.OPER.4V.operational_mr --request=1
+mv ../work/mars_requests.csv ../work/OD.OPER.4V.operational_mr.csv
+
+./submit.py --controlfile=CONTROL_OD.OPER.FC.36hours_mr --request=1
+mv ../work/mars_requests.csv ../work/OD.OPER.FC.36hours_mr.csv
+
+./submit.py --controlfile=CONTROL_OD.OPER.FC.twiceaday_mr --request=1
+mv ../work/mars_requests.csv ../work/OD.OPER.FC.twiceaday_mr.csv
+
+./submit.py --controlfile=CONTROL_OD.OPER.global.025_mr --request=1
+mv ../work/mars_requests.csv ../work/OD.OPER.global.025_mr.csv
+
+./submit.py --controlfile=CONTROL_OD.OPER.highres.eta_mr --request=1
+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
diff --git a/test/Regression/Mars_request/Controls/CONTROL_CERA.public_mr b/test/Regression/Mars_request/Controls/CONTROL_CERA.public_mr
new file mode 100644
index 0000000..c9ae2aa
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_CERA.public_mr
@@ -0,0 +1,41 @@
+DAY1 19900506
+DAY2
+DTIME 3
+TYPE AN AN AN AN AN AN AN AN
+TIME 00 03 06 09 12 15 18 21
+STEP 00 00 00 00 00 00 00 00
+ACCTYPE FC
+ACCTIME 18
+ACCMAXSTEP 24
+CLASS EP
+DATASET cera20c
+STREAM ENDA
+NUMBER 0
+EXPVER 1
+GRID 1000
+LEFT -179000
+LOWER -90000
+UPPER 90000
+RIGHT 180000
+LEVEL 91
+LEVELIST 1/to/91
+RESOL 159
+GAUSS 0
+ACCURACY 24
+OMEGA 0
+OMEGADIFF 0
+ETA 1
+ETADIFF 0
+DPDETA 1
+SMOOTH 0
+FORMAT GRIB2
+ADDPAR 27/28/173/186/187/188/235/139/39
+CWC 1
+PREFIX CE
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILFAIL ${USER}
+MAILOPS ${USER}
+GRIB2FLEXPART 0
+EOF
diff --git a/test/Regression/Mars_request/Controls/CONTROL_CERA_mr b/test/Regression/Mars_request/Controls/CONTROL_CERA_mr
new file mode 100644
index 0000000..784c713
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_CERA_mr
@@ -0,0 +1,40 @@
+DAY1 19990809
+DAY2
+DTIME 3
+TYPE AN AN AN AN AN AN AN AN
+TIME 00 03 06 09 12 15 18 21
+STEP 00 00 00 00 00 00 00 00
+ACCTYPE FC
+ACCTIME 18
+ACCMAXSTEP 24
+CLASS EP
+STREAM ENDA
+NUMBER 0
+EXPVER 1
+GRID 1000
+LEFT -179000
+LOWER -90000
+UPPER 90000
+RIGHT 180000
+LEVEL 91
+LEVELIST 1/to/91
+RESOL 159
+GAUSS 0
+ACCURACY 24
+OMEGA 0
+OMEGADIFF 0
+ETA 1
+ETADIFF 0
+DPDETA 1
+SMOOTH 0
+FORMAT GRIB2
+ADDPAR 27/28/173/186/187/188/235/139/39
+CWC 1
+PREFIX CE
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILFAIL ${USER}
+MAILOPS ${USER}
+GRIB2FLEXPART 0
+EOF
diff --git a/test/Regression/Mars_request/Controls/CONTROL_CF_mr b/test/Regression/Mars_request/Controls/CONTROL_CF_mr
new file mode 100644
index 0000000..8da1dc1
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_CF_mr
@@ -0,0 +1,41 @@
+DAY1 20190506
+DAY2
+DTIME 3
+MAXSTEP 36
+TYPE CF
+TIME 12
+STEP 00
+ACCTYPE CF
+ACCTIME 12
+ACCMAXSTEP 36
+CLASS OD
+STREAM ENFO
+NUMBER OFF
+EXPVER 1
+GRID 1000
+LEFT -179000
+LOWER -90000
+UPPER 90000
+RIGHT 180000
+LEVEL 91
+LEVELIST 89/to/91
+CWC 1
+RESOL 159
+GAUSS 1
+ACCURACY 24
+OMEGA 1
+OMEGADIFF 0
+ETA 0
+ETADIFF 0
+DPDETA 1
+SMOOTH 0
+FORMAT GRIB2
+ADDPAR /186/187/188/235/139/39
+PREFIX CF
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILOPS ${USER}
+MAILFAIL ${USER}
+GRIB2FLEXPART 0
+EOF
diff --git a/test/Regression/Mars_request/Controls/CONTROL_CV_mr b/test/Regression/Mars_request/Controls/CONTROL_CV_mr
new file mode 100644
index 0000000..119ea5c
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_CV_mr
@@ -0,0 +1,41 @@
+DAY1 20120506
+DAY2
+DTIME 3
+MAXSTEP 36
+TYPE CV
+TIME 12
+STEP 00
+ACCTYPE CV
+ACCTIME 12
+ACCMAXSTEP 36
+CLASS OD
+STREAM ENFO
+NUMBER 1
+EXPVER 1
+GRID 1000
+LEFT -179000
+LOWER -90000
+UPPER 90000
+RIGHT 180000
+LEVEL 62
+LEVELIST 1/to/62
+CWC 1
+RESOL 159
+GAUSS 1
+ACCURACY 24
+OMEGA 1
+OMEGADIFF 0
+ETA 0
+ETADIFF 0
+DPDETA 1
+SMOOTH 0
+FORMAT GRIB2
+ADDPAR /186/187/188/235/139/39
+PREFIX CV
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILOPS ${USER}
+MAILFAIL ${USER}
+GRIB2FLEXPART 0
+EOF
diff --git a/test/Regression/Mars_request/Controls/CONTROL_EI.public_mr b/test/Regression/Mars_request/Controls/CONTROL_EI.public_mr
new file mode 100644
index 0000000..8054286
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_EI.public_mr
@@ -0,0 +1,41 @@
+DAY1 20180701
+DAY2
+DTIME 6
+TYPE AN AN AN AN
+TIME 00 06 12 18
+STEP 00 00 00 00
+ACCTYPE FC
+ACCTIME 00/12
+ACCMAXSTEP 12
+CLASS EI
+DATASET interim
+STREAM OPER
+NUMBER OFF
+EXPVER 1
+GRID 1000
+LEFT -179000
+LOWER -90000
+UPPER 90000
+RIGHT 180000
+LEVELIST 1/to/60
+RESOL 159
+CWC 1
+ACCURACY 24
+GAUSS 1
+OMEGA 0
+OMEGADIFF 0
+ETA 0
+ETADIFF 0
+DPDETA 1
+SMOOTH 0
+FORMAT GRIB1
+ADDPAR 186/187/188/235/139/39
+PREFIX EI
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILFAIL ${USER}
+MAILOPS ${USER}
+GRIB2FLEXPART 0
+EOF
+
diff --git a/test/Regression/Mars_request/Controls/CONTROL_EI_mr b/test/Regression/Mars_request/Controls/CONTROL_EI_mr
new file mode 100644
index 0000000..2093958
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_EI_mr
@@ -0,0 +1,40 @@
+DAY1 20160707
+DAY2
+DTIME 3
+TYPE AN FC FC FC AN FC FC FC
+TIME 00 00 00 00 12 12 12 12
+STEP 00 03 06 09 00 03 06 09
+ACCTYPE FC
+ACCTIME 00/12
+ACCMAXSTEP 12
+CLASS EI
+STREAM OPER
+NUMBER OFF
+EXPVER 1
+GRID 1000
+LEFT -179000
+LOWER -90000
+UPPER 90000
+RIGHT 180000
+LEVEL 60
+LEVELIST 1/to/60
+CWC 1
+RESOL 159
+GAUSS 1
+ACCURACY 24
+OMEGA 0
+OMEGADIFF 0
+ETA 0
+ETADIFF 0
+DPDETA 1
+SMOOTH 0
+FORMAT GRIB2
+ADDPAR /186/187/188/235/139/39
+PREFIX EI
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILOPS ${USER}
+MAILFAIL ${USER}
+GRIB2FLEXPART 0
+EOF
diff --git a/test/Regression/Mars_request/Controls/CONTROL_OD.ELDA.FC.eta.ens.double_mr b/test/Regression/Mars_request/Controls/CONTROL_OD.ELDA.FC.eta.ens.double_mr
new file mode 100644
index 0000000..05e0080
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_OD.ELDA.FC.eta.ens.double_mr
@@ -0,0 +1,34 @@
+DAY1 20190601
+DAY2
+DTIME 3
+M_TYPE AN FC AN FC AN FC AN FC
+M_TIME 00 18 06 06 12 06 18 18
+M_STEP 00 09 00 03 00 09 00 03
+M_ACCTIME 06/18
+M_ACCMAXSTEP 12
+M_STREAM ELDA
+PREFIX EN
+M_UPPER 30000
+M_LOWER 10000
+M_LEFT -10000
+M_RIGHT 10000
+M_CLASS OD
+M_NUMBER 0/to/25
+M_GRID 1000
+M_RESOL 159
+M_SMOOTH 0
+M_GAUSS 0
+M_ETA 1
+M_CWC 1
+M_ETAPAR 77
+M_DPDETA 1
+M_LEVEL 137
+M_LEVELIST 1/TO/137
+M_ADDPAR 186/187/188/235/139/39/134
+M_FORMAT GRIB1
+ECSTORAGE 0
+ECTRANS 1
+DEBUG 1
+ECFSDIR ectmp:/${USER}/ecops
+MAILOPS ${USER}
+MAILFAIL ${USER}
diff --git a/test/Regression/Mars_request/Controls/CONTROL_OD.ENFO.CF_mr b/test/Regression/Mars_request/Controls/CONTROL_OD.ENFO.CF_mr
new file mode 100644
index 0000000..beed42b
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_OD.ENFO.CF_mr
@@ -0,0 +1,35 @@
+DAY1 20190601
+DAY2
+DTIME 3
+M_TYPE CF CF CF CF CF CF CF CF
+M_TIME 00 00 00 00 12 12 12 12
+M_STEP 00 03 06 09 00 03 06 09
+ACCTYPE CF
+ACCTIME 00/12
+ACCMAXSTEP 12
+M_STREAM ENFO
+PREFIX EN
+M_UPPER 90000
+M_LOWER -90000
+M_LEFT -179000
+M_RIGHT 180000
+M_CLASS OD
+M_NUMBER 0
+M_GRID 1000
+M_RESOL 159
+M_SMOOTH 0
+M_GAUSS 1
+M_ETA 0
+M_ETAPAR 77
+M_DPDETA 1
+M_CWC 1
+M_LEVEL 91
+M_LEVELIST 1/TO/91
+M_ADDPAR 186/187/188/235/139/39/134
+M_FORMAT GRIB1
+ECSTORAGE 0
+ECTRANS 1
+DEBUG 1
+ECFSDIR ectmp:/${USER}/ecops
+MAILOPS ${USER}
+MAILFAIL ${USER}
diff --git a/test/Regression/Mars_request/Controls/CONTROL_OD.ENFO.PF_mr b/test/Regression/Mars_request/Controls/CONTROL_OD.ENFO.PF_mr
new file mode 100644
index 0000000..de44fdc
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_OD.ENFO.PF_mr
@@ -0,0 +1,31 @@
+DAY1 20190701
+DAY2
+DTIME 3
+M_TYPE PF PF PF PF PF PF PF PF
+M_TIME 00 00 00 00 12 12 12 12
+M_STEP 00 03 06 09 00 03 06 09
+M_STREAM ENFO
+PREFIX EN
+M_UPPER 90000
+M_LOWER -90000
+M_LEFT -179000
+M_RIGHT 180000
+M_CLASS OD
+M_NUMBER 1/TO/50
+M_GRID 1000
+M_RESOL 159
+M_SMOOTH 0
+M_GAUSS 1
+M_ETA 0
+M_ETAPAR 77
+M_DPDETA 1
+M_LEVEL 91
+M_LEVELIST 85/TO/91
+M_ADDPAR 186/187/188/235/139/39/134
+M_FORMAT GRIB1
+ECSTORAGE 1
+ECTRANS 0
+DEBUG 1
+ECFSDIR ectmp:/${USER}/ecops
+MAILOPS ${USER}
+MAILFAIL ${USER}
diff --git a/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.4V.operational_mr b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.4V.operational_mr
new file mode 100644
index 0000000..5729fee
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.4V.operational_mr
@@ -0,0 +1,32 @@
+DAY1 20190710
+DAY2
+DTIME 1
+M_TYPE AN FC FC FC FC FC AN FC FC 4V FC FC 4V FC FC FC FC FC AN FC FC 4V FC FC 4V
+M_TIME 00 00 00 00 00 00 06 00 00 09 00 00 09 12 12 12 12 12 18 12 12 21 12 12 21
+M_STEP 00 01 02 03 04 05 00 07 08 00 10 11 03 01 02 03 04 05 00 07 08 00 10 11 03
+PREFIX OP
+M_UPPER 60000
+M_LOWER 10000
+M_LEFT -25000
+M_RIGHT 60000
+M_CLASS OD
+M_STREAM OPER
+M_NUMBER OFF
+M_GRID 1000
+M_RESOL 255
+M_SMOOTH 0
+M_GAUSS 1
+M_ETA 0
+M_ETAPAR 77
+M_DPDETA 1
+M_LEVEL 137
+M_LEVELIST 1/to/137
+M_ADDPAR 186/187/188/235/139/39
+M_FORMAT GRIB1
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/ecops
+MAILOPS ${USER}
+MAILFAIL ${USER}
+CWC 1
+EOF
diff --git a/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.FC.36hours_mr b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.FC.36hours_mr
new file mode 100644
index 0000000..914dd10
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.FC.36hours_mr
@@ -0,0 +1,41 @@
+DAY1 20190406
+DAY2
+DTIME 3
+M_TYPE FC
+M_TIME 00
+M_STEP 00
+M_MAXSTEP 36
+ACCTYPE FC
+ACCTIME 00
+ACCMAXSTEP 36
+M_LEVEL 137
+M_LEVELIST 1/to/137
+M_CLASS OD
+M_STREAM OPER
+M_NUMBER OFF
+M_EXPVER 1
+M_GRID 1000
+M_LEFT -179000
+M_LOWER -90000
+M_UPPER 90000
+M_RIGHT 180000
+M_RESOL 159
+M_GAUSS 0
+M_ACCURACY 24
+M_OMEGA 0
+M_OMEGADIFF 0
+M_ETA 1
+M_ETADIFF 0
+M_DPDETA 1
+M_SMOOTH 0
+M_FORMAT GRIB2
+M_ADDPAR /186/187/188/235/139/39
+M_WRF 0
+M_CWC 1
+PREFIX FC
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILOPS ${USER}
+MAILFAIL ${USER}
+EOF
diff --git a/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.FC.twiceaday_mr b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.FC.twiceaday_mr
new file mode 100644
index 0000000..a3b9cf3
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.FC.twiceaday_mr
@@ -0,0 +1,41 @@
+DAY1 20190605
+DAY2
+DTIME 3
+M_TYPE FC FC FC FC FC FC FC FC FC FC FC FC FC FC FC FC FC FC FC FC FC FC FC FC
+M_TIME 00 00 00 00 00 00 00 00 00 00 00 00 12 12 12 12 12 12 12 12 12 12 12 12
+M_STEP 00 01 02 03 04 05 06 07 08 09 10 11 00 01 02 03 04 05 06 07 08 09 10 11
+M_MAXSTEP 12
+ACCTYPE FC
+ACCTIME 00/12
+ACCMAXSTEP 12
+M_LEVEL 137
+M_LEVELIST 1/to/137
+M_CLASS OD
+M_STREAM OPER
+M_NUMBER OFF
+M_EXPVER 1
+M_GRID 1000
+M_LEFT -179000
+M_LOWER -90000
+M_UPPER 90000
+M_RIGHT 180000
+M_RESOL 159
+M_GAUSS 0
+M_ACCURACY 24
+M_OMEGA 0
+M_OMEGADIFF 0
+M_ETA 1
+M_ETADIFF 0
+M_DPDETA 1
+M_SMOOTH 0
+M_FORMAT GRIB2
+M_ADDPAR /186/187/188/235/139/39
+M_WRF 0
+M_CWC 1
+PREFIX FC
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILOPS ${USER}
+MAILFAIL ${USER}
+EOF
diff --git a/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.global.025_mr b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.global.025_mr
new file mode 100644
index 0000000..e3ddb0f
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.global.025_mr
@@ -0,0 +1,35 @@
+DAY1 20190701
+DAY2
+DTIME 1
+M_TYPE AN FC FC FC FC FC FC FC FC FC FC FC AN FC FC FC FC FC FC FC FC FC FC FC
+M_TIME 00 00 00 00 00 00 00 00 00 00 00 00 12 12 12 12 12 12 12 12 12 12 12 12
+M_STEP 00 01 02 03 04 05 06 07 08 09 10 11 00 01 02 03 04 05 06 07 08 09 10 11
+M_CLASS OD
+M_STREAM OPER
+M_NUMBER OFF
+M_EXPVER
+M_GRID 250
+M_LEFT -179750
+M_LOWER -90000
+M_UPPER 90000
+M_RIGHT 180000
+M_LEVEL 137
+M_RESOL 799
+M_GAUSS 0
+M_ACCURACY 24
+M_OMEGA 0
+M_OMEGADIFF 0
+M_ETA 1
+M_ETADIFF 0
+M_DPDETA 1
+M_SMOOTH 0
+M_FORMAT GRIB2
+M_ADDPAR /186/187/188/235/139/39
+M_CWC 1
+PREFIX ENH
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILOPS ${USER}
+MAILFAIL ${USER}
+EOF
diff --git a/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.highres.eta_mr b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.highres.eta_mr
new file mode 100644
index 0000000..99e150e
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.highres.eta_mr
@@ -0,0 +1,35 @@
+DAY1 20190710
+DAY2
+DTIME 1
+M_TYPE AN FC FC FC FC FC FC FC FC FC FC FC AN FC FC FC FC FC FC FC FC FC FC FC
+M_TIME 00 00 00 00 00 00 00 00 00 00 00 00 12 12 12 12 12 12 12 12 12 12 12 12
+M_STEP 00 01 02 03 04 05 06 07 08 09 10 11 00 01 02 03 04 05 06 07 08 09 10 11
+M_CLASS OD
+M_STREAM OPER
+M_NUMBER OFF
+M_EXPVER 1
+M_GRID 200
+M_LEFT -10000
+M_LOWER 30000
+M_UPPER 60000
+M_RIGHT 30000
+M_LEVEL 137
+M_RESOL 799
+M_GAUSS 0
+M_ACCURACY 24
+M_OMEGA 0
+M_OMEGADIFF 0
+M_ETA 1
+M_ETADIFF 0
+M_DPDETA 1
+M_SMOOTH 0
+M_FORMAT GRIB2
+M_ADDPAR /186/187/188/235/139/39
+M_CWC 1
+PREFIX ENH
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILOPS ${USER}
+MAILFAIL ${USER}
+EOF
diff --git a/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.highres.gauss_mr b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.highres.gauss_mr
new file mode 100644
index 0000000..27610e4
--- /dev/null
+++ b/test/Regression/Mars_request/Controls/CONTROL_OD.OPER.highres.gauss_mr
@@ -0,0 +1,38 @@
+DAY1 20190710
+DAY2
+DTIME 1
+M_TYPE AN FC FC FC FC FC FC FC FC FC FC FC AN FC FC FC FC FC FC FC FC FC FC FC
+M_TIME 00 00 00 00 00 00 00 00 00 00 00 00 12 12 12 12 12 12 12 12 12 12 12 12
+M_STEP 00 01 02 03 04 05 06 07 08 09 10 11 00 01 02 03 04 05 06 07 08 09 10 11
+ACCTIME 00/12
+ACCTYPE FC
+ACCMAXSTEP 12
+M_CLASS OD
+M_STREAM OPER
+M_NUMBER OFF
+M_EXPVER 1
+M_GRID 200
+M_LEFT -10000
+M_LOWER 30000
+M_UPPER 60000
+M_RIGHT 30000
+M_LEVEL 137
+M_RESOL 1279
+M_GAUSS 1
+M_ACCURACY 24
+M_OMEGA 0
+M_OMEGADIFF 0
+M_ETA 0
+M_ETADIFF 0
+M_DPDETA 1
+M_SMOOTH 0
+M_FORMAT GRIB2
+M_ADDPAR 186/187/188/235/139/39
+M_CWC 1
+PREFIX ENHG
+ECSTORAGE 0
+ECTRANS 1
+ECFSDIR ectmp:/${USER}/econdemand/
+MAILOPS ${USER}
+MAILFAIL ${USER}
+EOF
diff --git a/test/Regression/Mars_request/Log/log_2018-11-23_12-42-29 b/test/Regression/Mars_request/Log/log_2018-11-23_12-42-29
deleted file mode 100644
index 01f1aae..0000000
--- a/test/Regression/Mars_request/Log/log_2018-11-23_12-42-29
+++ /dev/null
@@ -1,8 +0,0 @@
-Compare mars requests between version 7.0.3 and version 7.1 :
-... CONTROL_EA5.highres_mr ... FAILED!
-... Unconsistency happend to be in column: dataset
-
-... CONTROL_EA5_mr ... FAILED!
-... Unconsistency happend to be in column: dataset
-
-... CONTROL_EA5.public_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2018-11-23_12-48-59 b/test/Regression/Mars_request/Log/log_2018-11-23_12-48-59
deleted file mode 100644
index 01f1aae..0000000
--- a/test/Regression/Mars_request/Log/log_2018-11-23_12-48-59
+++ /dev/null
@@ -1,8 +0,0 @@
-Compare mars requests between version 7.0.3 and version 7.1 :
-... CONTROL_EA5.highres_mr ... FAILED!
-... Unconsistency happend to be in column: dataset
-
-... CONTROL_EA5_mr ... FAILED!
-... Unconsistency happend to be in column: dataset
-
-... CONTROL_EA5.public_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2018-11-23_14-52-05 b/test/Regression/Mars_request/Log/log_2018-11-23_14-52-05
deleted file mode 100644
index 43040fb..0000000
--- a/test/Regression/Mars_request/Log/log_2018-11-23_14-52-05
+++ /dev/null
@@ -1 +0,0 @@
-Compare mars requests between version 7.0.3 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2018-11-23_14-52-43 b/test/Regression/Mars_request/Log/log_2018-11-23_14-52-43
deleted file mode 100644
index 01f1aae..0000000
--- a/test/Regression/Mars_request/Log/log_2018-11-23_14-52-43
+++ /dev/null
@@ -1,8 +0,0 @@
-Compare mars requests between version 7.0.3 and version 7.1 :
-... CONTROL_EA5.highres_mr ... FAILED!
-... Unconsistency happend to be in column: dataset
-
-... CONTROL_EA5_mr ... FAILED!
-... Unconsistency happend to be in column: dataset
-
-... CONTROL_EA5.public_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2018-11-29_23-51-01 b/test/Regression/Mars_request/Log/log_2018-11-29_23-51-01
deleted file mode 100644
index 43040fb..0000000
--- a/test/Regression/Mars_request/Log/log_2018-11-29_23-51-01
+++ /dev/null
@@ -1 +0,0 @@
-Compare mars requests between version 7.0.3 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2018-11-29_23-51-50 b/test/Regression/Mars_request/Log/log_2018-11-29_23-51-50
deleted file mode 100644
index 01f1aae..0000000
--- a/test/Regression/Mars_request/Log/log_2018-11-29_23-51-50
+++ /dev/null
@@ -1,8 +0,0 @@
-Compare mars requests between version 7.0.3 and version 7.1 :
-... CONTROL_EA5.highres_mr ... FAILED!
-... Unconsistency happend to be in column: dataset
-
-... CONTROL_EA5_mr ... FAILED!
-... Unconsistency happend to be in column: dataset
-
-... CONTROL_EA5.public_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-05-47 b/test/Regression/Mars_request/Log/log_2019-07-17_11-05-47
new file mode 100644
index 0000000..059e7de
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-05-47
@@ -0,0 +1,31 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_CF_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_CV_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_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.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-37-01 b/test/Regression/Mars_request/Log/log_2019-07-17_11-37-01
new file mode 100644
index 0000000..5a42150
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-37-01
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-40-56 b/test/Regression/Mars_request/Log/log_2019-07-17_11-40-56
new file mode 100644
index 0000000..5a42150
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-40-56
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-42-31 b/test/Regression/Mars_request/Log/log_2019-07-17_11-42-31
new file mode 100644
index 0000000..5a42150
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-42-31
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-42-58 b/test/Regression/Mars_request/Log/log_2019-07-17_11-42-58
new file mode 100644
index 0000000..5a42150
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-42-58
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-43-13 b/test/Regression/Mars_request/Log/log_2019-07-17_11-43-13
new file mode 100644
index 0000000..1aa2e5a
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-43-13
@@ -0,0 +1,7 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-43-50 b/test/Regression/Mars_request/Log/log_2019-07-17_11-43-50
new file mode 100644
index 0000000..059e7de
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-43-50
@@ -0,0 +1,31 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_CF_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_CV_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_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.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-47-22 b/test/Regression/Mars_request/Log/log_2019-07-17_11-47-22
new file mode 100644
index 0000000..5a42150
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-47-22
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-47-44 b/test/Regression/Mars_request/Log/log_2019-07-17_11-47-44
new file mode 100644
index 0000000..5a42150
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-47-44
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-47-59 b/test/Regression/Mars_request/Log/log_2019-07-17_11-47-59
new file mode 100644
index 0000000..5a42150
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-47-59
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-49-07 b/test/Regression/Mars_request/Log/log_2019-07-17_11-49-07
new file mode 100644
index 0000000..5a42150
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-49-07
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-50-37 b/test/Regression/Mars_request/Log/log_2019-07-17_11-50-37
new file mode 100644
index 0000000..5a42150
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-50-37
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-51-09 b/test/Regression/Mars_request/Log/log_2019-07-17_11-51-09
new file mode 100644
index 0000000..5a42150
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-51-09
@@ -0,0 +1 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-51-24 b/test/Regression/Mars_request/Log/log_2019-07-17_11-51-24
new file mode 100644
index 0000000..059e7de
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-51-24
@@ -0,0 +1,31 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_CF_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_CV_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_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.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-51-35 b/test/Regression/Mars_request/Log/log_2019-07-17_11-51-35
new file mode 100644
index 0000000..059e7de
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-51-35
@@ -0,0 +1,31 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_CF_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_CV_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_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.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-52-51 b/test/Regression/Mars_request/Log/log_2019-07-17_11-52-51
new file mode 100644
index 0000000..059e7de
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-52-51
@@ -0,0 +1,31 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_CF_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_CV_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_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.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-53-25 b/test/Regression/Mars_request/Log/log_2019-07-17_11-53-25
new file mode 100644
index 0000000..059e7de
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-53-25
@@ -0,0 +1,31 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_CF_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_CV_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_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.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-55-07 b/test/Regression/Mars_request/Log/log_2019-07-17_11-55-07
new file mode 100644
index 0000000..059e7de
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-55-07
@@ -0,0 +1,31 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_CF_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_CV_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_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.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-55-54 b/test/Regression/Mars_request/Log/log_2019-07-17_11-55-54
new file mode 100644
index 0000000..059e7de
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-55-54
@@ -0,0 +1,31 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_CF_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_CV_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_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.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-56-03 b/test/Regression/Mars_request/Log/log_2019-07-17_11-56-03
new file mode 100644
index 0000000..059e7de
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-56-03
@@ -0,0 +1,31 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_CF_mr ... FAILED!
+... Unconsistency happend to be in column: step
+
+... CONTROL_CV_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_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.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
diff --git a/test/Regression/Mars_request/Log/log_2019-07-17_11-56-52 b/test/Regression/Mars_request/Log/log_2019-07-17_11-56-52
new file mode 100644
index 0000000..8e9dbba
--- /dev/null
+++ b/test/Regression/Mars_request/Log/log_2019-07-17_11-56-52
@@ -0,0 +1,25 @@
+Compare mars requests between version 7.0.4 and version 7.1 :
+... CONTROL_EA5.highres_mr ... OK!
+... CONTROL_EA5.public_mr ... OK!
+... CONTROL_EA5_mr ... OK!
+... CONTROL_CERA.public_mr ... OK!
+... CONTROL_CERA_mr ... OK!
+... CONTROL_EI_mr ... OK!
+... CONTROL_OD.OPER.FC.36hours_mr ... OK!
+... CONTROL_OD.OPER.FC.twiceaday_mr ... OK!
+... CONTROL_OD.OPER.global.025_mr ... OK!
+... CONTROL_OD.OPER.4V.operational_mr ... OK!
+... CONTROL_EI.public_mr ... OK!
+... CONTROL_CF_mr ... OK!
+... CONTROL_CV_mr ... OK!
+... CONTROL_OD.ELDA.FC.eta.ens.double_mr ... FAILED!
+... Unconsistency happend to be in column: date
+
+... 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.OPER.highres.eta_mr ... OK!
+... CONTROL_OD.OPER.highres.gauss_mr ... OK!
diff --git a/test/Regression/Mars_request/run_local.sh b/test/Regression/Mars_request/run_local.sh
index da5bf8c..17b6d15 100755
--- a/test/Regression/Mars_request/run_local.sh
+++ b/test/Regression/Mars_request/run_local.sh
@@ -29,13 +29,13 @@ QUEUE=''
START_DATE=None
END_DATE=None
DATE_CHUNK=None
+JOB_CHUNK=None
BASETIME=None
STEP=None
LEVELIST=None
AREA=None
INPUTDIR='./'${1}'/'
OUTPUTDIR=None
-FLEXPART_ROOT_SCRIPTS=None
PP_ID=None
JOB_TEMPLATE=''
CONTROLFILE=$2
@@ -65,6 +65,9 @@ fi
if [ -n "$DATE_CHUNK" ]; then
parameterlist+=" --date_chunk=$DATE_CHUNK"
fi
+if [ -n "$JOB_CHUNK" ]; then
+ parameterlist+=" --job_chunk=$JOB_CHUNK"
+fi
if [ -n "$BASETIME" ]; then
parameterlist+=" --basetime=$BASETIME"
fi
@@ -83,9 +86,6 @@ fi
if [ -n "$OUTPUTDIR" ]; then
parameterlist+=" --outputdir=$OUTPUTDIR"
fi
-if [ -n "$FLEXPART_ROOT_SCRIPTS" ]; then
- parameterlist+=" --flexpart_root_scripts=$FLEXPART_ROOT_SCRIPTS"
-fi
if [ -n "$PP_ID" ]; then
parameterlist+=" --ppid=$PP_ID"
fi
diff --git a/test/Regression/Mars_request/test_cmp_mars_requests.py b/test/Regression/Mars_request/test_cmp_mars_requests.py
index bd7d65f..20fcdc6 100644
--- a/test/Regression/Mars_request/test_cmp_mars_requests.py
+++ b/test/Regression/Mars_request/test_cmp_mars_requests.py
@@ -25,7 +25,7 @@ flex_extract. For example: "7.0.3" and "7.1".
Example
-------
- python test_cmp_mars_requests.py 7.0.3 7.1
+ python test_cmp_mars_requests.py 7.0.4 7.1
"""
# ------------------------------------------------------------------------------
@@ -40,6 +40,7 @@ from datetime import datetime
sys.path.append('../../../source/python')
import _config
+from mods.tools import init128
# ------------------------------------------------------------------------------
# FUNCTION
@@ -128,21 +129,117 @@ def test_mr_content_equality(mr_old, mr_new):
lresult = None
columns = list(mr_new.columns.values)
del columns[columns.index('target')]
+ mr_new = trim_all_columns(mr_new)
+ mr_old = trim_all_columns(mr_old)
for col in columns:
if mr_new[col].equals(mr_old[col]):
lresult = True
else:
err_msg += 'Unconsistency happend to be in column: ' + col + '\n'
+ print mr_new[col]
+ print mr_old[col]
return False
return lresult
+def trim_all_columns(df):
+ """
+ Trim whitespace from ends of each value across all series in dataframe
+ """
+ trim_strings = lambda x: x.strip() if isinstance(x, str) else x
+ return df.applymap(trim_strings)
+
+def convert_param_numbers(mr_old):
+ """
+ Convert the numbers parameter into integers with 3 digits.
+ """
+
+ if str(mr_old).strip() != "OFF" and mr_old != None and '/' in str(mr_old) :
+ numbers = mr_old.split('/')
+ number = str(int(numbers[0])).zfill(3)+'/TO/'+str(int(numbers[2])).zfill(3)
+
+ return number
+
+ return mr_old
+
+def convert_param_step(mr_old):
+ """
+ For pure forecast with steps greater than 23 hours, the older versions
+ writes out a list of steps instead with the syntax 'to' and 'by'.
+ e.g. 000/003/006/009/012/015/018/021/024/027/030/033/036
+
+ Convert this to 0/to/36/by/3
+ """
+
+ #if 'to' in str(mr_old) and 'by' in str(mr_old):
+ # steps = mr_old.split('/')
+ # step = []
+ # for i in range(int(steps[0]),int(steps[2]),int(steps[4])):
+ # step.append(str(int(i)).zfill(2))
+ # return '/'.join(step)
+
+ if not mr_old.isdigit() and 'to' not in mr_old.lower():
+ if int(mr_old.split('/')[-1]) > 23:
+
+ steps = mr_old.split('/')
+ dtime = int(steps[1]) - int(steps[0])
+
+ nsteps = str(int(steps[1]))+'/to/'+str(int(steps[-1]))+'/by/'+str(int(dtime))
+ return nsteps
+
+
+ return mr_old
+
+def to_param_id(pars, table):
+ '''Transform parameter names to parameter ids with ECMWF grib table 128.
+
+ Parameters
+ ----------
+ pars : str
+ Addpar argument from CONTROL file in the format of
+ parameter names instead of ids. The parameter short
+ names are sepearted with "/" and they are passed as
+ one single string.
+
+ table : dict
+ Contains the ECMWF grib table 128 information.
+ The key is the parameter number and the value is the
+ short name of the parameter.
+
+ Return
+ ------
+ ipar : list of int
+ List of addpar parameters from CONTROL file transformed to
+ parameter ids in the format of integer.
+ '''
+ if not pars:
+ return []
+ if not isinstance(pars, str):
+ pars=str(pars)
+
+ cpar = pars.upper().split('/')
+ spar = []
+ for par in cpar:
+ par = par.strip()
+ for k, v in table.items():
+ if par.isdigit():
+ par = str(int(par)).zfill(3)
+ if par == k or par == v:
+ spar.append(k + '.128')
+ break
+ else:
+ print('\n\Warning: par ' + par + ' not found in table 128\n\n”')
+
+ return '/'.join(str(l) for l in spar)
+
+
+
if __name__ == '__main__':
# basic values for paths and versions
control_path = 'Controls'
log_path = 'Log'
- old_dir = sys.argv[1] # e.g. '7.0.3'
+ old_dir = sys.argv[1] # e.g. '7.0.4'
new_dir = sys.argv[2] # e.g. '7.1'
mr_filename = 'mars_requests.csv'
@@ -183,6 +280,18 @@ if __name__ == '__main__':
mr_old.columns = mr_old.columns.str.strip()
mr_new.columns = mr_new.columns.str.strip()
+ # convert names in old to ids
+ table128 = init128(_config.PATH_GRIBTABLE)
+ #print mr_old['param']
+
+ # 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'])
+
+ print 'Results: ', c
+
# do tests on mr files
lcoleq = test_mr_column_equality(mr_old, mr_new)
lnoeq = test_mr_number_equality(mr_old, mr_new)
@@ -200,6 +309,8 @@ if __name__ == '__main__':
if err_msg:
f.write('... \t' + err_msg + '\n')
+ exit
+
# exit with success or error status
if lfinal:
sys.exit(0) # 'SUCCESS'
--
GitLab