Changeset 9736

Timestamp:

2018-06-05T10:03:33+02:00 (5 years ago)

Author:

jchanut

Message:

Fix bugs in Griffies triads, #1928

File:

• NEMO/trunk/src/OCE/LDF/ldfslp.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/LDF/ldfslp.F90

@@ -458 +458 @@
                      zdks = 0._wp
                   ENDIF
-                  zdzrho_raw = ( - zalbet(ji,jj,jk) * zdkt + zbeta0*zdks ) / e3w_n(ji,jj,jk+kp)
+                  zdzrho_raw = ( - rab_b(ji,jj,jk+kp,jp_tem) * zdkt & 
+                             &   + rab_b(ji,jj,jk+kp,jp_sal) * zdks &
+                             & ) / e3w_n(ji,jj,jk+kp)  
                   zdzrho(ji,jj,jk,kp) = - MIN( - repsln , zdzrho_raw )    ! force zdzrho >= repsln
                  END DO
@@ -586 +588 @@
                      ENDIF
                      !                                      ! switching triad scheme 
-                     zisw = (rn_sw_triad - 1._wp ) + rn_sw_triad    &
+                     zisw = (1._wp - rn_sw_triad ) + rn_sw_triad    &
                         &            * 2._wp * ABS( 0.5_wp - kp - ( 0.5_wp - ip ) * SIGN( 1._wp , zdxrho(ji+ip,jj,jk,1-ip) )  )
-                     zjsw = (rn_sw_triad - 1._wp ) + rn_sw_triad    &
+                     zjsw = (1._wp - rn_sw_triad ) + rn_sw_triad    &
                         &            * 2._wp * ABS( 0.5_wp - kp - ( 0.5_wp - jp ) * SIGN( 1._wp , zdyrho(ji,jj+jp,jk,1-jp) )  )
                      !