Changeset 13662 for NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/OCE/LDF/ldfslp.F90

Timestamp:

2020-10-22T20:49:56+02:00 (4 years ago)

Author:

clem

Message:

update to almost r4.0.4

Location:

NEMO/branches/2019/dev_r11842_SI3-10_EAP

Files:

• . (modified) (1 prop)
• src/OCE/LDF/ldfslp.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r11842_SI3-10_EAP

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools_r4.0-HEAD@12672 tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL
+
+# SETTE mapping (inactive)
+#^/utils/CI/sette@12135        sette

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools_r4.0-HEAD@12672 tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL
+
+# SETTE mapping (inactive)
+#^/utils/CI/sette@12135        sette

NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/OCE/LDF/ldfslp.F90

@@ -207 +207 @@
                zbu = MIN(  zbu, - z1_slpmax * ABS( zau ) , -7.e+3_wp/e3u_n(ji,jj,jk)* ABS( zau )  )
                zbv = MIN(  zbv, - z1_slpmax * ABS( zav ) , -7.e+3_wp/e3v_n(ji,jj,jk)* ABS( zav )  )
+               !                                      ! Fred Dupont: add a correction for bottom partial steps:
+               !                                      !              max slope = 1/2 * e3 / e1
+               IF (ln_zps .AND. jk==mbku(ji,jj)) &
+                  zbu = MIN(  zbu, - z1_slpmax * ABS( zau ) , - 2._wp * e1u(ji,jj) / e3u_n(ji,jj,jk)* ABS( zau )  )
+               IF (ln_zps .AND. jk==mbkv(ji,jj)) &
+                  zbv = MIN(  zbv, - z1_slpmax * ABS( zav ) , - 2._wp * e2v(ji,jj) / e3v_n(ji,jj,jk)* ABS( zav )  )
                !                                      ! uslp and vslp output in zwz and zww, resp.
                zfi = MAX( omlmask(ji,jj,jk), omlmask(ji+1,jj,jk) )
@@ -402 +408 @@
       REAL(wp) ::   zbeta0, ze3_e1, ze3_e2
       REAL(wp), DIMENSION(jpi,jpj)     ::   z1_mlbw
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zalbet
       REAL(wp), DIMENSION(jpi,jpj,jpk,0:1) ::   zdxrho , zdyrho, zdzrho     ! Horizontal and vertical density gradients
       REAL(wp), DIMENSION(jpi,jpj,0:1,0:1) ::   zti_mlb, ztj_mlb            ! for Griffies operator only
@@ -458 +463 @@
                      zdks = 0._wp
                   ENDIF
-                  zdzrho_raw = ( - rab_b(ji,jj,jk+kp,jp_tem) * zdkt & 
-                             &   + rab_b(ji,jj,jk+kp,jp_sal) * zdks &
+                  zdzrho_raw = ( - rab_b(ji,jj,jk   ,jp_tem) * zdkt & 
+                             &   + rab_b(ji,jj,jk   ,jp_sal) * zdks &
                              & ) / e3w_n(ji,jj,jk+kp)  
                   zdzrho(ji,jj,jk,kp) = - MIN( - repsln , zdzrho_raw )    ! force zdzrho >= repsln

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools_r4.0-HEAD@12672 tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL
+
+# SETTE mapping (inactive)
+#^/utils/CI/sette@12135        sette