diff --git a/Overlap/Tests/CMakeLists.txt b/Overlap/Tests/CMakeLists.txt index 295773f31401337c115912556044c16d5d931e39..52e5d750fc92cf2e1b33de8b7e9c67fe5b9618ba 100644 --- a/Overlap/Tests/CMakeLists.txt +++ b/Overlap/Tests/CMakeLists.txt @@ -72,7 +72,7 @@ add_executable(test_read_eddy ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90) target_link_libraries(test_read_eddy shapelib_03 contour_531 gpc_f - ezmpi nr_util MPI::MPI_Fortran jumble) + nr_util jumble) target_include_directories(test_read_eddy PRIVATE ${fortrangis_INCLUDE_DIR}) diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json index 2caf3962b29a1883dc430acf5d94f49e604c257e..f07c773371f551642cdb6842702a96fe4b073da6 100644 --- a/Overlap/Tests/short_tests.json +++ b/Overlap/Tests/short_tests.json @@ -26,16 +26,12 @@ "SHPC_old" ] ], - "stdout": "test_read_eddy_stdout.txt", "commands": [ [ "mkdir", "SHPC" ], [ - "$mpiexec", - "-n", - "1", "$build_dir/Overlap/test_read_eddy" ] ] diff --git a/Overlap/Tests/test_read_eddy.f90 b/Overlap/Tests/test_read_eddy.f90 index e24efb92e389ed70341ad2d7de870a0b4fa401a0..0bd0a49509b518e7d6ce7792bbfbb1d522a8af0b 100644 --- a/Overlap/Tests/test_read_eddy.f90 +++ b/Overlap/Tests/test_read_eddy.f90 @@ -1,9 +1,5 @@ program test_read_eddy - ! Libraries: - use mpi_f08, only: mpi_init, mpi_finalize, MPI_Comm_rank, MPI_Comm_world, & - MPI_Comm_size, mpi_abort - use derived_types, only: eddy, shpc use read_eddy_m, only: read_eddy use shpc_close_m, only: shpc_close @@ -14,20 +10,11 @@ program test_read_eddy implicit none type(eddy) e - integer k, i, rank, n_proc + integer k, i TYPE(shpc) hshp !------------------------------------------------------------------------- - call mpi_init - call MPI_Comm_rank(MPI_Comm_world, rank) - call mpi_comm_size(mpi_comm_world, n_proc) - - if (n_proc /= 1) then - if (rank == 0) print *, "test_read_eddy: 1 process only" - call mpi_abort(MPI_Comm_world, errorcode = 1) - end if - call shpc_open(hshp, "SHPC_old", rank = 0) call read_eddy(e, k, i, hshp, ishape = 0) CALL shpc_close(hshp) @@ -36,6 +23,5 @@ program test_read_eddy call write_eddy(e, hshp, k, i) CALL shpc_close(hshp) print *, 'Created shapefiles in SHPC.' - call mpi_finalize end program test_read_eddy