Changeset 13899 for NEMO/branches/2020/tickets_icb_1900/src/OCE/DYN/dynldf_iso.F90

Timestamp:

2020-11-27T17:26:33+01:00 (4 years ago)

Author:

mathiot

Message:

ticket #1900: update branch to trunk and add ICB test case

Location:

NEMO/branches/2020/tickets_icb_1900

Files:

• . (modified) (1 prop)
• src/OCE/DYN/dynldf_iso.F90 (modified) (8 diffs)

NEMO/branches/2020/tickets_icb_1900

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/sette@13559        sette

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/sette@13559        sette

NEMO/branches/2020/tickets_icb_1900/src/OCE/DYN/dynldf_iso.F90

@@ -128 +128 @@
       IF( ln_dynldf_hor .AND. ln_traldf_iso ) THEN
          !
-         DO_3D_00_00( 1, jpk )
+         DO_3D( 0, 0, 0, 0, 1, jpk )      ! set the slopes of iso-level
             uslp (ji,jj,jk) = - ( gdept(ji+1,jj,jk,Kbb) - gdept(ji ,jj ,jk,Kbb) ) * r1_e1u(ji,jj) * umask(ji,jj,jk)
             vslp (ji,jj,jk) = - ( gdept(ji,jj+1,jk,Kbb) - gdept(ji ,jj ,jk,Kbb) ) * r1_e2v(ji,jj) * vmask(ji,jj,jk)
@@ -168 +168 @@
 
          IF( ln_zps ) THEN      ! z-coordinate - partial steps : min(e3u)
-            DO_2D_00_01
+            DO_2D( 0, 0, 0, 1 )
                zabe1 = ( ahmt(ji,jj,jk)+rn_ahm_b ) * e2t(ji,jj)   &
                   &    * MIN( e3u(ji  ,jj,jk,Kmm),                &
@@ -183 +183 @@
             END_2D
          ELSE                   ! other coordinate system (zco or sco) : e3t
-            DO_2D_00_01
+            DO_2D( 0, 0, 0, 1 )
                zabe1 = ( ahmt(ji,jj,jk)+rn_ahm_b )   &
                   &     * e2t(ji,jj) * e3t(ji,jj,jk,Kmm) * r1_e1t(ji,jj)
@@ -199 +199 @@
 
          ! j-flux at f-point
-         DO_2D_10_10
+         DO_2D( 1, 0, 1, 0 )
             zabe2 = ( ahmf(ji,jj,jk) + rn_ahm_b )   &
                &     * e1f(ji,jj) * e3f(ji,jj,jk) * r1_e2f(ji,jj)
@@ -219 +219 @@
          ! i-flux at f-point              |   t   |
 
-         DO_2D_00_10
+         DO_2D( 0, 0, 1, 0 )
             zabe1 = ( ahmf(ji,jj,jk) + rn_ahm_b )   &
                &     * e2f(ji,jj) * e3f(ji,jj,jk) * r1_e1f(ji,jj)
@@ -235 +235 @@
          ! j-flux at t-point
          IF( ln_zps ) THEN      ! z-coordinate - partial steps : min(e3u)
-            DO_2D_01_10
+            DO_2D( 0, 1, 1, 0 )
                zabe2 = ( ahmt(ji,jj,jk)+rn_ahm_b ) * e1t(ji,jj)   &
                   &     * MIN( e3v(ji,jj  ,jk,Kmm),                 &
@@ -250 +250 @@
             END_2D
          ELSE                   ! other coordinate system (zco or sco) : e3t
-            DO_2D_01_10
+            DO_2D( 0, 1, 1, 0 )
                zabe2 = ( ahmt(ji,jj,jk)+rn_ahm_b )   &
                   &     * e1t(ji,jj) * e3t(ji,jj,jk,Kmm) * r1_e2t(ji,jj)
@@ -268 +268 @@
          ! Second derivative (divergence) and add to the general trend
          ! -----------------------------------------------------------
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )      !!gm Question vectop possible??? !!bug
             puu(ji,jj,jk,Krhs) = puu(ji,jj,jk,Krhs) + (  ziut(ji+1,jj) - ziut(ji,jj  )    &
                &                           + zjuf(ji  ,jj) - zjuf(ji,jj-1)  ) * r1_e1e2u(ji,jj)   &

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/sette@13559        sette