From 142dbb461f4d070080b36657ff356e4722994ece Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Thu, 10 Jun 2021 20:16:39 +0200
Subject: [PATCH] Move `Eddies_region_4`
Move `Overlap/Tests/Input/Region_4/Eddies_region_4` to Tests. Now used
both in `Inst_eddies` and `Overlap`.
---
Inst_eddies/Analysis/tests.json | 2 +-
Overlap/Tests/short_tests.json | 14 +++++++-------
.../Eddies_region_4/extremum.dbf | Bin
.../Eddies_region_4/extremum.shp | Bin
.../Eddies_region_4/extremum.shx | Bin
.../Eddies_region_4/grid_nml.txt | 0
.../Eddies_region_4/ishape_last.txt | 0
.../Eddies_region_4/max_speed_contour.dbf | Bin
.../Eddies_region_4/max_speed_contour.shp | Bin
.../Eddies_region_4/max_speed_contour.shx | Bin
.../Eddies_region_4/outermost_contour.dbf | Bin
.../Eddies_region_4/outermost_contour.shp | Bin
.../Eddies_region_4/outermost_contour.shx | Bin
.../Eddies_region_4/used_nml.txt | 0
14 files changed, 8 insertions(+), 8 deletions(-)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/extremum.dbf (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/extremum.shp (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/extremum.shx (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/grid_nml.txt (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/ishape_last.txt (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/max_speed_contour.dbf (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/max_speed_contour.shp (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/max_speed_contour.shx (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/outermost_contour.dbf (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/outermost_contour.shp (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/outermost_contour.shx (100%)
rename {Overlap/Tests/Input/Region_4 => Tests}/Eddies_region_4/used_nml.txt (100%)
diff --git a/Inst_eddies/Analysis/tests.json b/Inst_eddies/Analysis/tests.json
index b579aa33..39b5bca0 100644
--- a/Inst_eddies/Analysis/tests.json
+++ b/Inst_eddies/Analysis/tests.json
@@ -40,7 +40,7 @@
"command":
[
"$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
- "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4", "--grid",
+ "$src_dir/Tests/Eddies_region_4", "--grid",
"--save=png"
],
"description": "With grid option.",
diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json
index 86ddbb56..8e89579f 100644
--- a/Overlap/Tests/short_tests.json
+++ b/Overlap/Tests/short_tests.json
@@ -22,7 +22,7 @@
"title": "Read_eddy",
"required": [
[
- "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4",
+ "$src_dir/Tests/Eddies_region_4",
"SHP_triplet_old"
]
],
@@ -54,7 +54,7 @@
"-n",
"1",
"$build_dir/Overlap/test_read_snapshot",
- "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+ "$src_dir/Tests/Eddies_region_4"
]
]
},
@@ -73,7 +73,7 @@
"-n",
"1",
"$build_dir/Overlap/test_overlap",
- "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+ "$src_dir/Tests/Eddies_region_4"
]
]
},
@@ -130,7 +130,7 @@
"-n",
"1",
"$build_dir/Overlap/test_overlap",
- "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+ "$src_dir/Tests/Eddies_region_4"
]
]
},
@@ -267,7 +267,7 @@
"-n",
"1",
"$build_dir/Overlap/test_overlap",
- "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+ "$src_dir/Tests/Eddies_region_4"
]
]
},
@@ -287,7 +287,7 @@
"-n",
"1",
"$build_dir/Overlap/test_overlap",
- "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+ "$src_dir/Tests/Eddies_region_4"
]
]
},
@@ -365,7 +365,7 @@
"-n",
"2",
"$build_dir/Overlap/test_send_recv",
- "$src_dir/Overlap/Tests/Input/Region_4/Eddies_region_4"
+ "$src_dir/Tests/Eddies_region_4"
]
]
},
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.dbf b/Tests/Eddies_region_4/extremum.dbf
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.dbf
rename to Tests/Eddies_region_4/extremum.dbf
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.shp b/Tests/Eddies_region_4/extremum.shp
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.shp
rename to Tests/Eddies_region_4/extremum.shp
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.shx b/Tests/Eddies_region_4/extremum.shx
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/extremum.shx
rename to Tests/Eddies_region_4/extremum.shx
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/grid_nml.txt b/Tests/Eddies_region_4/grid_nml.txt
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/grid_nml.txt
rename to Tests/Eddies_region_4/grid_nml.txt
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/ishape_last.txt b/Tests/Eddies_region_4/ishape_last.txt
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/ishape_last.txt
rename to Tests/Eddies_region_4/ishape_last.txt
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.dbf b/Tests/Eddies_region_4/max_speed_contour.dbf
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.dbf
rename to Tests/Eddies_region_4/max_speed_contour.dbf
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.shp b/Tests/Eddies_region_4/max_speed_contour.shp
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.shp
rename to Tests/Eddies_region_4/max_speed_contour.shp
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.shx b/Tests/Eddies_region_4/max_speed_contour.shx
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/max_speed_contour.shx
rename to Tests/Eddies_region_4/max_speed_contour.shx
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.dbf b/Tests/Eddies_region_4/outermost_contour.dbf
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.dbf
rename to Tests/Eddies_region_4/outermost_contour.dbf
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.shp b/Tests/Eddies_region_4/outermost_contour.shp
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.shp
rename to Tests/Eddies_region_4/outermost_contour.shp
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.shx b/Tests/Eddies_region_4/outermost_contour.shx
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/outermost_contour.shx
rename to Tests/Eddies_region_4/outermost_contour.shx
diff --git a/Overlap/Tests/Input/Region_4/Eddies_region_4/used_nml.txt b/Tests/Eddies_region_4/used_nml.txt
similarity index 100%
rename from Overlap/Tests/Input/Region_4/Eddies_region_4/used_nml.txt
rename to Tests/Eddies_region_4/used_nml.txt
--
GitLab