Changeset 14514 for NEMO/branches/NERC/dev_r11078_OSMOSIS_IMMERSE_Nurser_4.0/src

Timestamp:

2021-02-21T17:04:10+01:00 (3 years ago)

Author:

agn

Message:

beautify slightly zdfosm.F90

File:

• NEMO/branches/NERC/dev_r11078_OSMOSIS_IMMERSE_Nurser_4.0/src/OCE/ZDF/zdfosm.F90 (modified) (4 diffs)

NEMO/branches/NERC/dev_r11078_OSMOSIS_IMMERSE_Nurser_4.0/src/OCE/ZDF/zdfosm.F90

@@ -941 +941 @@
                     & ( zc_cubic * zznd_pyc**2 + zd_cubic * zznd_pyc**3 ) * ( 0.75 + 0.25 * zznd_pyc )**2 * zdbdz_pyc(ji,jj,jk)
              END DO
-           ENDIF  ! lpyc
-           ENDIF ! lconv
-        END DO ! ji loop
+             ENDIF  ! lpyc
+           ENDIF  ! lconv
+         END DO ! ji loop
        END DO  ! jj loop
 
@@ -1056 +1056 @@
        END DO
 
-!        DO jj = 1, jpjm1
-!          DO ji = 1, jpim1
-!            IF ( lconv(ji,jj) ) THEN
-!              IF ( lpyc(ji,jj) ) THEN
-!                zd_cubic = ( 0.948 - 2.13 * zdh(ji,jj) / zhml(ji,jj) ) * zustar(ji,jj)**2
-!                zc_cubic = -0.474 * zustar(ji,jj)**2 - zd_cubic
-!                DO jk = imld(ji,jj), ibld(ji,jj)
-!                  zznd_pyc = -( gdepw_n(ji,jj,jk) - zhbl(ji,jj) ) / zdh(ji,jj)
-!                  ghamu(ji,jj,jk) = ghamu(ji,jj,jk) + 0.3 * ( zc_cubic * zznd_pyc**2 + zd_cubic * zznd_pyc**3 )
-!                END DO
-!                zc_cubic= 3.0 * ff_t(ji,jj) * zustar(ji,jj) * zhml(ji,jj)
-!                zd_cubic = -2.0 * ff_t(ji,jj) * zustar(ji,jj) * zhml(ji,jj)
-!                DO jk = imld(ji,jj), ibld(ji,jj)
-!                  zznd_pyc = -( gdepw_n(ji,jj,jk)-zhbl(ji,jj) ) / zdh(ji,jj)
-!                  ghamv(ji,jj,jk) = ghamv(ji,jj,jk) + 0.3 * ( zc_cubic * zznd_pyc**2 + zd_cubic * zznd_pyc**3 )
-!                END DO
-!              ENDIF
-!            ENDIF
-!          END DO
-!        END DO
-
-       IF(ln_dSia_osm) THEN
+       IF(ln_dia_osm) THEN
           IF ( iom_use("ghamu_f") ) CALL iom_put( "ghamu_f", wmask*ghamu )
           IF ( iom_use("ghamv_f") ) CALL iom_put( "ghamv_f", wmask*ghamv )
@@ -1588 +1567 @@
 ! full code available                                          !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-            IF ( zshear(ji,jj) > 1.e-10 ) 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 ) THEN
 ! Growing shear layer
-                j_ddh(ji,jj) = 0
-                lshear(ji,jj) = .TRUE.
-              ELSE
-                j_ddh(ji,jj) = 1
+                  j_ddh(ji,jj) = 0
+                  lshear(ji,jj) = .TRUE.
+                ELSE
+                  j_ddh(ji,jj) = 1
 !                IF ( zri_b <= 1.5 .and. zshear(ji,jj) > 0._wp ) THEN
 ! shear production large enough to determine layer charcteristics, but can't maintain a shear layer.
                 lshear(ji,jj) = .TRUE.
 !                ELSE
-              ENDIF
-            ELSE
+                ENDIF
+              ELSE
                 j_ddh(ji,jj) = 2
                 lshear(ji,jj) = .FALSE.
-            ENDIF
+              ENDIF
 ! Shear production may not be zero, but is small and doesn't determine characteristics of pycnocline.
 !                  zshear(ji,jj) = 0.5 * zshear(ji,jj)
@@ -2630 +2609 @@
            hmle(ji,jj) = MAX(MIN(hmle(ji,jj), ht_n(ji,jj)),  gdepw_n(ji,jj,4))
            IF(ln_osm_hmle_limit) hmle(ji,jj) = MIN(hmle(ji,jj), rn_osm_hmle_limit*hbl(ji,jj) )
+           ! For now try just set hmle to zmld
            hmle(ji,jj) = zmld(ji,jj)
         END DO