diff --git a/Overlap/CMakeLists.txt b/Overlap/CMakeLists.txt index 2303bb2a45678ddadebdcc19c76e7d6fc9cd26b8..e433569ef22e58824042eebcdf7357ceee94685d 100644 --- a/Overlap/CMakeLists.txt +++ b/Overlap/CMakeLists.txt @@ -26,7 +26,7 @@ target_sources(test_overlap PRIVATE overlap.f90 spher_polygon_area.f90 target_sources(test_spher_polygon_area PRIVATE spher_polygon_area.f90) target_sources(test_read_snapshot PRIVATE read_snapshot.f90 read_eddy.f90 read_grid.F90 config_graph.F90) -target_sources(test_read_eddy PRIVATE read_eddy.f90) +target_sources(test_read_eddy PRIVATE read_eddy.f90 read_grid.F90) if(MPI_Fortran_HAVE_F08_MODULE) target_sources(test_send_recv PRIVATE send_snapshot.f90 recv_snapshot.f90 diff --git a/Overlap/Tests/CMakeLists.txt b/Overlap/Tests/CMakeLists.txt index 8a22173cf56259441244c5aa796036ee3ca77ba1..532807425f09d9f4f7cf2e5100348e2f84e1d4d4 100644 --- a/Overlap/Tests/CMakeLists.txt +++ b/Overlap/Tests/CMakeLists.txt @@ -25,6 +25,7 @@ add_executable(test_read_eddy test_read_eddy.f90 ${PROJECT_SOURCE_DIR}/Inst_eddies/write_eddy.f90) target_link_libraries(test_read_eddy Shapelib_03::shapelib_03 Contour_531::contour_531 gpc_f Jumble::jumble) +target_compile_definitions(test_read_eddy PRIVATE CPP_SEQUENTIAL) if(MPI_Fortran_HAVE_F08_MODULE) # test_send_recv diff --git a/Overlap/Tests/test_read_eddy.f90 b/Overlap/Tests/test_read_eddy.f90 index 6b7e4c08842d402d1668e54acfc451d286053a1c..19f5fac7b2894fe29a885dd5b4d9886206a3cd85 100644 --- a/Overlap/Tests/test_read_eddy.f90 +++ b/Overlap/Tests/test_read_eddy.f90 @@ -5,6 +5,7 @@ program test_read_eddy use derived_types, only: eddy, shpc_slice_handler use read_eddy_m, only: read_eddy + use read_grid_m, only: read_grid, uniform_lon_lat use shpc_close_m, only: shpc_close use shpc_create_m, only: shpc_create use shpc_open_m, only: shpc_open @@ -23,10 +24,11 @@ program test_read_eddy !------------------------------------------------------------------------- call get_command_arg_dyn(1, shpc_dir, "Required argument: SHPC-directory") + call read_grid(rank = 0, shpc_dir = shpc_dir) print *, "Enter namelist main_nml." read(unit = *, nml = main_nml) call shpc_open(hshp_in, shpc_dir, cyclone = cyclone, slice = 0, & - with_proj = .not. grid_lon_lat, pszaccess = "rb") + with_proj = .not. uniform_lon_lat, pszaccess = "rb") call read_eddy(e, k, eddy_i, hshp_in, ishape) call shpc_create(hshp_out, shpc_dir = "SHPC", cyclone = hshp_in%cyclone, & slice = 0, with_proj = .not. grid_lon_lat)