Changeset 14921 for NEMO/trunk/src/OCE/TRA/tramle.F90

Timestamp:

2021-05-28T14:19:26+02:00 (3 years ago)

Author:

smueller

Message:

Merge of development branch ^{/NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining into} /NEMO/trunk (ticket #2353)

File:

• NEMO/trunk/src/OCE/TRA/tramle.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/TRA/tramle.F90

@@ -366 +366 @@
          r1_ft(:,:) = 1._wp / SQRT(  ff_t(:,:) * ff_t(:,:) + z1_t2  )
          !
-         ! Specifically, dbdx_mle, dbdy_mle and mld_prof need to be defined for nn_hls = 2
-         IF( nn_hls == 2 .AND. ln_osm_mle .AND. ln_zdfosm ) THEN
-            CALL ctl_stop('nn_hls = 2 cannot be used with ln_mle = ln_osm_mle = ln_zdfosm = T (zdfosm not updated for nn_hls = 2)')
-         ENDIF
       ENDIF
       !