From 976ee4a7a83f630964331ca8e74fe44244c91b8a Mon Sep 17 00:00:00 2001
From: Tomas Lovato <tomas.lovato@cmcc.it>
Date: Wed, 3 May 2023 16:23:14 +0200
Subject: [PATCH] code clean up following manual revision of fortran macros
---
src/OCE/ZDF/zdfosm.F90 | 4 ++--
src/TOP/PISCES/P2Z/p2zsed.F90 | 2 --
src/TOP/TRP/trdmxl_trc.F90 | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/OCE/ZDF/zdfosm.F90 b/src/OCE/ZDF/zdfosm.F90
index 73d7f202..d1ede9a2 100644
--- a/src/OCE/ZDF/zdfosm.F90
+++ b/src/OCE/ZDF/zdfosm.F90
@@ -28,11 +28,11 @@ MODULE zdfosm
!! 28/09/2017 (15) Calculation of Stokes drift moved into separate do-loops to allow for different options for the determining the Stokes drift to be added.
!! (16) Calculation of Stokes drift from windspeed for PM spectrum (for testing, commented out)
!! (17) Modification to Langmuir velocity scale to include effects due to the Stokes penetration depth (for testing, commented out)
- !! ??/??/2018 (18) Revision to code structure, selected using key_osmldpth1. Inline code moved into subroutines. Changes to physics made,
+ !! ??/??/2018 (18) Revision to code structure, selected using fortran macro. Inline code moved into subroutines. Changes to physics made,
!! (a) Pycnocline temperature and salinity profies changed for unstable layers
!! (b) The stable OSBL depth parametrization changed.
!! 16/05/2019 (19) Fox-Kemper parametrization of restratification through mixed layer eddies added to revised code.
- !! 23/05/19 (20) Old code where key_osmldpth1` is *not* set removed, together with the key key_osmldpth1
+ !! 23/05/19 (20) Remove old code excluded by fortran macro along with the fortran macro that is not needed
!! 4.2 ! 2021-05 (S. Mueller) Efficiency improvements, source-code clarity enhancements, and adaptation to tiling
!!----------------------------------------------------------------------
diff --git a/src/TOP/PISCES/P2Z/p2zsed.F90 b/src/TOP/PISCES/P2Z/p2zsed.F90
index 66f24308..1b771554 100644
--- a/src/TOP/PISCES/P2Z/p2zsed.F90
+++ b/src/TOP/PISCES/P2Z/p2zsed.F90
@@ -55,8 +55,6 @@ CONTAINS
!! add this trend now to the general trend of tracer (ta,sa,tr(:,:,:,:,Krhs)):
!! tr(:,:,:,:,Krhs) = tr(:,:,:,:,Krhs) + dz(tr(:,:,:,:,Kmm) ww)
!!
- !! IF 'key_diabio' is defined, the now vertical advection
- !! trend of passive tracers is saved for futher diagnostics.
!!---------------------------------------------------------------------
INTEGER, INTENT( in ) :: kt ! ocean time-step index
INTEGER, INTENT( in ) :: Kmm, Krhs ! time level indices
diff --git a/src/TOP/TRP/trdmxl_trc.F90 b/src/TOP/TRP/trdmxl_trc.F90
index 59374e48..661fc3ce 100644
--- a/src/TOP/TRP/trdmxl_trc.F90
+++ b/src/TOP/TRP/trdmxl_trc.F90
@@ -5,7 +5,6 @@ MODULE trdmxl_trc
!!======================================================================
!! History : 9.0 ! 06-08 (C. Deltel) Original code (from trdmxl.F90)
!! ! 07-04 (C. Deltel) Bug fix : add trcrad trends
- !! ! 07-06 (C. Deltel) key_gyre : do not call lbc_lnk
!!----------------------------------------------------------------------
#if defined key_top && defined key_trdmxl_trc
!!----------------------------------------------------------------------
--
GitLab