From 2eaff364ef8442b15ee0612ef8bd679a85ba58d8 Mon Sep 17 00:00:00 2001
From: Guillaume Samson <guillaume.samson@mercator-ocean.fr>
Date: Wed, 7 Sep 2022 13:01:50 +0000
Subject: [PATCH] Merge branch '75-offline-transport-not-working-with-linssh'
into 'branch_4.2'
---
src/OFF/dtadyn.F90 | 8 +++++---
src/OFF/nemogcm.F90 | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/OFF/dtadyn.F90 b/src/OFF/dtadyn.F90
index 4cffb4a0..ef9aa698 100644
--- a/src/OFF/dtadyn.F90
+++ b/src/OFF/dtadyn.F90
@@ -24,7 +24,7 @@ MODULE dtadyn
USE dom_oce ! ocean domain: variables
#if defined key_qco
USE domqco ! variable volume
-#else
+#elif ! defined key_linssh
USE domvvl
#endif
USE zdf_oce ! ocean vertical physics: variables
@@ -53,7 +53,7 @@ MODULE dtadyn
PUBLIC dta_dyn_init ! called by nemo_init
PUBLIC dta_dyn ! called by nemo_gcm
PUBLIC dta_dyn_atf ! called by nemo_gcm
-#if ! defined key_qco
+#if ! defined key_qco && ! defined key_linssh
PUBLIC dta_dyn_sf_interp ! called by nemo_gcm
#endif
#if defined key_sed_off
@@ -345,6 +345,7 @@ CONTAINS
CALL iom_close( inum ) ! close file
ENDIF
!
+#if ! defined key_linssh
#if defined key_qco
CALL dom_qco_r3c( ssh(:,:,Kbb), r3t(:,:,Kbb), r3u(:,:,Kbb), r3v(:,:,Kbb) )
CALL dom_qco_r3c( ssh(:,:,Kmm), r3t(:,:,Kmm), r3u(:,:,Kmm), r3v(:,:,Kmm) )
@@ -356,6 +357,7 @@ CONTAINS
CALL dta_dyn_sf_interp( nit000, Kmm )
CALL dta_dyn_sf_interp( nit000, Kbb )
+#endif
#endif
ENDIF
!
@@ -390,7 +392,7 @@ CONTAINS
END SUBROUTINE dta_dyn_atf
-#if ! defined key_qco
+#if ! defined key_qco && ! defined key_linssh
SUBROUTINE dta_dyn_sf_interp( kt, Kmm )
!!---------------------------------------------------------------------
diff --git a/src/OFF/nemogcm.F90 b/src/OFF/nemogcm.F90
index 73713236..5fa8c6dc 100644
--- a/src/OFF/nemogcm.F90
+++ b/src/OFF/nemogcm.F90
@@ -62,7 +62,7 @@ MODULE nemogcm
USE prtctl ! Print control (prt_ctl_init routine)
USE timing ! Timing
USE lib_fortran ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
-#if defined key_qco
+#if defined key_qco || defined key_linssh
USE stpmlf , ONLY : Nbb, Nnn, Naa, Nrhs ! time level indices
#else
USE step , ONLY : Nbb, Nnn, Naa, Nrhs ! time level indices
@@ -150,7 +150,7 @@ CONTAINS
Nnn = Naa
Naa = Nrhs
!
-# if ! defined key_qco
+# if ! defined key_qco && ! defined key_linssh
IF( .NOT.ln_linssh ) CALL dta_dyn_sf_interp( istp, Nnn ) ! calculate now grid parameters
# endif
--
GitLab