Changeset 14205 for NEMO/trunk/src/OCE/DYN/dynspg_ts.F90

Timestamp:

2020-12-17T19:23:48+01:00 (4 years ago)

Author:

techene

Message:

#2385 cosmetics and cleaning

File:

• NEMO/trunk/src/OCE/DYN/dynspg_ts.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/DYN/dynspg_ts.F90

@@ -162 +162 @@
       REAL(wp), DIMENSION(jpi,jpj) :: zCdU_u, zCdU_v   ! top/bottom stress at u- & v-points
       REAL(wp), DIMENSION(jpi,jpj) :: zhU, zhV         ! fluxes
-#if defined key_qco 
-      REAL(wp), DIMENSION(jpi, jpj, jpk) :: ze3u, ze3v
-#endif
+!!st#if defined key_qco 
+!!st      REAL(wp), DIMENSION(jpi, jpj, jpk) :: ze3u, ze3v
+!!st#endif
       !
       REAL(wp) ::   zwdramp                     ! local scalar - only used if ln_wd_dl = .True. 
@@ -232 +232 @@
       !                                   !  ---------------------------  !
 #if defined key_qco 
-      DO jk = 1 , jpk
-         ze3u(:,:,jk) = e3u(:,:,jk,Kmm)
-         ze3v(:,:,jk) = e3v(:,:,jk,Kmm)
-      END DO
-      !
-      zu_frc(:,:) = SUM( ze3u(:,:,:) * uu(:,:,:,Krhs) * umask(:,:,:) , DIM=3 ) * r1_hu(:,:,Kmm)
-      zv_frc(:,:) = SUM( ze3v(:,:,:) * vv(:,:,:,Krhs) * vmask(:,:,:) , DIM=3 ) * r1_hv(:,:,Kmm)
+!!st      DO jk = 1 , jpk
+!!st         ze3u(:,:,jk) = e3u(:,:,jk,Kmm)
+!!st         ze3v(:,:,jk) = e3v(:,:,jk,Kmm)
+!!st      END DO
+!!st      !
+!!st      zu_frc(:,:) = SUM( ze3u(:,:,:) * uu(:,:,:,Krhs) * umask(:,:,:) , DIM=3 ) * r1_hu(:,:,Kmm)
+!!st      zv_frc(:,:) = SUM( ze3v(:,:,:) * vv(:,:,:,Krhs) * vmask(:,:,:) , DIM=3 ) * r1_hv(:,:,Kmm)
+
+      zu_frc(:,:) = SUM( e3u_0(:,:,:) * uu(:,:,:,Krhs) * umask(:,:,:) , DIM=3 ) * r1_hu_0(:,:)
+      zv_frc(:,:) = SUM( e3v_0(:,:,:) * vv(:,:,:,Krhs) * vmask(:,:,:) , DIM=3 ) * r1_hv_0(:,:)
+      
 #else
       zu_frc(:,:) = SUM( e3u(:,:,:,Kmm) * uu(:,:,:,Krhs) * umask(:,:,:) , DIM=3 ) * r1_hu(:,:,Kmm)