Changeset 13864 for NEMO/branches/2020

Timestamp:

2020-11-24T18:34:20+01:00 (3 years ago)

Author:

dancopsey

Message:

Merged in changes from NEMO4.0.3 branch here:

​http://forge.ipsl.jussieu.fr/nemo/log/NEMO/branches/UKMO/NEMO_4.0.3_isnow_comb_t1_ice

File:

• NEMO/branches/2020/dev_r13787_isnow_comb_t1_ice/src/ICE/icethd_zdf_bl99.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r13787_isnow_comb_t1_ice/src/ICE/icethd_zdf_bl99.F90

@@ -908 +908 @@
             cnd_ice_1d(ji) = 2._wp * ztcond_i(ji,0) / zhi_ssl ! cnd_ice is capped by: cond_i/zhi_ssl
          ENDIF
-         t1_ice_1d(ji) = isnow(ji) * t_s_1d(ji,1) + ( 1._wp - isnow(ji) ) * t_i_1d(ji,1)
+         t1_ice_1d(ji) = isnow_comb(ji) * t_s_1d(ji,1) + ( 1._wp - isnow_comb(ji) ) * t_i_1d(ji,1)
       END DO
       !