From fcf358dc52fedf285e421ec9bbb607d75760ef2b Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 4 Jan 2022 22:30:43 +0100
Subject: [PATCH] Polish
---
Common/CMakeLists.txt | 21 +++++++--------------
Inst_eddies/CMakeLists.txt | 10 ----------
Overlap/CMakeLists.txt | 3 ---
Overlap/Tests/CMakeLists.txt | 13 -------------
Tests/CMakeLists.txt | 2 --
5 files changed, 7 insertions(+), 42 deletions(-)
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 95f1a8ab..f2b35746 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -1,17 +1,10 @@
target_sources(test_get_1_outerm PRIVATE derived_types.f90
- spher_polyline_area.f90 shpc_create.f90 write_eddy.f90
- shpc_close.f90)
-
+ spher_polyline_area.f90 shpc_create.f90 write_eddy.f90 shpc_close.f90)
target_sources(test_set_all_outerm PRIVATE derived_types.f90
- spher_polyline_area.f90 shpc_create.f90 write_eddy.f90
- shpc_close.f90)
-
-target_sources(test_max_speed_contour_ssh PRIVATE derived_types.f90 )
-
-target_sources(test_nearby_extr PRIVATE derived_types.f90
- read_snapshot.f90 read_eddy.f90 read_field_indices.F90 shpc_open.F90
- shpc_close.f90)
-
+ spher_polyline_area.f90 shpc_create.f90 write_eddy.f90 shpc_close.f90)
+target_sources(test_max_speed_contour_ssh PRIVATE derived_types.f90)
+target_sources(test_nearby_extr PRIVATE derived_types.f90 read_snapshot.f90
+ read_eddy.f90 read_field_indices.F90 shpc_open.F90 shpc_close.f90)
target_sources(test_set_max_speed PRIVATE derived_types.f90
- spher_polyline_area.f90 shpc_open.F90 shpc_close.f90
- read_field_indices.F90 read_eddy.f90 shpc_create.f90 write_eddy.f90)
+ spher_polyline_area.f90 shpc_open.F90 shpc_close.f90 read_field_indices.F90
+ read_eddy.f90 shpc_create.f90 write_eddy.f90)
diff --git a/Inst_eddies/CMakeLists.txt b/Inst_eddies/CMakeLists.txt
index 25f59887..5eb8842d 100644
--- a/Inst_eddies/CMakeLists.txt
+++ b/Inst_eddies/CMakeLists.txt
@@ -9,36 +9,26 @@ add_executable(inst_eddies inst_eddies.f90
get_var.f90 ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90
write_aux.f90 config.f90 ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90)
-
target_link_libraries(inst_eddies PRIVATE Contour_531::contour_531
Geometry::geometry NetCDF95::netcdf95 Shapelib_03::shapelib_03
Numer_Rec_95::numer_rec_95 Jumble::jumble NetCDF_Fortran::netcdff)
-
configure_file(inst_eddies.py.in inst_eddies.py @ONLY FILE_PERMISSIONS
OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ
WORLD_EXECUTE)
-
file(COPY inst_eddies_Aviso.py DESTINATION . FILE_PERMISSIONS
OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ
WORLD_EXECUTE)
-
add_subdirectory(Tests)
-
target_sources(test_get_1_outerm PRIVATE get_1_outerm.f90 good_contour.f90)
-
target_sources(test_set_all_outerm PRIVATE set_all_outerm.f90
local_extrema.f90 get_1_outerm.f90 good_contour.f90 nearby_extr.f90
get_var.f90 config.f90)
-
target_sources(test_good_contour PRIVATE good_contour.f90)
target_sources(test_inside_4 PRIVATE inside_4.f90)
target_sources(test_mean_speed PRIVATE mean_speed.f90)
-
target_sources(test_max_speed_contour_ssh PRIVATE max_speed_contour_ssh.f90
get_var.f90)
-
target_sources(test_nearby_extr PRIVATE nearby_extr.f90)
target_sources(test_local_extrema PRIVATE local_extrema.f90)
-
target_sources(test_set_max_speed PRIVATE set_max_speed.f90 good_contour.f90
max_speed_contour_ssh.f90 mean_speed.f90 inside_4.f90 get_var.f90)
diff --git a/Overlap/CMakeLists.txt b/Overlap/CMakeLists.txt
index a29bbddf..78d2b5a6 100644
--- a/Overlap/CMakeLists.txt
+++ b/Overlap/CMakeLists.txt
@@ -13,13 +13,10 @@ add_executable(eddy_graph eddy_graph.f90
send_snapshot.f90 ${PROJECT_SOURCE_DIR}/Common/read_eddy.f90
${PROJECT_SOURCE_DIR}/Common/write_eddy.f90
${PROJECT_SOURCE_DIR}/Common/derived_types.f90 unit_edge_m.f90)
-
target_link_libraries(eddy_graph PRIVATE EZMPI::ezmpi Jumble::jumble
Shapelib_03::shapelib_03 Contour_531::contour_531 gpc_f Geometry::geometry
MPI::MPI_Fortran)
-
configure_file(eddy_graph.sh.in eddy_graph.sh @ONLY FILE_PERMISSIONS
OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ
WORLD_EXECUTE)
-
include(Tests/CMakeLists.txt)
diff --git a/Overlap/Tests/CMakeLists.txt b/Overlap/Tests/CMakeLists.txt
index e01ed6c6..750c5c8a 100644
--- a/Overlap/Tests/CMakeLists.txt
+++ b/Overlap/Tests/CMakeLists.txt
@@ -1,5 +1,4 @@
# test_overlap
-
add_executable(test_overlap
${PROJECT_SOURCE_DIR}/Common/derived_types.f90 overlap.f90
${PROJECT_SOURCE_DIR}/Common/read_snapshot.f90 spher_polygon_area.f90
@@ -10,12 +9,10 @@ add_executable(test_overlap
${CMAKE_CURRENT_LIST_DIR}/test_overlap.f90
${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90 unit_edge_m.f90)
-
target_link_libraries(test_overlap Shapelib_03::shapelib_03 Geometry::geometry
Contour_531::contour_531 gpc_f Jumble::jumble)
# test_read_snapshot
-
add_executable(test_read_snapshot
${PROJECT_SOURCE_DIR}/Common/derived_types.f90
${PROJECT_SOURCE_DIR}/Common/shpc_create.f90
@@ -28,31 +25,25 @@ add_executable(test_read_snapshot
${CMAKE_CURRENT_LIST_DIR}/write_snapshot.f90
${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
-
target_link_libraries(test_read_snapshot NetCDF95::netcdf95
Shapelib_03::shapelib_03 Contour_531::contour_531 gpc_f
Jumble::jumble NetCDF_Fortran::netcdff)
# test_spher_polygon_area
-
add_executable(test_spher_polygon_area spher_polygon_area.f90
${PROJECT_SOURCE_DIR}/Common/spher_polyline_area.f90
${CMAKE_CURRENT_LIST_DIR}/test_spher_polygon_area.f90)
-
target_link_libraries(test_spher_polygon_area Geometry::geometry
Shapelib_03::shapelib_03 Jumble::jumble gpc_f)
# test_weight
-
add_executable(test_weight weight.f90
${PROJECT_SOURCE_DIR}/Common/derived_types.f90
${CMAKE_CURRENT_LIST_DIR}/test_weight.f90)
-
target_link_libraries(test_weight PRIVATE fortrangis::fortranGIS
Contour_531::contour_531 Jumble::jumble)
# test_read_eddy
-
add_executable(test_read_eddy
${PROJECT_SOURCE_DIR}/Common/derived_types.f90
${PROJECT_SOURCE_DIR}/Common/shpc_create.f90
@@ -62,12 +53,10 @@ add_executable(test_read_eddy
${CMAKE_CURRENT_LIST_DIR}/test_read_eddy.f90
${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
-
target_link_libraries(test_read_eddy Shapelib_03::shapelib_03
Contour_531::contour_531 gpc_f Jumble::jumble)
# test_send_recv
-
add_executable(test_send_recv
${CMAKE_CURRENT_LIST_DIR}/test_send_recv.f90 send_snapshot.f90
recv_snapshot.f90 ${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90
@@ -86,7 +75,6 @@ target_link_libraries(test_send_recv PRIVATE MPI::MPI_Fortran
NetCDF95::netcdf95 Jumble::jumble NetCDF_Fortran::netcdff)
# test_get_dispatch_snap
-
add_executable(test_get_dispatch_snap
${CMAKE_CURRENT_LIST_DIR}/test_get_dispatch_snap.f90
get_snapshot.f90 dispatch_snapshot.f90
@@ -100,7 +88,6 @@ add_executable(test_get_dispatch_snap
${PROJECT_SOURCE_DIR}/Common/derived_types.f90
${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
-
target_link_libraries(test_get_dispatch_snap Shapelib_03::shapelib_03
Jumble::jumble Contour_531::contour_531 EZMPI::ezmpi NetCDF95::netcdf95
gpc_f NetCDF_Fortran::netcdff MPI::MPI_Fortran)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f6188ff1..9b247658 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1,8 +1,6 @@
add_executable(test_spher_polyline_area
${PROJECT_SOURCE_DIR}/Common/spher_polyline_area.f90
test_spher_polyline_area.f90)
-
target_link_libraries(test_spher_polyline_area Geometry::geometry
Contour_531::contour_531 Jumble::jumble)
-
target_sources(test_local_extrema PRIVATE write_extr_map.f90)
--
GitLab