From 41bdda55b4082021d63a6192092c807f1b2e9c2c Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Mon, 6 Dec 2021 22:08:58 +0100
Subject: [PATCH] Use `inst_eddies_Aviso.py` in tests
When there are more than 3 input files. We recover the convenience of
commit b34b85a, with the underlying generality of commit d365e75.
---
Inst_eddies/Tests/long_tests.json | 26 +++++++-------------------
Inst_eddies/Tests/short_tests.json | 8 +++-----
2 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/Inst_eddies/Tests/long_tests.json b/Inst_eddies/Tests/long_tests.json
index 1aa89843..2bef3288 100644
--- a/Inst_eddies/Tests/long_tests.json
+++ b/Inst_eddies/Tests/long_tests.json
@@ -65,23 +65,11 @@
"title": "Extraction_eddies_region_2_noise",
"command":
[
- "$build_dir/Inst_eddies/inst_eddies.py", "-b", "1.625", "15.625",
- "-38.375", "-30.375",
+ "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
+ "-b", "1.625", "15.625", "-38.375", "-30.375",
"$large_input_dir/dt_global_allsat_phy_l4_20060101_20190101.nc",
- "$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"
+ "--template=dt_global_allsat_phy_l4_%Y%m%d_20190101.nc", "-l",
+ "20060115"
],
"input": "20454\n"
},
@@ -102,10 +90,10 @@
"title": "Missing_file",
"command":
[
- "$build_dir/Inst_eddies/inst_eddies.py",
+ "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
"/proju/lmd-oce/EUREC4A_OA/DATA_SAT_New/SSH_CLS/EUREC4A_CMEMS_NRT/dataset-duacs-global-allsat-phy-2020-01-31.nc",
- "/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"
+ "--template=dataset-duacs-global-allsat-phy-%Y-%m-%d.nc", "-l",
+ "20200202"
],
"input": "25597\n",
"description":
diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json
index 1ddb6c3f..e2f0ad85 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -376,11 +376,9 @@
"title": "Inst_eddies_loop",
"command":
[
- "$build_dir/Inst_eddies/inst_eddies.py",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
- "$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"
+ "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
+ "--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_01.nc"
],
"input": "20454\n"
},
--
GitLab