Changeset 14543

Timestamp:

2021-02-24T18:54:44+01:00 (3 years ago)

Author:

dancopsey

Message:

Moving test for turning off shear parameterisation in lower IF test. As is done in George's master branch.

File:

• NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0.1_FKOSM_m11715/src/OCE/ZDF/zdfosm.F90

@@ -1976 +1976 @@
                   ! full code available                                          !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-                  IF ( zshear(ji,jj) > 1.e-10 .AND. MIN(hu_n(ji,jj), hu_n(ji-1,jj), hv_n(ji,jj), hv_n(ji,jj-1))>100._wp ) THEN
-                     IF ( zri_p(ji,jj) < rn_ri_p_thresh ) THEN
+                  IF ( zshear(ji,jj) > 1.e-10 ) THEN
+                     IF ( zri_p(ji,jj) < rn_ri_p_thresh .AND. MIN(hu_n(ji,jj), hu_n(ji-1,jj), hv_n(ji,jj), hv_n(ji,jj-1))>100._wp ) THEN
                         ! Growing shear layer
                         j_ddh(ji,jj) = 0