Changeset 15627 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/stprk3_stg.F90

Timestamp:

2022-01-04T19:30:17+01:00 (3 years ago)

Author:

techene

Message:

#2605 qco r3. ratios management optimised (RK3) and some cleanning (MLF)

File:

• NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/stprk3_stg.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/stprk3_stg.F90

@@ -49 +49 @@
    REAL(wp) ::   r2_3 = 2._wp / 3._wp
 
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ssha         ! sea-surface height  at N+1
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ua_b, va_b   ! barotropic velocity at N+1
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ssha                    ! sea-surface height  at N+1
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   r3ta, r3ua, r3va, r3fa, r3fb   ! ssh/h_0 ratio at t,u,v-column
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ua_b, va_b              ! barotropic velocity at N+1
 
    !! * Substitutions
@@ -120 +121 @@
          vv_b(:,:,Kaa) = r2_3 * vv_b(:,:,Kbb) + r1_3 * va_b(:,:)
          !
+         !
+         !                     !==  ssh/h0 ratio at Kaa  ==! 
+         !
+         IF( .NOT.lk_linssh ) THEN     ! "after" ssh/h_0 ratio at t,u,v-column
+            !
+            ALLOCATE( r3ta(jpi,jpj) , r3ua(jpi,jpj) , r3va(jpi,jpj) , r3fa(jpi,jpj) , r3fb(jpi,jpj) )
+            !
+            r3fb(:,:) = r3f(:,:)       !!st dirty fix check with gm
+            CALL dom_qco_r3c_RK3( ssha, r3ta, r3ua, r3va, r3fa )
+            !
+            CALL lbc_lnk( 'stprk3_stg', r3ua, 'U', 1._wp, r3va, 'V', 1._wp, r3fa, 'F', 1._wp )
+            !
+            r3t(:,:,Kaa) = r2_3 * r3t(:,:,Kbb) + r1_3 * r3ta(:,:)
+            r3u(:,:,Kaa) = r2_3 * r3u(:,:,Kbb) + r1_3 * r3ua(:,:)
+            r3v(:,:,Kaa) = r2_3 * r3v(:,:,Kbb) + r1_3 * r3va(:,:)
+            r3f(:,:) = r2_3 * r3fb(:,:) + r1_3 * r3fa(:,:)
+         ENDIF
+         !
          !                 !---------------!
       CASE ( 2 )           !==  Stage 2  ==!   Kbb = N   ;   Kmm = N+1/3   ;   Kaa = N+1/2
@@ -132 +151 @@
          vv_b(:,:,Kaa) = r1_2 * ( vv_b(:,:,Kbb) + va_b(:,:) )
          !
+         IF( .NOT.lk_linssh ) THEN
+            r3t(:,:,Kaa) = r1_2 * ( r3t(:,:,Kbb) + r3ta(:,:) )
+            r3u(:,:,Kaa) = r1_2 * ( r3u(:,:,Kbb) + r3ua(:,:) )
+            r3v(:,:,Kaa) = r1_2 * ( r3v(:,:,Kbb) + r3va(:,:) )
+            r3f(:,:) = r1_2 * ( r3fb(:,:) + r3fa(:,:) )
+         ENDIF
+         !
          !                 !---------------!
       CASE ( 3 )           !==  Stage 3  ==!   Kbb = N   ;   Kmm = N+1/2   ;   Kaa = N+1
@@ -145 +171 @@
          DEALLOCATE( ssha , ua_b , va_b )
          !
+         IF( .NOT.lk_linssh ) THEN
+            r3t(:,:,Kaa) = r3ta(:,:)
+            r3u(:,:,Kaa) = r3ua(:,:)
+            r3v(:,:,Kaa) = r3va(:,:)
+            r3f(:,:    ) = r3fa(:,:)
+            DEALLOCATE( r3ta, r3ua, r3va, r3fa, r3fb )
+            !
+         ENDIF
+         !
       END SELECT
-      !
-      !                     !==  ssh/h0 ratio at Kaa  ==! 
-      !
-      IF( .NOT.lk_linssh )   CALL dom_qco_r3c( ssh(:,:,Kaa), r3t(:,:,Kaa), r3u(:,:,Kaa), r3v(:,:,Kaa), r3f(:,:) )   ! "after" ssh/h_0 ratio at t,u,v-column
-!!      SELECT CASE( kstg )
-         !
-!!      CASE ( 3 )
-         !!st required at each stage for div hor loops
-         CALL lbc_lnk( 'stprk3_stg', r3u(:,:,Kaa), 'U', 1._wp, r3v(:,:,Kaa), 'V', 1._wp, r3f(:,:), 'F', 1._wp )
-         !
-!!      END SELECT
       !
       !