Changeset 15548 for NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/tests/DOME/MY_SRC/usrdef_zgr.F90

Timestamp:

2021-11-28T18:59:49+01:00 (3 years ago)

Author:

gsamson

Message:

update branch to the head of the trunk (r15547); ticket #2632

Location:

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

Files:

• . (modified) (1 prop)
• tests/DOME/MY_SRC/usrdef_zgr.F90 (modified) (2 diffs)

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/tests/DOME/MY_SRC/usrdef_zgr.F90

@@ -86 +86 @@
       ! at u/v/f-point: averaging zht
       zhu(:,:) = 600_wp ; zhv(:,:) = 600_wp ; zhf(:,:) = 600_wp
-      DO ji = 1, jpim1
-         zhu(ji,:) = 0.5_wp * ( zht(ji,:) + zht(ji+1,:) )
-      END DO
-      DO jj = 1, jpjm1
-         zhv(:,jj) = 0.5_wp * ( zht(:,jj) + zht(:,jj+1) )
-      END DO
-      DO jj = 1, jpjm1
-         DO ji = 1, jpim1
-            zhf(ji,jj) = 0.25_wp * (  zht(ji,jj  ) + zht(ji+1,jj  ) &
-                       &            + zht(ji,jj+1) + zht(ji+1,jj+1) ) 
-         END DO
-      END DO
+      DO_2D( 0, 0, 0, 0 )
+         zhu(ji,jj) =  0.5_wp * ( zht(ji,jj  ) + zht(ji+1,jj  ) )
+         zhv(jj,jj) =  0.5_wp * ( zht(ji,jj  ) + zht(ji  ,jj+1) )
+         zhf(ji,jj) = 0.25_wp * ( zht(ji,jj  ) + zht(ji+1,jj  ) &
+                       &        + zht(ji,jj+1) + zht(ji+1,jj+1) ) 
+      END_2D
       CALL lbc_lnk( 'usrdef_zgr', zhu, 'U', 1.0_wp, zhv, 'V', 1.0_wp, zhf, 'F', 1.0_wp)      
       !     
@@ -193 +187 @@
             pe3w (ji,jj,ik  ) = pdept(ji,jj,ik  ) - pdept(ji,jj,ik-1)            ! st caution ik > 1
          END_2D         
-         !                                   ! bottom scale factors and depth at  U-, V-, UW and VW-points
-         !                                   ! usually Computed as the minimum of neighbooring scale factors
-         pe3u (:,:,:) = pe3t(:,:,:)          ! HERE DOME configuration : 
-         pe3v (:,:,:) = pe3t(:,:,:)          !    e3 increases with i-index and identical with j-index
-         pe3f (:,:,:) = pe3t(:,:,:)          !    so e3 minimum of (i,i+1) points is (i) point
-         pe3uw(:,:,:) = pe3w(:,:,:)          !    in j-direction e3v=e3t and e3f=e3v
-         pe3vw(:,:,:) = pe3w(:,:,:)          !    ==>>  no need of lbc_lnk calls
+         !
+         DO_3D( 0, 0, 0, 0, 1, jpk ) 
+               pe3u (ji,jj,jk) = MIN( pe3t(ji,jj,jk), pe3t(ji+1,jj,jk) )
+               pe3v (ji,jj,jk) = MIN( pe3t(ji,jj,jk), pe3t(ji,jj+1,jk) )
+               pe3uw(ji,jj,jk) = MIN( pe3w(ji,jj,jk), pe3w(ji+1,jj,jk) )
+               pe3vw(ji,jj,jk) = MIN( pe3w(ji,jj,jk), pe3w(ji,jj+1,jk) )
+         END_3D 
+         !
+         CALL lbc_lnk('usrdef_zgr', pe3u , 'U', 1._wp, pe3uw, 'U', 1._wp )   
+         CALL lbc_lnk('usrdef_zgr', pe3v , 'V', 1._wp, pe3vw, 'V', 1._wp ) 
+         !
+         DO jk = 1, jpk                 
+            WHERE( pe3u (:,:,jk) == 0._wp )   pe3u (:,:,jk) = pe3t_1d(jk)
+            WHERE( pe3v (:,:,jk) == 0._wp )   pe3v (:,:,jk) = pe3t_1d(jk)
+            WHERE( pe3uw(:,:,jk) == 0._wp )   pe3uw(:,:,jk) = pe3w_1d(jk)
+            WHERE( pe3vw(:,:,jk) == 0._wp )   pe3vw(:,:,jk) = pe3w_1d(jk)
+         END DO
+
+         DO_3D( 0, 0, 0, 0, 1, jpk )
+               pe3f(ji,jj,jk) = MIN( pe3v(ji,jj,jk), pe3v(ji+1,jj,jk) )
+         END_3D
+         CALL lbc_lnk('usrdef_zgr', pe3f, 'F', 1._wp )      
          !      
       ENDIF

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+