Changeset 13899 for NEMO/branches/2020/tickets_icb_1900/src/SWE/dynldf_lap_blp.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/SWE/dynldf_lap_blp.F90 (modified) (6 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/SWE/dynldf_lap_blp.F90

@@ -97 +97 @@
             DO jk = 1, jpkm1                                 ! Horizontal slab
                !                                             
-               DO_2D_01_01
+               DO_2D( 0, 1, 0, 1 )
                !                                      ! ahm * e3 * curl  (computed from 1 to jpim1/jpjm1)
 !!gm open question here : e3f  at before or now ?    probably now... 
@@ -112 +112 @@
                END_2D
                !
-               DO_2D_00_00
+               DO_2D( 0, 0, 0, 0 )
                   pu_rhs(ji,jj,jk) = pu_rhs(ji,jj,jk) + zsign * (                                             &
                      &              - ( zcur(ji  ,jj) - zcur(ji,jj-1) ) * r1_e2u(ji,jj) / e3u(ji,jj,jk,Kmm)   &
@@ -128 +128 @@
             DO jk = 1, jpkm1                                 ! Horizontal slab
                !
-               DO_2D_01_01
+               DO_2D( 0, 1, 0, 1 )
                   !                                      ! shearing stress component (F-point)   NB : ahmf has already been multiplied by fmask
                   zshe(ji-1,jj-1) = ahmf(ji-1,jj-1,jk)                                                              &
@@ -143 +143 @@
                END_2D
                !
-               DO_2D_00_00
+               DO_2D( 0, 0, 0, 0 )
                   pu_rhs(ji,jj,jk) = pu_rhs(ji,jj,jk) + zsign * r1_e1e2u(ji,jj) / e3u(ji,jj,jk,Kmm)                               &
                      &    * (   (   zten(ji+1,jj  ) * e2t(ji+1,jj  )*e2t(ji+1,jj  ) * e3t(ji+1,jj  ,jk,Kmm)                       &
@@ -164 +164 @@
             DO jk = 1, jpkm1                                 ! Horizontal slab
                !
-               DO_2D_01_01
+               DO_2D( 0, 1, 0, 1 )
                   !                                      ! shearing stress component (F-point)   NB : ahmf has already been multiplied by fmask
                   zshe(ji-1,jj-1) = ahmf(ji-1,jj-1,jk)                                           &
@@ -175 +175 @@
                END_2D
                !
-               DO_2D_00_00
+               DO_2D( 0, 0, 0, 0 )
                   pu_rhs(ji,jj,jk) = pu_rhs(ji,jj,jk) + zsign * r1_e1e2u(ji,jj) / e3u(ji,jj,jk,Kmm)   &
                      &    * (   zten(ji+1,jj  ) * e2t(ji+1,jj  ) * e3t(ji+1,jj  ,jk,Kmm)              &

@@ -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