From a446ee9af3c14735b3e0a4d05ed3e5eecd900bb0 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 26 Dec 2023 18:55:37 +0100
Subject: [PATCH] Downgrade `sort_ssh` from argument to local
Downgrade `sort_ssh` from argument of procedure `complete_ssh` to
local variable. `sort_ssh` is not used any longer in procedure
`set_max_speed` since commit 4a64f87d.
---
Inst_eddies/Tests/test_complete_ssh.f90 | 7 +------
Inst_eddies/complete_ssh.f90 | 10 ++++++----
Inst_eddies/set_max_speed.f90 | 6 +-----
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/Inst_eddies/Tests/test_complete_ssh.f90 b/Inst_eddies/Tests/test_complete_ssh.f90
index f72b9c65..76e6a98f 100644
--- a/Inst_eddies/Tests/test_complete_ssh.f90
+++ b/Inst_eddies/Tests/test_complete_ssh.f90
@@ -5,10 +5,6 @@ program test_complete_ssh
implicit none
integer, parameter:: n_max_cont = 31
-
- integer sort_ssh(n_max_cont)
- ! Sorts ssh_lev in ascending order.
-
real ssh_lev(n_max_cont)
integer n_cont
@@ -16,8 +12,7 @@ program test_complete_ssh
n_cont = 4
ssh_lev(:n_cont) = [7, 4, 2, 1]
- call complete_ssh(sort_ssh, ssh_lev, n_cont)
- print *, "sort_ssh = ", sort_ssh
+ call complete_ssh(ssh_lev, n_cont)
print *, "ssh_lev = ", ssh_lev
print *, "n_cont = ", n_cont
diff --git a/Inst_eddies/complete_ssh.f90 b/Inst_eddies/complete_ssh.f90
index ee4bc4bc..767127a2 100644
--- a/Inst_eddies/complete_ssh.f90
+++ b/Inst_eddies/complete_ssh.f90
@@ -4,16 +4,13 @@ module complete_ssh_m
contains
- subroutine complete_ssh(sort_ssh, ssh_lev, n_cont)
+ subroutine complete_ssh(ssh_lev, n_cont)
! This procedure completes the array ssh_lev by dividing the
! largest intervals between values of ssh_lev.
use jumble, only: ediff1d
- integer, intent(out):: sort_ssh(:) ! (n_max_cont)
- ! Sorts ssh_lev in ascending order.
-
real, intent(inout):: ssh_lev(:) ! (n_max_cont)
! Defined only for subscripts 1:n_cont.
@@ -22,6 +19,11 @@ contains
! <= n_max_cont.
! Local:
+
+ integer sort_ssh(size(ssh_lev)) ! (n_max_cont)
+ ! Sorts ssh_lev in ascending order. Defined only for subscripts
+ ! 1:n_cont.
+
real delta_ssh(size(ssh_lev) - 1) ! (n_max_cont - 1)
integer i
integer n_max_cont ! >= 3
diff --git a/Inst_eddies/set_max_speed.f90 b/Inst_eddies/set_max_speed.f90
index ca797c28..7335fa5b 100644
--- a/Inst_eddies/set_max_speed.f90
+++ b/Inst_eddies/set_max_speed.f90
@@ -72,14 +72,10 @@ contains
real, allocatable:: speed(:) ! (n_cont) speed on the contour
integer i, i_outer, ishape
- integer sort_ssh(size(cont_list)) ! (n_max_cont)
- ! Sorts cont_list%ssh in ascending order. Defined only for
- ! subscripts 1:n_cont.
-
!---------------------------------------------------------------
i_outer = n_cont
- if (n_cont >= 2) call complete_ssh(sort_ssh, cont_list%ssh, n_cont)
+ if (n_cont >= 2) call complete_ssh(cont_list%ssh, n_cont)
! Now find the contours associated to the new values of SSH:
do i = i_outer + 1, n_cont
--
GitLab