Changeset 14064 for NEMO/trunk/src/NST/agrif_oce_update.F90

Timestamp:

2020-12-03T18:01:12+01:00 (3 years ago)

Author:

ayoung

Message:

Merging ticket #2506 into trunk.

File:

• NEMO/trunk/src/NST/agrif_oce_update.F90 (modified) (6 diffs)

NEMO/trunk/src/NST/agrif_oce_update.F90

@@ -915 +915 @@
       REAL(wp), DIMENSION(i1:i2,j1:j2), INTENT(inout) ::   tabres
       LOGICAL                         , INTENT(in   ) ::   before
+      !!
+      REAL(wp), DIMENSION(jpi,jpj) ::   zpgu   ! 2D workspace
       !! 
       INTEGER  :: ji, jj, jk
@@ -934 +936 @@
                !    
                ! Update "now" 3d velocities:
-               spgu(ji,jj) = 0._wp
+               zpgu(ji,jj) = 0._wp
                DO jk=1,jpkm1
-                  spgu(ji,jj) = spgu(ji,jj) + e3u(ji,jj,jk,Kmm_a) * uu(ji,jj,jk,Kmm_a)
+                  zpgu(ji,jj) = zpgu(ji,jj) + e3u(ji,jj,jk,Kmm_a) * uu(ji,jj,jk,Kmm_a)
                END DO
                !
-               zcorr = (tabres(ji,jj) - spgu(ji,jj)) * r1_hu(ji,jj,Kmm_a)
+               zcorr = (tabres(ji,jj) - zpgu(ji,jj)) * r1_hu(ji,jj,Kmm_a)
                DO jk=1,jpkm1              
                   uu(ji,jj,jk,Kmm_a) = uu(ji,jj,jk,Kmm_a) + zcorr * umask(ji,jj,jk)           
@@ -954 +956 @@
                !       
                ! Correct "before" velocities to hold correct bt component:
-               spgu(ji,jj) = 0.e0
+               zpgu(ji,jj) = 0.e0
                DO jk=1,jpkm1
-                  spgu(ji,jj) = spgu(ji,jj) + e3u(ji,jj,jk,Kbb_a) * uu(ji,jj,jk,Kbb_a)
+                  zpgu(ji,jj) = zpgu(ji,jj) + e3u(ji,jj,jk,Kbb_a) * uu(ji,jj,jk,Kbb_a)
                END DO
                !
-               zcorr = uu_b(ji,jj,Kbb_a) - spgu(ji,jj) * r1_hu(ji,jj,Kbb_a)
+               zcorr = uu_b(ji,jj,Kbb_a) - zpgu(ji,jj) * r1_hu(ji,jj,Kbb_a)
                DO jk=1,jpkm1              
                   uu(ji,jj,jk,Kbb_a) = uu(ji,jj,jk,Kbb_a) + zcorr * umask(ji,jj,jk)           
@@ -982 +984 @@
       REAL(wp), DIMENSION(i1:i2,j1:j2), INTENT(inout) ::   tabres
       LOGICAL                         , INTENT(in   ) ::   before
+      !
+      REAL(wp), DIMENSION(jpi,jpj) ::   zpgv   ! 2D workspace
       ! 
       INTEGER  :: ji, jj, jk
@@ -1000 +1004 @@
                !    
                ! Update "now" 3d velocities:
-               spgv(ji,jj) = 0.e0
+               zpgv(ji,jj) = 0.e0
                DO jk=1,jpkm1
-                  spgv(ji,jj) = spgv(ji,jj) + e3v(ji,jj,jk,Kmm_a) * vv(ji,jj,jk,Kmm_a)
+                  zpgv(ji,jj) = zpgv(ji,jj) + e3v(ji,jj,jk,Kmm_a) * vv(ji,jj,jk,Kmm_a)
                END DO
                !
-               zcorr = (tabres(ji,jj) - spgv(ji,jj)) * r1_hv(ji,jj,Kmm_a)
+               zcorr = (tabres(ji,jj) - zpgv(ji,jj)) * r1_hv(ji,jj,Kmm_a)
                DO jk=1,jpkm1              
                   vv(ji,jj,jk,Kmm_a) = vv(ji,jj,jk,Kmm_a) + zcorr * vmask(ji,jj,jk)           
@@ -1020 +1024 @@
                !       
                ! Correct "before" velocities to hold correct bt component:
-               spgv(ji,jj) = 0.e0
+               zpgv(ji,jj) = 0.e0
                DO jk=1,jpkm1
-                  spgv(ji,jj) = spgv(ji,jj) + e3v(ji,jj,jk,Kbb_a) * vv(ji,jj,jk,Kbb_a)
+                  zpgv(ji,jj) = zpgv(ji,jj) + e3v(ji,jj,jk,Kbb_a) * vv(ji,jj,jk,Kbb_a)
                END DO
                !
-               zcorr = vv_b(ji,jj,Kbb_a) - spgv(ji,jj) * r1_hv(ji,jj,Kbb_a)
+               zcorr = vv_b(ji,jj,Kbb_a) - zpgv(ji,jj) * r1_hv(ji,jj,Kbb_a)
                DO jk=1,jpkm1              
                   vv(ji,jj,jk,Kbb_a) = vv(ji,jj,jk,Kbb_a) + zcorr * vmask(ji,jj,jk)