From 58f7355f32d9c5b0e52df7a211688ae58925c2b3 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 4 Jan 2022 14:42:57 +0100
Subject: [PATCH] Replace references to `NR_util` by Jumble
Since `NR_util` has been integrated into Jumble.
---
CMakeLists.txt | 1 -
Common/read_eddy.f90 | 2 +-
Common/read_snapshot.f90 | 2 +-
Common/write_eddy.f90 | 2 +-
Inst_eddies/CMakeLists.txt | 3 +--
Inst_eddies/Tests/CMakeLists.txt | 22 +++++++++----------
Inst_eddies/Tests/test_get_1_outerm.f90 | 2 +-
Inst_eddies/Tests/test_good_contour.f90 | 2 +-
.../Tests/test_max_speed_contour_ssh.f90 | 2 +-
Inst_eddies/Tests/test_mean_speed.f90 | 2 +-
Inst_eddies/Tests/test_nearby_extr.f90 | 2 +-
Inst_eddies/Tests/test_set_all_outerm.f90 | 2 +-
Inst_eddies/Tests/test_set_max_speed.f90 | 2 +-
Inst_eddies/get_1_outerm.f90 | 2 +-
Inst_eddies/inst_eddies.f90 | 2 +-
Inst_eddies/local_extrema.f90 | 2 +-
Inst_eddies/mean_speed.f90 | 2 +-
Inst_eddies/set_all_outerm.f90 | 2 +-
Overlap/CMakeLists.txt | 2 +-
Overlap/Tests/CMakeLists.txt | 17 +++++++-------
Overlap/Tests/test_get_dispatch_snap.f90 | 4 ++--
Overlap/Tests/test_overlap.f90 | 2 +-
Overlap/Tests/test_read_snapshot.f90 | 2 +-
Overlap/Tests/test_send_recv.f90 | 2 +-
Overlap/Tests/test_spher_polygon_area.f90 | 2 +-
Overlap/Tests/test_weight.f90 | 2 +-
Overlap/Tests/write_snapshot.f90 | 2 +-
Overlap/eddy_graph.f90 | 2 +-
Overlap/overlap.f90 | 2 +-
Overlap/weight.f90 | 2 +-
Tests/CMakeLists.txt | 2 +-
Tests/test_spher_polyline_area.f90 | 2 +-
32 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 213e5411..dbb79a53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,6 @@ find_package(NetCDF_Fortran REQUIRED)
find_package(MPI)
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
- find_package(NR_util REQUIRED CONFIG)
find_package(Jumble REQUIRED CONFIG)
find_package(NetCDF95 REQUIRED CONFIG)
find_package(Contour_531 REQUIRED CONFIG)
diff --git a/Common/read_eddy.f90 b/Common/read_eddy.f90
index 25c7777c..1816f9ad 100644
--- a/Common/read_eddy.f90
+++ b/Common/read_eddy.f90
@@ -12,7 +12,7 @@ contains
! Libraries:
use contour_531, only: null_polyline
use gpc_f, only: shpobj2pol, polygon
- use nr_util, only: deg_to_rad, pi
+ use jumble, only: deg_to_rad, pi
use shapelib, only: shpobject, shpdestroyobject
use shapelib_03, only: shp_read_object_03, dbf_read_attribute_03
diff --git a/Common/read_snapshot.f90 b/Common/read_snapshot.f90
index 2bfb033a..85a38770 100644
--- a/Common/read_snapshot.f90
+++ b/Common/read_snapshot.f90
@@ -8,7 +8,7 @@ contains
! Libraries:
use contour_531, only: convert_to_ind
- use nr_util, only: assert
+ use jumble, only: assert
use derived_types, only: snapshot, eddy, shpc
use read_eddy_m, only: read_eddy
diff --git a/Common/write_eddy.f90 b/Common/write_eddy.f90
index aa4263a7..39a8e6d6 100644
--- a/Common/write_eddy.f90
+++ b/Common/write_eddy.f90
@@ -9,7 +9,7 @@ contains
use, intrinsic:: ieee_arithmetic, only: ieee_is_nan
! Libraries:
- use nr_util, only: pi, rad_to_deg, assert
+ use jumble, only: pi, rad_to_deg, assert
use shapelib, only: shpt_polygon
use shapelib_03, only: shp_append_point_03, dbf_write_attribute_03, &
shp_append_object_03, shp_append_null_03
diff --git a/Inst_eddies/CMakeLists.txt b/Inst_eddies/CMakeLists.txt
index 313cd8af..ca846def 100644
--- a/Inst_eddies/CMakeLists.txt
+++ b/Inst_eddies/CMakeLists.txt
@@ -12,8 +12,7 @@ add_executable(inst_eddies inst_eddies.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 NR_util::nr_util Jumble::jumble
- NetCDF_Fortran::netcdff)
+ 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
diff --git a/Inst_eddies/Tests/CMakeLists.txt b/Inst_eddies/Tests/CMakeLists.txt
index 98e9b65e..b30bc556 100644
--- a/Inst_eddies/Tests/CMakeLists.txt
+++ b/Inst_eddies/Tests/CMakeLists.txt
@@ -8,8 +8,8 @@ add_executable(test_get_1_outerm good_contour.f90
${PROJECT_SOURCE_DIR}/Common/write_eddy.f90
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
-target_link_libraries(test_get_1_outerm Geometry::geometry NetCDF95::netcdf95
- Shapelib_03::shapelib_03 Contour_531::contour_531 NR_util::nr_util
+target_link_libraries(test_get_1_outerm Geometry::geometry
+ NetCDF95::netcdf95 Shapelib_03::shapelib_03 Contour_531::contour_531
Jumble::jumble NetCDF_Fortran::netcdff)
# test_set_all_outerm
@@ -24,8 +24,8 @@ add_executable(test_set_all_outerm
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
target_link_libraries(test_set_all_outerm PRIVATE Geometry::geometry
- NetCDF95::netcdf95 Numer_Rec_95::numer_rec_95 Shapelib_03::shapelib_03
- Contour_531::contour_531 Jumble::jumble NR_util::nr_util
+ NetCDF95::netcdf95 Numer_Rec_95::numer_rec_95
+ Shapelib_03::shapelib_03 Contour_531::contour_531 Jumble::jumble
NetCDF_Fortran::netcdff)
# test_good_contour
@@ -35,7 +35,7 @@ add_executable(test_good_contour good_contour.f90
target_link_libraries(test_good_contour PRIVATE Geometry::geometry
NetCDF95::netcdf95 Shapelib_03::shapelib_03 Contour_531::contour_531
- Jumble::jumble NR_util::nr_util NetCDF_Fortran::netcdff)
+ Jumble::jumble NetCDF_Fortran::netcdff)
# test_inside_4
@@ -52,7 +52,7 @@ add_executable(test_mean_speed mean_speed.f90
target_link_libraries(test_mean_speed Numer_Rec_95::numer_rec_95
NetCDF95::netcdf95 Shapelib_03::shapelib_03 Contour_531::contour_531
- NR_util::nr_util NetCDF_Fortran::netcdff gpc_f Jumble::jumble)
+ NetCDF_Fortran::netcdff gpc_f Jumble::jumble)
# test_max_speed_contour_ssh
@@ -63,7 +63,7 @@ add_executable(test_max_speed_contour_ssh
target_link_libraries(test_max_speed_contour_ssh PRIVATE
fortrangis::fortranGIS NetCDF95::netcdf95 Contour_531::contour_531
- Jumble::jumble NR_util::nr_util NetCDF_Fortran::netcdff)
+ Jumble::jumble NetCDF_Fortran::netcdff)
# test_nearby_extr
@@ -77,7 +77,7 @@ add_executable(test_nearby_extr nearby_extr.f90
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
target_link_libraries(test_nearby_extr Shapelib_03::shapelib_03
- Contour_531::contour_531 Jumble::jumble NR_util::nr_util gpc_f)
+ Contour_531::contour_531 Jumble::jumble gpc_f)
# test_local_extrema
@@ -85,7 +85,7 @@ add_executable(test_local_extrema local_extrema.f90
${CMAKE_CURRENT_LIST_DIR}/test_local_extrema.f90
${PROJECT_SOURCE_DIR}/Tests/write_extr_map.f90)
-target_link_libraries(test_local_extrema NetCDF95::netcdf95 NR_util::nr_util
+target_link_libraries(test_local_extrema NetCDF95::netcdf95
Jumble::jumble NetCDF_Fortran::netcdff)
# test_set_max_speed
@@ -103,8 +103,8 @@ add_executable(test_set_max_speed
${PROJECT_SOURCE_DIR}/Common/write_eddy.f90 get_var.f90)
target_link_libraries(test_set_max_speed Geometry::geometry
- Numer_Rec_95::numer_rec_95 NetCDF95::netcdf95 Shapelib_03::shapelib_03
- Contour_531::contour_531 Jumble::jumble NR_util::nr_util
+ Numer_Rec_95::numer_rec_95 NetCDF95::netcdf95
+ Shapelib_03::shapelib_03 Contour_531::contour_531 Jumble::jumble
NetCDF_Fortran::netcdff gpc_f)
foreach(my_target IN ITEMS test_get_1_outerm test_set_all_outerm
diff --git a/Inst_eddies/Tests/test_get_1_outerm.f90 b/Inst_eddies/Tests/test_get_1_outerm.f90
index a0a4296e..201a3541 100644
--- a/Inst_eddies/Tests/test_get_1_outerm.f90
+++ b/Inst_eddies/Tests/test_get_1_outerm.f90
@@ -7,7 +7,7 @@ program test_get_1_outerm
use netcdf, only: nf90_nowrite
use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, nf95_get_var, &
nf95_gw_var
- use nr_util, only: deg_to_rad
+ use jumble, only: deg_to_rad
use derived_types, only: eddy, shpc, null_ssh_contour, missing_speed
use get_1_outerm_m, only: get_1_outerm
diff --git a/Inst_eddies/Tests/test_good_contour.f90 b/Inst_eddies/Tests/test_good_contour.f90
index 0805d353..1fb64f3e 100644
--- a/Inst_eddies/Tests/test_good_contour.f90
+++ b/Inst_eddies/Tests/test_good_contour.f90
@@ -6,7 +6,7 @@ program test_good_contour
use netcdf, only: nf90_nowrite
use netcdf95, only: nf95_open, nf95_inquire_dimension, nf95_get_var, &
nf95_inq_varid, nf95_close, nf95_inquire_variable
- use nr_util, only: assert
+ use jumble, only: assert
use shapelib, only: shpt_polygon, shpfileobject, ftdouble, shpclose
use shapelib_03, only: shp_create_03, dbf_add_field_03, &
shp_append_object_03, dbf_write_attribute_03
diff --git a/Inst_eddies/Tests/test_max_speed_contour_ssh.f90 b/Inst_eddies/Tests/test_max_speed_contour_ssh.f90
index f3d49841..e641e2bd 100644
--- a/Inst_eddies/Tests/test_max_speed_contour_ssh.f90
+++ b/Inst_eddies/Tests/test_max_speed_contour_ssh.f90
@@ -7,7 +7,7 @@ program test_max_speed_contour_ssh
use jumble, only: get_command_arg_dyn
use netcdf, only: nf90_nowrite
use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, nf95_gw_var
- use nr_util, only: assert
+ use jumble, only: assert
use get_var_m, only: get_var
use max_speed_contour_ssh_m, only: max_speed_contour_ssh
diff --git a/Inst_eddies/Tests/test_mean_speed.f90 b/Inst_eddies/Tests/test_mean_speed.f90
index 1a4e1034..ca9cc54a 100644
--- a/Inst_eddies/Tests/test_mean_speed.f90
+++ b/Inst_eddies/Tests/test_mean_speed.f90
@@ -8,7 +8,7 @@ program test_mean_speed
use netcdf, only: nf90_nowrite
use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, nf95_get_var, &
find_coord, nf95_inquire_dimension
- use nr_util, only: deg_to_rad, assert
+ use jumble, only: deg_to_rad, assert
use shapelib, only: shpclose, shpfileobject, shpobject, shpdestroyobject
use shapelib_03, only: shp_open_03, shp_read_object_03
diff --git a/Inst_eddies/Tests/test_nearby_extr.f90 b/Inst_eddies/Tests/test_nearby_extr.f90
index bcafa9a7..705b8b01 100644
--- a/Inst_eddies/Tests/test_nearby_extr.f90
+++ b/Inst_eddies/Tests/test_nearby_extr.f90
@@ -2,7 +2,7 @@ program test_nearby_extr
! Libraries:
use jumble, only: get_command_arg_dyn, new_unit
- use nr_util, only: deg_to_rad, rad_to_deg
+ use jumble, only: deg_to_rad, rad_to_deg
use shapelib_03, only: dbf_read_attribute_03
use derived_types, only: snapshot, shpc
diff --git a/Inst_eddies/Tests/test_set_all_outerm.f90 b/Inst_eddies/Tests/test_set_all_outerm.f90
index dcb4be66..78dbc9f9 100644
--- a/Inst_eddies/Tests/test_set_all_outerm.f90
+++ b/Inst_eddies/Tests/test_set_all_outerm.f90
@@ -7,7 +7,7 @@ program test_set_all_outerm
use netcdf, only: nf90_nowrite
use netcdf95, only: nf95_open, nf95_close, nf95_get_var, find_coord, &
nf95_inquire_dimension
- use nr_util, only: pi, assert, deg_to_rad, twopi
+ use jumble, only: pi, assert, deg_to_rad, twopi
use config_m, only: config, max_radius_deg, min_radius
use derived_types, only: snapshot, shpc, null_ssh_contour, missing_speed
diff --git a/Inst_eddies/Tests/test_set_max_speed.f90 b/Inst_eddies/Tests/test_set_max_speed.f90
index 462c2aba..ac495be0 100644
--- a/Inst_eddies/Tests/test_set_max_speed.f90
+++ b/Inst_eddies/Tests/test_set_max_speed.f90
@@ -9,7 +9,7 @@ program test_set_max_speed
use netcdf, only: nf90_nowrite
use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, nf95_get_var, &
find_coord, nf95_inquire_dimension
- use nr_util, only: deg_to_rad
+ use jumble, only: deg_to_rad
use derived_types, only: eddy, shpc
use get_var_m, only: get_var
diff --git a/Inst_eddies/get_1_outerm.f90 b/Inst_eddies/get_1_outerm.f90
index 01657288..d4d2e2de 100644
--- a/Inst_eddies/get_1_outerm.f90
+++ b/Inst_eddies/get_1_outerm.f90
@@ -24,7 +24,7 @@ contains
! Libraries:
use contour_531, only: polyline
- use nr_util, only: assert
+ use jumble, only: assert
use derived_types, only: ssh_contour, missing_ssh
use good_contour_m, only: good_contour
diff --git a/Inst_eddies/inst_eddies.f90 b/Inst_eddies/inst_eddies.f90
index 8436142c..d38d183e 100644
--- a/Inst_eddies/inst_eddies.f90
+++ b/Inst_eddies/inst_eddies.f90
@@ -8,7 +8,7 @@ program inst_eddies
use netcdf, only: nf90_nowrite
use netcdf95, only: nf95_open, find_coord, nf95_inquire_dimension, &
nf95_get_var, nf95_close
- use nr_util, only: assert, deg_to_rad, twopi, pi
+ use jumble, only: assert, deg_to_rad, twopi, pi
use config_m, only: config, max_radius_deg, min_radius
use derived_types, only: snapshot, null_ssh_contour, missing_speed, shpc
diff --git a/Inst_eddies/local_extrema.f90 b/Inst_eddies/local_extrema.f90
index c0fc4b79..78e98a55 100644
--- a/Inst_eddies/local_extrema.f90
+++ b/Inst_eddies/local_extrema.f90
@@ -20,7 +20,7 @@ contains
! Note that no coordinate grid is used here so there is no
! assumption on the grid underlying "field".
- use nr_util, only: assert_eq
+ use jumble, only: assert_eq
integer, intent(out):: extr_map(:, :) ! (m, n) Map of
! identification numbers of extrema. Identification numbers are
diff --git a/Inst_eddies/mean_speed.f90 b/Inst_eddies/mean_speed.f90
index 6fb0c441..34534060 100644
--- a/Inst_eddies/mean_speed.f90
+++ b/Inst_eddies/mean_speed.f90
@@ -16,7 +16,7 @@ contains
! Libraries:
use contour_531, only: polyline
use numer_rec_95, only: bilinear_interp2_reg
- use nr_util, only: assert
+ use jumble, only: assert
real, intent(in):: u(:, :), v(:, :) ! velocity
type(polyline), intent(in):: p ! should be closed
diff --git a/Inst_eddies/set_all_outerm.f90 b/Inst_eddies/set_all_outerm.f90
index 05bf0bae..fcb89c89 100644
--- a/Inst_eddies/set_all_outerm.f90
+++ b/Inst_eddies/set_all_outerm.f90
@@ -14,7 +14,7 @@ contains
! Libraries:
use jumble, only: argwhere
use numer_rec_95, only: indexx
- use nr_util, only: twopi
+ use jumble, only: twopi
use config_m, only: min_amp
use derived_types, only: snapshot
diff --git a/Overlap/CMakeLists.txt b/Overlap/CMakeLists.txt
index daf26374..a29bbddf 100644
--- a/Overlap/CMakeLists.txt
+++ b/Overlap/CMakeLists.txt
@@ -16,7 +16,7 @@ add_executable(eddy_graph eddy_graph.f90
target_link_libraries(eddy_graph PRIVATE EZMPI::ezmpi Jumble::jumble
Shapelib_03::shapelib_03 Contour_531::contour_531 gpc_f Geometry::geometry
- NR_util::nr_util MPI::MPI_Fortran)
+ 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
diff --git a/Overlap/Tests/CMakeLists.txt b/Overlap/Tests/CMakeLists.txt
index 18b80e5d..e01ed6c6 100644
--- a/Overlap/Tests/CMakeLists.txt
+++ b/Overlap/Tests/CMakeLists.txt
@@ -12,7 +12,7 @@ add_executable(test_overlap
${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 NR_util::nr_util Jumble::jumble)
+ Contour_531::contour_531 gpc_f Jumble::jumble)
# test_read_snapshot
@@ -31,7 +31,7 @@ add_executable(test_read_snapshot
target_link_libraries(test_read_snapshot NetCDF95::netcdf95
Shapelib_03::shapelib_03 Contour_531::contour_531 gpc_f
- NR_util::nr_util Jumble::jumble NetCDF_Fortran::netcdff)
+ Jumble::jumble NetCDF_Fortran::netcdff)
# test_spher_polygon_area
@@ -40,7 +40,7 @@ add_executable(test_spher_polygon_area spher_polygon_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 NR_util::nr_util)
+ Shapelib_03::shapelib_03 Jumble::jumble gpc_f)
# test_weight
@@ -49,7 +49,7 @@ add_executable(test_weight weight.f90
${CMAKE_CURRENT_LIST_DIR}/test_weight.f90)
target_link_libraries(test_weight PRIVATE fortrangis::fortranGIS
- Contour_531::contour_531 NR_util::nr_util)
+ Contour_531::contour_531 Jumble::jumble)
# test_read_eddy
@@ -64,7 +64,7 @@ add_executable(test_read_eddy
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
target_link_libraries(test_read_eddy Shapelib_03::shapelib_03
- Contour_531::contour_531 gpc_f NR_util::nr_util Jumble::jumble)
+ Contour_531::contour_531 gpc_f Jumble::jumble)
# test_send_recv
@@ -82,9 +82,8 @@ add_executable(test_send_recv
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
target_link_libraries(test_send_recv PRIVATE MPI::MPI_Fortran
- Shapelib_03::shapelib_03 EZMPI::ezmpi NR_util::nr_util
- Contour_531::contour_531 gpc_f NetCDF95::netcdf95 Jumble::jumble
- NetCDF_Fortran::netcdff)
+ Shapelib_03::shapelib_03 EZMPI::ezmpi Contour_531::contour_531 gpc_f
+ NetCDF95::netcdf95 Jumble::jumble NetCDF_Fortran::netcdff)
# test_get_dispatch_snap
@@ -104,4 +103,4 @@ add_executable(test_get_dispatch_snap
target_link_libraries(test_get_dispatch_snap Shapelib_03::shapelib_03
Jumble::jumble Contour_531::contour_531 EZMPI::ezmpi NetCDF95::netcdf95
- gpc_f NR_util::nr_util NetCDF_Fortran::netcdff MPI::MPI_Fortran)
+ gpc_f NetCDF_Fortran::netcdff MPI::MPI_Fortran)
diff --git a/Overlap/Tests/test_get_dispatch_snap.f90 b/Overlap/Tests/test_get_dispatch_snap.f90
index 6cba2a6c..6d5edb68 100644
--- a/Overlap/Tests/test_get_dispatch_snap.f90
+++ b/Overlap/Tests/test_get_dispatch_snap.f90
@@ -4,10 +4,10 @@ program test_get_dispatch_snap
! Libraries:
use ezmpi, only: ezmpi_bcast
- use jumble, only: get_command_arg_dyn, read_column, new_unit
+ use jumble, only: get_command_arg_dyn, read_column, new_unit, assert, &
+ deg_to_rad
use mpi_f08, only: mpi_init, mpi_finalize, MPI_Comm_rank, MPI_Comm_world, &
MPI_Comm_size, mpi_abort
- use nr_util, only: assert, deg_to_rad
use shapelib_03, only: dbf_read_attribute_03
use derived_types, only: snapshot, shpc
diff --git a/Overlap/Tests/test_overlap.f90 b/Overlap/Tests/test_overlap.f90
index 30dc2624..f5c8f8e4 100644
--- a/Overlap/Tests/test_overlap.f90
+++ b/Overlap/Tests/test_overlap.f90
@@ -4,7 +4,7 @@ program test_overlap
! Libraries:
use jumble, only: get_command_arg_dyn, read_column, new_unit, ediff1d
- use nr_util, only: deg_to_rad, assert
+ use jumble, only: deg_to_rad, assert
use shapelib_03, only: dbf_read_attribute_03
use derived_types, only: snapshot, shpc
diff --git a/Overlap/Tests/test_read_snapshot.f90 b/Overlap/Tests/test_read_snapshot.f90
index aba590bb..aabaccdc 100644
--- a/Overlap/Tests/test_read_snapshot.f90
+++ b/Overlap/Tests/test_read_snapshot.f90
@@ -4,7 +4,7 @@ program test_read_snapshot
! Libraries:
use jumble, only: get_command_arg_dyn, new_unit
- use nr_util, only: deg_to_rad, assert
+ use jumble, only: deg_to_rad, assert
use shapelib_03, only: dbf_read_attribute_03
use derived_types, only: snapshot, shpc
diff --git a/Overlap/Tests/test_send_recv.f90 b/Overlap/Tests/test_send_recv.f90
index 463e5e1a..e097f374 100644
--- a/Overlap/Tests/test_send_recv.f90
+++ b/Overlap/Tests/test_send_recv.f90
@@ -8,7 +8,7 @@ program test_send_recv
use mpi_f08, only: mpi_init, mpi_finalize, MPI_Comm_rank, MPI_Comm_world, &
MPI_Comm_size, mpi_abort, MPI_TAG_UB, MPI_Comm_get_attr, &
MPI_ADDRESS_KIND, MPI_io, MPI_ANY_SOURCE
- use nr_util, only: deg_to_rad, assert
+ use jumble, only: deg_to_rad, assert
use shapelib_03, only: dbf_read_attribute_03
use derived_types, only: snapshot, shpc
diff --git a/Overlap/Tests/test_spher_polygon_area.f90 b/Overlap/Tests/test_spher_polygon_area.f90
index c5b7735c..421b73ea 100644
--- a/Overlap/Tests/test_spher_polygon_area.f90
+++ b/Overlap/Tests/test_spher_polygon_area.f90
@@ -3,7 +3,7 @@ program test_spher_polygon_area
! Libraries:
use gpc_f, only: polygon, shpobj2pol
use jumble, only: get_command_arg_dyn
- use nr_util, only: deg_to_rad
+ use jumble, only: deg_to_rad
use shapelib, only: shpfileobject, shpobject, shpclose, shpdestroyobject
use shapelib_03, only: shp_open_03, shp_read_object_03, shp_get_info_03
diff --git a/Overlap/Tests/test_weight.f90 b/Overlap/Tests/test_weight.f90
index 1e8123ce..535c587b 100644
--- a/Overlap/Tests/test_weight.f90
+++ b/Overlap/Tests/test_weight.f90
@@ -1,7 +1,7 @@
program test_weight
! Libraries:
- use nr_util, only: pi, deg_to_rad
+ use jumble, only: pi, deg_to_rad
use derived_types, only: eddy
use weight_m, only: weight
diff --git a/Overlap/Tests/write_snapshot.f90 b/Overlap/Tests/write_snapshot.f90
index 6983a43c..9a7c1447 100644
--- a/Overlap/Tests/write_snapshot.f90
+++ b/Overlap/Tests/write_snapshot.f90
@@ -7,7 +7,7 @@ contains
subroutine write_snapshot(s, corner, step, nlon, nlat, copy, d)
! Libraries:
- use nr_util, only: arth
+ use jumble, only: arth
use derived_types, only: snapshot, shpc
use shpc_close_m, only: shpc_close
diff --git a/Overlap/eddy_graph.f90 b/Overlap/eddy_graph.f90
index ae8e04eb..9c6a2ecb 100644
--- a/Overlap/eddy_graph.f90
+++ b/Overlap/eddy_graph.f90
@@ -7,7 +7,7 @@ program eddy_graph
use jumble, only: get_command_arg_dyn, new_unit, ediff1d
use mpi_f08, only: mpi_init, mpi_finalize, MPI_Comm_rank, MPI_Comm_world, &
MPI_Comm_size
- use nr_util, only: assert, deg_to_rad
+ use jumble, only: assert, deg_to_rad
use derived_types, only: snapshot, shpc
use dispatch_snapshot_m, only: dispatch_snapshot
diff --git a/Overlap/overlap.f90 b/Overlap/overlap.f90
index f98a1d55..ab6334be 100644
--- a/Overlap/overlap.f90
+++ b/Overlap/overlap.f90
@@ -15,7 +15,7 @@ contains
! Libraries:
use contour_531, only: polyline
use gpc_f, only: gpc_polygon_clip_f, GPC_INT, polygon
- use nr_util, only: twopi
+ use jumble, only: twopi
use candidate_overlap_m, only: candidate_overlap
use derived_types, only: snapshot
diff --git a/Overlap/weight.f90 b/Overlap/weight.f90
index 90daf23e..213f8bf9 100644
--- a/Overlap/weight.f90
+++ b/Overlap/weight.f90
@@ -29,7 +29,7 @@ contains
! a quiet NaN, and then the result is a quiet NaN.
use derived_types, only: eddy
- use nr_util, only: pi, twopi
+ use jumble, only: pi, twopi
type(eddy), intent(in):: e
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d5cd1853..d6fbe5ba 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3,4 +3,4 @@ add_executable(test_spher_polyline_area
${CMAKE_CURRENT_LIST_DIR}/test_spher_polyline_area.f90)
target_link_libraries(test_spher_polyline_area Geometry::geometry
- Contour_531::contour_531 NR_util::nr_util)
+ Contour_531::contour_531 Jumble::jumble)
diff --git a/Tests/test_spher_polyline_area.f90 b/Tests/test_spher_polyline_area.f90
index 16a2a9d6..1ef0ebfa 100644
--- a/Tests/test_spher_polyline_area.f90
+++ b/Tests/test_spher_polyline_area.f90
@@ -2,7 +2,7 @@ program test_spher_polyline_area
! Libraries:
use contour_531, only: polyline
- use nr_util, only: deg_to_rad
+ use jumble, only: deg_to_rad
use spher_polyline_area_m, only: spher_polyline_area
--
GitLab