Changeset 12310 for NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser

Timestamp:

2020-01-10T13:49:04+01:00 (4 years ago)

Author:

agn

Message:

require ln_zdfom=.T. as well as ln_osm_mle=.T. for integrated FK-OSM code to be called in tramle.F90

File:

• NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/tramle.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/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
        !
@@ -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