From 98723dbabc80625f5abc8297de365ac6294a8b61 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 4 Sep 2018 14:00:49 +0200
Subject: [PATCH] Moving files around.
---
.../extremum_1.dbf | Bin
.../extremum_1.shp | Bin
.../extremum_1.shx | Bin
Tests/Input/{h_region_4.nc => Region_4/h.nc} | Bin
.../max_speed_contour_1.dbf | Bin
.../max_speed_contour_1.shp | Bin
.../max_speed_contour_1.shx | Bin
.../outermost_contour_1.dbf | Bin
.../outermost_contour_1.shp | Bin
.../outermost_contour_1.shx | Bin
.../Input/{uv_region_4.nc => Region_4/uv.nc} | Bin
Tests/Input/Test_read_eddy/Read_me | 1 -
Tests/tests.json | 47 +++++++++---------
13 files changed, 23 insertions(+), 25 deletions(-)
rename Tests/Input/{Test_read_eddy => Region_4}/extremum_1.dbf (100%)
rename Tests/Input/{Test_read_eddy => Region_4}/extremum_1.shp (100%)
rename Tests/Input/{Test_read_eddy => Region_4}/extremum_1.shx (100%)
rename Tests/Input/{h_region_4.nc => Region_4/h.nc} (100%)
rename Tests/Input/{Test_read_eddy => Region_4}/max_speed_contour_1.dbf (100%)
rename Tests/Input/{Test_read_eddy => Region_4}/max_speed_contour_1.shp (100%)
rename Tests/Input/{Test_read_eddy => Region_4}/max_speed_contour_1.shx (100%)
rename Tests/Input/{Test_read_eddy => Region_4}/outermost_contour_1.dbf (100%)
rename Tests/Input/{Test_read_eddy => Region_4}/outermost_contour_1.shp (100%)
rename Tests/Input/{Test_read_eddy => Region_4}/outermost_contour_1.shx (100%)
rename Tests/Input/{uv_region_4.nc => Region_4/uv.nc} (100%)
delete mode 100644 Tests/Input/Test_read_eddy/Read_me
diff --git a/Tests/Input/Test_read_eddy/extremum_1.dbf b/Tests/Input/Region_4/extremum_1.dbf
similarity index 100%
rename from Tests/Input/Test_read_eddy/extremum_1.dbf
rename to Tests/Input/Region_4/extremum_1.dbf
diff --git a/Tests/Input/Test_read_eddy/extremum_1.shp b/Tests/Input/Region_4/extremum_1.shp
similarity index 100%
rename from Tests/Input/Test_read_eddy/extremum_1.shp
rename to Tests/Input/Region_4/extremum_1.shp
diff --git a/Tests/Input/Test_read_eddy/extremum_1.shx b/Tests/Input/Region_4/extremum_1.shx
similarity index 100%
rename from Tests/Input/Test_read_eddy/extremum_1.shx
rename to Tests/Input/Region_4/extremum_1.shx
diff --git a/Tests/Input/h_region_4.nc b/Tests/Input/Region_4/h.nc
similarity index 100%
rename from Tests/Input/h_region_4.nc
rename to Tests/Input/Region_4/h.nc
diff --git a/Tests/Input/Test_read_eddy/max_speed_contour_1.dbf b/Tests/Input/Region_4/max_speed_contour_1.dbf
similarity index 100%
rename from Tests/Input/Test_read_eddy/max_speed_contour_1.dbf
rename to Tests/Input/Region_4/max_speed_contour_1.dbf
diff --git a/Tests/Input/Test_read_eddy/max_speed_contour_1.shp b/Tests/Input/Region_4/max_speed_contour_1.shp
similarity index 100%
rename from Tests/Input/Test_read_eddy/max_speed_contour_1.shp
rename to Tests/Input/Region_4/max_speed_contour_1.shp
diff --git a/Tests/Input/Test_read_eddy/max_speed_contour_1.shx b/Tests/Input/Region_4/max_speed_contour_1.shx
similarity index 100%
rename from Tests/Input/Test_read_eddy/max_speed_contour_1.shx
rename to Tests/Input/Region_4/max_speed_contour_1.shx
diff --git a/Tests/Input/Test_read_eddy/outermost_contour_1.dbf b/Tests/Input/Region_4/outermost_contour_1.dbf
similarity index 100%
rename from Tests/Input/Test_read_eddy/outermost_contour_1.dbf
rename to Tests/Input/Region_4/outermost_contour_1.dbf
diff --git a/Tests/Input/Test_read_eddy/outermost_contour_1.shp b/Tests/Input/Region_4/outermost_contour_1.shp
similarity index 100%
rename from Tests/Input/Test_read_eddy/outermost_contour_1.shp
rename to Tests/Input/Region_4/outermost_contour_1.shp
diff --git a/Tests/Input/Test_read_eddy/outermost_contour_1.shx b/Tests/Input/Region_4/outermost_contour_1.shx
similarity index 100%
rename from Tests/Input/Test_read_eddy/outermost_contour_1.shx
rename to Tests/Input/Region_4/outermost_contour_1.shx
diff --git a/Tests/Input/uv_region_4.nc b/Tests/Input/Region_4/uv.nc
similarity index 100%
rename from Tests/Input/uv_region_4.nc
rename to Tests/Input/Region_4/uv.nc
diff --git a/Tests/Input/Test_read_eddy/Read_me b/Tests/Input/Test_read_eddy/Read_me
deleted file mode 100644
index 5524760f..00000000
--- a/Tests/Input/Test_read_eddy/Read_me
+++ /dev/null
@@ -1 +0,0 @@
-Region 4.
\ No newline at end of file
diff --git a/Tests/tests.json b/Tests/tests.json
index d3c6b8ee..f5435ee2 100644
--- a/Tests/tests.json
+++ b/Tests/tests.json
@@ -188,8 +188,7 @@
{
"args": "$compil_prod_dir/test_get_snapshot",
"title": "Get_snapshot_region_4",
- "required": [["$input_dir/h_region_4.nc", "h.nc"],
- ["$input_dir/uv_region_4.nc", "uv.nc"]],
+ "required": ["$input_dir/Region_4/h.nc", "$input_dir/Region_4/uv.nc"],
"input": "1e-3\n",
"description": "Part of the domain has missing values."
},
@@ -221,31 +220,31 @@
"args": "$compil_prod_dir/test_read_eddy",
"required":
[
- ["$input_dir/Test_read_eddy/extremum_1.dbf", "extremum_1_old.dbf"],
- ["$input_dir/Test_read_eddy/extremum_1.shp", "extremum_1_old.shp"],
- ["$input_dir/Test_read_eddy/extremum_1.shx", "extremum_1_old.shx"],
+ ["$input_dir/Region_4/extremum_1.dbf", "extremum_1_old.dbf"],
+ ["$input_dir/Region_4/extremum_1.shp", "extremum_1_old.shp"],
+ ["$input_dir/Region_4/extremum_1.shx", "extremum_1_old.shx"],
[
- "$input_dir/Test_read_eddy/max_speed_contour_1.dbf",
+ "$input_dir/Region_4/max_speed_contour_1.dbf",
"max_speed_contour_1_old.dbf"
],
[
- "$input_dir/Test_read_eddy/max_speed_contour_1.shp",
+ "$input_dir/Region_4/max_speed_contour_1.shp",
"max_speed_contour_1_old.shp"
],
[
- "$input_dir/Test_read_eddy/max_speed_contour_1.shx",
+ "$input_dir/Region_4/max_speed_contour_1.shx",
"max_speed_contour_1_old.shx"
],
[
- "$input_dir/Test_read_eddy/outermost_contour_1.dbf",
+ "$input_dir/Region_4/outermost_contour_1.dbf",
"outermost_contour_1_old.dbf"
],
[
- "$input_dir/Test_read_eddy/outermost_contour_1.shp",
+ "$input_dir/Region_4/outermost_contour_1.shp",
"outermost_contour_1_old.shp"
],
[
- "$input_dir/Test_read_eddy/outermost_contour_1.shx",
+ "$input_dir/Region_4/outermost_contour_1.shx",
"outermost_contour_1_old.shx"
]
],
@@ -255,31 +254,31 @@
"args": "$compil_prod_dir/test_read_snapshot",
"required":
[
- ["$input_dir/Test_read_eddy/extremum_1.dbf", "extremum_1_old.dbf"],
- ["$input_dir/Test_read_eddy/extremum_1.shp", "extremum_1_old.shp"],
- ["$input_dir/Test_read_eddy/extremum_1.shx", "extremum_1_old.shx"],
+ ["$input_dir/Region_4/extremum_1.dbf", "extremum_1_old.dbf"],
+ ["$input_dir/Region_4/extremum_1.shp", "extremum_1_old.shp"],
+ ["$input_dir/Region_4/extremum_1.shx", "extremum_1_old.shx"],
[
- "$input_dir/Test_read_eddy/max_speed_contour_1.dbf",
+ "$input_dir/Region_4/max_speed_contour_1.dbf",
"max_speed_contour_1_old.dbf"
],
[
- "$input_dir/Test_read_eddy/max_speed_contour_1.shp",
+ "$input_dir/Region_4/max_speed_contour_1.shp",
"max_speed_contour_1_old.shp"
],
[
- "$input_dir/Test_read_eddy/max_speed_contour_1.shx",
+ "$input_dir/Region_4/max_speed_contour_1.shx",
"max_speed_contour_1_old.shx"
],
[
- "$input_dir/Test_read_eddy/outermost_contour_1.dbf",
+ "$input_dir/Region_4/outermost_contour_1.dbf",
"outermost_contour_1_old.dbf"
],
[
- "$input_dir/Test_read_eddy/outermost_contour_1.shp",
+ "$input_dir/Region_4/outermost_contour_1.shp",
"outermost_contour_1_old.shp"
],
[
- "$input_dir/Test_read_eddy/outermost_contour_1.shx",
+ "$input_dir/Region_4/outermost_contour_1.shx",
"outermost_contour_1_old.shx"
]
],
@@ -288,7 +287,7 @@
},
{
"args" : ["$compil_prod_dir/test_local_extrema",
- "$input_dir/h_region_4.nc"],
+ "$input_dir/Region_4/h.nc"],
"title" : "Local_extrema_missing",
"description": "test_local_extrema with input file containing missing values."
},
@@ -298,9 +297,9 @@
"description": "Overlap of a snapshot with itself.",
"required":
[
- "$input_dir/Test_read_eddy/*.dbf",
- "$input_dir/Test_read_eddy/*.shx",
- "$input_dir/Test_read_eddy/*.shp"
+ "$input_dir/Region_4/*.dbf",
+ "$input_dir/Region_4/*.shx",
+ "$input_dir/Region_4/*.shp"
],
"stdin": "$input_dir/successive_overlap_nml.txt"
},
--
GitLab