Changeset 13899 for NEMO/branches/2020/tickets_icb_1900/src/SWE/step.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/step.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/step.F90

@@ -148 +148 @@
 
 !!an - calcul du gradient de pression horizontal (explicit)
-      DO_3D_00_00( 1, jpkm1 )
+      DO_3D( 0, 0, 0, 0, 1, jpkm1 )
          uu(ji,jj,jk,Nrhs) = uu(ji,jj,jk,Nrhs) - grav * ( ssh(ji+1,jj,Nnn) - ssh(ji,jj,Nnn) ) * r1_e1u(ji,jj)
          vv(ji,jj,jk,Nrhs) = vv(ji,jj,jk,Nrhs) - grav * ( ssh(ji,jj+1,Nnn) - ssh(ji,jj,Nnn) ) * r1_e2v(ji,jj)
@@ -155 +155 @@
       ! add wind stress forcing and layer linear friction to the RHS 
       z1_2rho0 = 0.5_wp * r1_rho0
-      DO_3D_00_00(1,jpkm1)
+      DO_3D( 0, 0, 0, 0,1,jpkm1)
          uu(ji,jj,jk,Nrhs) = uu(ji,jj,jk,Nrhs) + z1_2rho0 * ( utau_b(ji,jj) + utau(ji,jj) ) / e3u(ji,jj,jk,Nnn)   &
             &                                  - rn_rfr * uu(ji,jj,jk,Nbb)
@@ -172 +172 @@
       IF( ln_dynadv_vec ) THEN      ! vector invariant form : applied on velocity
          IF( l_1st_euler ) THEN           ! Euler time stepping (no Asselin filter)
-            DO_3D_00_00(1,jpkm1)
+            DO_3D( 0, 0, 0, 0,1,jpkm1)
                uu(ji,jj,jk,Naa) = uu(ji,jj,jk,Nbb) + rDt * uu(ji,jj,jk,Nrhs) * umask(ji,jj,jk)
                vv(ji,jj,jk,Naa) = vv(ji,jj,jk,Nbb) + rDt * vv(ji,jj,jk,Nrhs) * vmask(ji,jj,jk)
              END_3D          
          ELSE                             ! Leap Frog time stepping + Asselin filter         
-            DO_3D_11_11(1,jpkm1)
+            DO_3D( 1, 1, 1, 1,1,jpkm1)
                zua = uu(ji,jj,jk,Nbb) + rDt * uu(ji,jj,jk,Nrhs) * umask(ji,jj,jk)
                zva = vv(ji,jj,jk,Nbb) + rDt * vv(ji,jj,jk,Nrhs) * vmask(ji,jj,jk)
@@ -199 +199 @@
       ELSE                          ! flux form : applied on thickness weighted velocity
          IF( l_1st_euler ) THEN           ! Euler time stepping (no Asselin filter)
-            DO_3D_00_00(1,jpkm1)
+            DO_3D( 0, 0, 0, 0,1,jpkm1)
                zue3b = e3u(ji,jj,jk,Nbb) * uu(ji,jj,jk,Nbb)
                zve3b = e3v(ji,jj,jk,Nbb) * vv(ji,jj,jk,Nbb)
@@ -210 +210 @@
             END_3D
          ELSE                             ! Leap Frog time stepping + Asselin filter
-            DO_3D_11_11(1,jpkm1)
+            DO_3D( 1, 1, 1, 1,1,jpkm1)
                zue3n = e3u(ji,jj,jk,Nnn) * uu(ji,jj,jk,Nnn)
                zve3n = e3v(ji,jj,jk,Nnn) * vv(ji,jj,jk,Nnn)
@@ -291 +291 @@
       ! Control
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-                         CALL stp_ctl      ( kstp, Nbb, Nnn, indic )
+                         CALL stp_ctl      ( kstp, Nnn )
                
                          

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