From 9f759aaa59d26f7042218b457979d734c927f994 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Fri, 22 Oct 2021 23:56:00 +0200
Subject: [PATCH] Provide list of input files as arguments
Provide list of input files as arguments of `inst_eddies.py`,
following commit 8e0c03e1.
---
Inst_eddies/Tests/long_tests.json | 24 ++++++++++++++++++------
Inst_eddies/Tests/short_tests.json | 7 ++++---
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/Inst_eddies/Tests/long_tests.json b/Inst_eddies/Tests/long_tests.json
index c3706467..1aa89843 100644
--- a/Inst_eddies/Tests/long_tests.json
+++ b/Inst_eddies/Tests/long_tests.json
@@ -68,8 +68,20 @@
"$build_dir/Inst_eddies/inst_eddies.py", "-b", "1.625", "15.625",
"-38.375", "-30.375",
"$large_input_dir/dt_global_allsat_phy_l4_20060101_20190101.nc",
- "--template=dt_global_allsat_phy_l4_%Y%m%d_20190101.nc", "-l",
- "20060115"
+ "$large_input_dir/dt_global_allsat_phy_l4_20060102_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060103_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060104_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060105_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060106_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060107_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060108_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060109_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060110_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060111_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060112_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060113_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060114_20190101.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060115_20190101.nc"
],
"input": "20454\n"
},
@@ -80,8 +92,8 @@
[
"$build_dir/Inst_eddies/inst_eddies.py",
"$large_input_dir/dt_global_allsat_phy_l4_20060101_20190101.nc",
- "--template=dt_global_allsat_phy_l4_%Y%m%d_20190101.nc", "-l",
- "2006-01-02", "-b", "5.875", "12.125", "-32.125", "-26.875"
+ "$large_input_dir/dt_global_allsat_phy_l4_20060102_20190101.nc",
+ "-b", "5.875", "12.125", "-32.125", "-26.875"
],
"input": "20454\n"
},
@@ -92,8 +104,8 @@
[
"$build_dir/Inst_eddies/inst_eddies.py",
"/proju/lmd-oce/EUREC4A_OA/DATA_SAT_New/SSH_CLS/EUREC4A_CMEMS_NRT/dataset-duacs-global-allsat-phy-2020-01-31.nc",
- "--template=dataset-duacs-global-allsat-phy-%Y-%m-%d.nc", "-l",
- "20200202"
+ "/proju/lmd-oce/EUREC4A_OA/DATA_SAT_New/SSH_CLS/EUREC4A_CMEMS_NRT/dataset-duacs-global-allsat-phy-2020-02-01.nc",
+ "/proju/lmd-oce/EUREC4A_OA/DATA_SAT_New/SSH_CLS/EUREC4A_CMEMS_NRT/dataset-duacs-global-allsat-phy-2020-02-02.nc"
],
"input": "25597\n",
"description":
diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json
index 69679a05..bd8b6394 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -302,8 +302,7 @@
"$build_dir/Inst_eddies/inst_eddies.py", "-b", "16.125", "20.875",
"-38.875", "-34.125",
"$large_input_dir/dt_global_allsat_phy_l4_20060101_20190101.nc",
- "--template=dt_global_allsat_phy_l4_%Y%m%d_20190101.nc", "-l",
- "20060102"
+ "$large_input_dir/dt_global_allsat_phy_l4_20060102_20190101.nc"
],
"input": "20454\n"
},
@@ -327,7 +326,9 @@
[
"$build_dir/Inst_eddies/inst_eddies.py",
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
- "--template=huv_region_1_%Y_%m_%d.nc", "-l", "2006-01-04"
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_02.nc",
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_03.nc",
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_04.nc"
],
"input": "20454\n"
},
--
GitLab