Changeset 12311 for NEMO/branches

Timestamp:

2020-01-14T11:18:59+01:00 (4 years ago)

Author:

cguiavarch

Message:

Corrected reversion in tramle.F90 whereby ikmax set too late

Location:

NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE

Files:

• TRA/tramle.F90 (modified) (7 diffs)
• ZDF/zdfosm.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE/TRA/tramle.F90

@@ -21 +21 @@
    USE lbclnk         ! lateral boundary condition / mpp link
 
+   ! where OSMOSIS_OBL is used with integrated FK
+   USE zdf_oce, ONLY : ln_zdfosm
    USE zdfosm, ONLY  : ln_osm_mle, hmle, dbdx_mle, dbdy_mle, mld_prof
 
@@ -97 +99 @@
     !
     !
-    IF(ln_osm_mle) THEN
+    IF(ln_osm_mle.and.ln_zdfosm) THEN
        ikmax = MIN( MAXVAL( mld_prof(:,:) ), jpkm1 )                  ! max level of the computation
        !
@@ -151 +153 @@
     ELSE !do not use osn_mle
        !                                      !==  MLD used for MLE  ==!
-       !                                                ! convert density into buoyancy
+       !                                                ! compute from the 10m density to deal with the diurnal cycle
        inml_mle(:,:) = mbkt(:,:) + 1                    ! init. to number of ocean w-level (T-level + 1)
        IF ( nla10 > 0 ) THEN                            ! avoid case where first level is thicker than 10m
@@ -162 +164 @@
           END DO
        ENDIF
+       ikmax = MIN( MAXVAL( inml_mle(:,:) ), jpkm1 )                  ! max level of the computation
 
        !
@@ -203 +206 @@
        END SELECT
        !                                                ! convert density into buoyancy
-       ikmax = MIN( MAXVAL( inml_mle(:,:) ), jpkm1 )                  ! max level of the computation
        zbm(:,:) = + grav * zbm(:,:) / MAX( e3t_n(:,:,1), zmld(:,:) )
        !
@@ -294 +296 @@
     IF( cdtype == 'TRA') THEN              !==  outputs  ==!
        !
-       IF (ln_osm_mle) THEN
+       IF (ln_osm_mle.and.ln_zdfosm) THEN
           zLf_NH(:,:) = SQRT( rb_c * hmle(:,:) ) * r1_ft(:,:)      ! Lf = N H / f
        ELSE
@@ -352 +354 @@
          WRITE(numout,*) '         Density difference used to define ML for FK              rn_rho_c_mle  = ', rn_rho_c_mle
       ENDIF
-
-
-      IF( ln_osm_mle .AND. ln_mle ) THEN
-         WRITE(numout,*) 'WARNING: You are running with both OSM-FK and default FK'
-         ! CALL ctl_stop('STOP in zdf_osm_init: Cannot run with both OSM-FK and default FK')
-     END IF
-
-     IF(lwp) THEN
+      !
+      IF(lwp) THEN
          WRITE(numout,*)
          IF( ln_mle ) THEN

NEMO/branches/UKMO/NEMO_4.0_FKOSM/src/OCE/ZDF/zdfosm.F90

@@ -2243 +2243 @@
      IF( TRIM(cdrw) == 'WRITE') THEN     !* Write hbli into the restart file, then return
         IF(lwp) WRITE(numout,*) '---- osm-rst ----'
-         CALL iom_rstput( kt, nitrst, numrow, 'wn'     , wn  , ldxios = lwxios )
-         CALL iom_rstput( kt, nitrst, numrow, 'hbl'    , hbl , ldxios = lwxios )
-         CALL iom_rstput( kt, nitrst, numrow, 'dh'     , dh, ldxios = lwxios )
+         IF( lwxios ) CALL iom_swap(      cwxios_context          )
+            CALL iom_rstput( kt, nitrst, numrow, 'wn'     , wn  , ldxios = lwxios )
+            CALL iom_rstput( kt, nitrst, numrow, 'hbl'    , hbl , ldxios = lwxios )
+            CALL iom_rstput( kt, nitrst, numrow, 'dh'     , dh, ldxios = lwxios )
+         IF( lwxios ) CALL iom_swap(      cxios_context          )
         RETURN
      END IF