Changeset 15630 for NEMO/branches/2021

Timestamp:

2022-01-05T19:02:55+01:00 (2 years ago)

Author:

techene

Message:

#2605 correct r3f bug in RK3

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

@@ -128 +128 @@
             ALLOCATE( r3ta(jpi,jpj) , r3ua(jpi,jpj) , r3va(jpi,jpj) , r3fa(jpi,jpj) , r3fb(jpi,jpj) )
             !
-            r3fb(:,:) = r3f(:,:)       !!st dirty fix check with gm
+            r3fb(:,:) = r3f(:,:)
             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(:,:)
+            r3t(:,:,Kaa) = r2_3 * r3t(:,:,Kbb) + r1_3 * r3ta(:,:)   ! at N+1/3 (Kaa)
             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(:,:)
+            ! r3f = r3f(Kbb=Kmm)                                    ! at N     (Kmm)
          ENDIF
          !
@@ -152 +152 @@
          !
          IF( .NOT.lk_linssh ) THEN
-            r3t(:,:,Kaa) = r1_2 * ( r3t(:,:,Kbb) + r3ta(:,:) )
+            r3t(:,:,Kaa) = r1_2 * ( r3t(:,:,Kbb) + r3ta(:,:) )   ! at N+1/2 (Kaa)
             r3u(:,:,Kaa) = r1_2 * ( r3u(:,:,Kbb) + r3ua(:,:) )
             r3v(:,:,Kaa) = r1_2 * ( r3v(:,:,Kbb) + r3va(:,:) )
-            r3f(:,:) = r1_2 * ( r3fb(:,:) + r3fa(:,:) )
+            r3f(:,:)     = r2_3 * r3fb(:,:) + r1_3 * r3fa(:,:)   ! at N+1/3 (Kmm)
          ENDIF
          !
@@ -172 +172 @@
          !
          IF( .NOT.lk_linssh ) THEN
-            r3t(:,:,Kaa) = r3ta(:,:)
+            r3t(:,:,Kaa) = r3ta(:,:)                          ! at N+1   (Kaa)
             r3u(:,:,Kaa) = r3ua(:,:)
             r3v(:,:,Kaa) = r3va(:,:)
-            r3f(:,:    ) = r3fa(:,:)
-            DEALLOCATE( r3ta, r3ua, r3va, r3fa, r3fb )
+            r3f(:,:)     = r1_2 * ( r3fb(:,:) + r3fa(:,:) )   ! at N+1/2 (Kmm)
+            DEALLOCATE( r3ta, r3ua, r3va, r3fb )              ! deallocate all r3. except r3fa which will be
+            !                                                 ! saved in r3f at the end of the time integration and then deallocated
             !
          ENDIF
@@ -419 +420 @@
          IF( ln_zdfnpc  )   CALL tra_npc( kstp,      Kmm, Krhs, ts    , Kaa  )  ! update after fields by non-penetrative convection
          !
+         r3f(:,:) = r3fa(:,:)                                         ! save r3fa in r3f before deallocation
+         DEALLOCATE( r3fa )                                           ! (r3f = r3f(Kbb) of the next time step) 
+         !
       END SELECT      
       !                                         !==  correction of the barotropic (all stages)  ==!    at Kaa = N+1/3, N+1/2 or N+1