Changeset 15564 for NEMO/releases

Timestamp:

2021-12-01T17:35:59+01:00 (3 years ago)

Author:

jchanut

Message:

#2751, fixes small constancy preservation issue with AGRIF

Location:

NEMO/releases/r4.0/r4.0-HEAD/src/NST

Files:

• agrif_oce_update.F90 (modified) (6 diffs)
• agrif_top_update.F90 (modified) (2 diffs)

NEMO/releases/r4.0/r4.0-HEAD/src/NST/agrif_oce_update.F90

@@ -404 +404 @@
       !!
       INTEGER :: ji,jj,jk,jn
-      REAL(wp) :: ztb, ztnu, ztno
+      REAL(wp) :: ze3b, ztb, ztnu, ztno
       !!---------------------------------------------
       !
@@ -434 +434 @@
                      DO ji = i1, i2
                         IF( tabres(ji,jj,jk,jn) /= 0._wp ) THEN
-                           ztb  = tsb(ji,jj,jk,jn) * e3t_b(ji,jj,jk) ! fse3t_b prior update should be used
+                           ze3b = e3t_b(ji,jj,jk) & ! Recover e3t_b before update
+                                & - rn_atfp * ( e3t_n(ji,jj,jk) - e3t_a(ji,jj,jk) )
+                           ztb  = tsb(ji,jj,jk,jn) * ze3b 
                            ztnu = tabres(ji,jj,jk,jn)
                            ztno = tsn(ji,jj,jk,jn) * e3t_a(ji,jj,jk)
@@ -573 +575 @@
       !
       INTEGER  :: ji, jj, jk
-      REAL(wp) :: zrhoy, zub, zunu, zuno
+      REAL(wp) :: zrhoy, ze3b, zub, zunu, zuno
       !!---------------------------------------------
       ! 
@@ -588 +590 @@
                   !
                   IF (.NOT.(lk_agrif_fstep.AND.(neuler==0))) THEN ! Add asselin part
-                     zub  = ub(ji,jj,jk) * e3u_b(ji,jj,jk)  ! fse3t_b prior update should be used
+                     ze3b = e3u_b(ji,jj,jk) & ! Recover e3u_b before update
+                          & - rn_atfp * ( e3u_n(ji,jj,jk) - e3u_a(ji,jj,jk) )
+                     zub  = ub(ji,jj,jk) * ze3b 
                      zuno = un(ji,jj,jk) * e3u_a(ji,jj,jk)
                      zunu = tabres(ji,jj,jk,1)
@@ -759 +763 @@
       !
       INTEGER  :: ji, jj, jk
-      REAL(wp) :: zrhox, zvb, zvnu, zvno
+      REAL(wp) :: zrhox, ze3b, zvb, zvnu, zvno
       !!---------------------------------------------      
       !
@@ -778 +782 @@
                   !
                   IF (.NOT.(lk_agrif_fstep.AND.(neuler==0))) THEN ! Add asselin part
-                     zvb  = vb(ji,jj,jk) * e3v_b(ji,jj,jk) ! fse3t_b prior update should be used
+                     ze3b = e3v_b(ji,jj,jk) & ! Recover e3v_b before update
+                          & - rn_atfp * ( e3v_n(ji,jj,jk) - e3v_a(ji,jj,jk) )
+                     zvb  = vb(ji,jj,jk) * ze3b 
                      zvno = vn(ji,jj,jk) * e3v_a(ji,jj,jk)
                      zvnu = tabres(ji,jj,jk,1)

NEMO/releases/r4.0/r4.0-HEAD/src/NST/agrif_top_update.F90

@@ -173 +173 @@
       !!
       INTEGER :: ji,jj,jk,jn
-      REAL(wp) :: ztb, ztnu, ztno
+      REAL(wp) :: ztb, ze3b, ztnu, ztno
       !!----------------------------------------------------------------------
       !
@@ -204 +204 @@
                      DO ji=i1,i2
                         IF( tabres(ji,jj,jk,jn) .NE. 0. ) THEN
-                           ztb  = trb(ji,jj,jk,jn) * e3t_b(ji,jj,jk) ! fse3t_b prior update should be used
+
+                           ze3b = e3t_b(ji,jj,jk) & ! Recover e3t_b before update
+                                & - rn_atfp * ( e3t_n(ji,jj,jk) - e3t_a(ji,jj,jk) )
+                           ztb  = trb(ji,jj,jk,jn) * ze3b 
                            ztnu = tabres(ji,jj,jk,jn)
                            ztno = trn(ji,jj,jk,jn) * e3t_a(ji,jj,jk)